diff --git a/android/jni/com/mapswithme/util/statistics/PushwooshHelper.cpp b/android/jni/com/mapswithme/util/statistics/PushwooshHelper.cpp index 3cc7b3d5e9..848a0d6794 100644 --- a/android/jni/com/mapswithme/util/statistics/PushwooshHelper.cpp +++ b/android/jni/com/mapswithme/util/statistics/PushwooshHelper.cpp @@ -21,4 +21,10 @@ Java_com_mapswithme_util_statistics_PushwooshHelper_nativeSendEditorEditObjectTa { GetPlatform().GetMarketingService().SendPushWooshTag(marketing::kEditorEditDiscovered); } + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_util_statistics_PushwooshHelper_nativeGetFormattedTimestamp(JNIEnv * env, jclass thiz) +{ + return jni::ToJavaString(env, GetPlatform().GetMarketingService().GetPushWooshTimestamp()); +} } // extern "C" diff --git a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java index 54996af359..9f8fa16a10 100644 --- a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java +++ b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java @@ -19,6 +19,7 @@ import com.mapswithme.util.Utils; import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; +import com.mapswithme.util.statistics.PushwooshHelper; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -164,6 +165,8 @@ public class SystemDownloadCompletedService extends JobIntentService { app.sendPushWooshTags("Bookmarks_Guides_paid_tier", new String[] {productId}); app.sendPushWooshTags("Bookmarks_Guides_paid_title", new String[] {name}); + app.sendPushWooshTags("Bookmarks_Guides_paid_date", + new String[] {PushwooshHelper.nativeGetFormattedTimestamp()}); } } diff --git a/android/src/com/mapswithme/util/statistics/PushwooshHelper.java b/android/src/com/mapswithme/util/statistics/PushwooshHelper.java index 0ab297fd48..d5b6dab288 100644 --- a/android/src/com/mapswithme/util/statistics/PushwooshHelper.java +++ b/android/src/com/mapswithme/util/statistics/PushwooshHelper.java @@ -52,4 +52,5 @@ public final class PushwooshHelper public static native void nativeProcessFirstLaunch(); public static native void nativeSendEditorAddObjectTag(); public static native void nativeSendEditorEditObjectTag(); + public static native @NonNull String nativeGetFormattedTimestamp(); } diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 3d8ea876bc..4e785b0d9b 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -402,6 +402,7 @@ private func logToPushWoosh(_ categoryInfo: CatalogCategoryInfo) { } else { pushManager!.setTags(["Bookmarks_Guides_paid_tier": categoryInfo.productId!]); pushManager!.setTags(["Bookmarks_Guides_paid_title": categoryInfo.name]); + pushManager!.setTags(["Bookmarks_Guides_paid_date": MWMPushNotifications.formattedTimestamp()]); } } diff --git a/iphone/Maps/Core/Notifications/MWMPushNotifications.h b/iphone/Maps/Core/Notifications/MWMPushNotifications.h index 0fdd144d5e..a6a2f5b09e 100644 --- a/iphone/Maps/Core/Notifications/MWMPushNotifications.h +++ b/iphone/Maps/Core/Notifications/MWMPushNotifications.h @@ -18,4 +18,6 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler; ++ (NSString *)formattedTimestamp; + @end diff --git a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm index 49ac38eb6e..30be887953 100644 --- a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm +++ b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm @@ -5,6 +5,9 @@ #import "MWMCommon.h" #import "Statistics.h" +#include "platform/marketing_service.hpp" +#include "platform/platform.hpp" + #import "3party/Alohalytics/src/alohalytics_objc.h" // If you have a "missing header error" here, then please run configure.sh script in the root repo @@ -92,4 +95,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:completionHandler]; } ++ (NSString *)formattedTimestamp { + return @(GetPlatform().GetMarketingService().GetPushWooshTimestamp().c_str()); +} + @end diff --git a/map/purchase.cpp b/map/purchase.cpp index b1989c069e..8b90fcf2e7 100644 --- a/map/purchase.cpp +++ b/map/purchase.cpp @@ -162,6 +162,14 @@ void Purchase::SetSubscriptionEnabled(SubscriptionType type, bool isEnabled) for (auto & listener : m_listeners) listener->OnSubscriptionChanged(type, isEnabled); + + if (type == SubscriptionType::BookmarkCatalog) + { + auto const nowStr = GetPlatform().GetMarketingService().GetPushWooshTimestamp(); + GetPlatform().GetMarketingService().SendPushWooshTag(isEnabled ? + marketing::kBookmarkCatalogSubscriptionEnabled : + marketing::kBookmarkCatalogSubscriptionDisabled, nowStr); + } } void Purchase::Validate(ValidationInfo const & validationInfo, std::string const & accessToken) diff --git a/platform/marketing_service.cpp b/platform/marketing_service.cpp index c5cbf82493..441de68595 100644 --- a/platform/marketing_service.cpp +++ b/platform/marketing_service.cpp @@ -1,8 +1,9 @@ #include "platform/marketing_service.hpp" +#include "base/gmtime.hpp" + namespace marketing { - // Tags. char const * const kMapVersionMin = "map_version_min"; char const * const kMapVersionMax = "map_version_max"; @@ -25,6 +26,8 @@ char const * const kEditorEditDiscovered = "editor_edit_discovered"; char const * const kTrafficDiscovered = "traffic_discovered"; char const * const kDiscoveryButtonDiscovered = "discovery_button_discovered"; char const * const kBookHotelOnBookingComDiscovered = "hotel_book_bcom_discovered"; +char const * const kBookmarkCatalogSubscriptionEnabled = "bookmark_catalog_subscription_enabled"; +char const * const kBookmarkCatalogSubscriptionDisabled = "bookmark_catalog_subscription_disabled"; // Events. char const * const kDownloaderMapActionFinished = "Downloader_Map_action_finished"; @@ -46,7 +49,7 @@ void MarketingService::ProcessFirstLaunch() { // Send initial value for "discovered" tags. using namespace marketing; - vector tags = + std::vector tags = { kMapDownloadDiscovered, @@ -64,5 +67,13 @@ void MarketingService::ProcessFirstLaunch() }; for (auto const & tag : tags) - SendPushWooshTag(tag, vector{"0"}); + SendPushWooshTag(tag, std::vector{"0"}); +} + +std::string MarketingService::GetPushWooshTimestamp() +{ + char nowStr[18]{}; + auto const now = base::GmTime(time(nullptr)); + strftime(nowStr, sizeof(nowStr), "%Y-%m-%d %H:%M", &now); + return std::string(nowStr); } diff --git a/platform/marketing_service.hpp b/platform/marketing_service.hpp index 65da48c873..e27a5991d0 100644 --- a/platform/marketing_service.hpp +++ b/platform/marketing_service.hpp @@ -30,6 +30,8 @@ extern char const * const kEditorEditDiscovered; extern char const * const kTrafficDiscovered; extern char const * const kDiscoveryButtonDiscovered; extern char const * const kBookHotelOnBookingComDiscovered; +extern char const * const kBookmarkCatalogSubscriptionEnabled; +extern char const * const kBookmarkCatalogSubscriptionDisabled; // Events. extern char const * const kDownloaderMapActionFinished; @@ -50,18 +52,23 @@ extern char const * const kKeyword; class MarketingService { public: - using PushWooshSenderFn = function const & values)>; - using MarketingSenderFn = function const & params)>; + using PushWooshSenderFn = std::function const & values)>; + using MarketingSenderFn = std::function const & params)>; void ProcessFirstLaunch(); void SetPushWooshSender(PushWooshSenderFn const & fn) { m_pushwooshSender = fn; } - void SendPushWooshTag(string const & tag); - void SendPushWooshTag(string const & tag, string const & value); - void SendPushWooshTag(string const & tag, vector const & values); + void SendPushWooshTag(std::string const & tag); + void SendPushWooshTag(std::string const & tag, std::string const & value); + void SendPushWooshTag(std::string const & tag, std::vector const & values); + + std::string GetPushWooshTimestamp(); void SetMarketingSender(MarketingSenderFn const & fn) { m_marketingSender = fn; } - void SendMarketingEvent(string const & tag, map const & params); + void SendMarketingEvent(std::string const & tag, std::map const & params); private: /// Callback fucntion for setting PushWoosh tags. diff --git a/storage/storage.cpp b/storage/storage.cpp index a688d3cef6..4685f284db 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -827,11 +827,9 @@ void Storage::OnMapFileDownloadFinished(HttpRequest::Status status, { GetPlatform().GetMarketingService().SendPushWooshTag(marketing::kMapLastDownloaded, countryId); - char nowStr[18]{}; - tm now = base::GmTime(time(nullptr)); - strftime(nowStr, sizeof(nowStr), "%Y-%m-%d %H:%M", &now); + auto const nowStr = GetPlatform().GetMarketingService().GetPushWooshTimestamp(); GetPlatform().GetMarketingService().SendPushWooshTag(marketing::kMapLastDownloadedTimestamp, - std::string(nowStr)); + nowStr); } }