[ios] Moved Facebook SDK events to Statistics.

4 files changed, 27 insertions, 17 deletions

diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 79d88724a3..028e2cafe5 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -12,7 +12,6 @@
 #import "RouteState.h"
 #import "Statistics.h"
 #import "UIKitCategories.h"
-#import "MWMCustomFacebookEvents.h"
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <Parse/Parse.h>
 #import <ParseFacebookUtilsV4/PFFacebookUtils.h>
@@ -171,6 +170,9 @@ void InitLocalizedStrings()
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  // Initialize all 3party engines.
+  [[Statistics instance] application:application didFinishLaunchingWithOptions:launchOptions];
+
   NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
   // Initialize Alohalytics statistics engine.
 #ifndef OMIM_PRODUCTION
@@ -193,8 +195,6 @@ void InitLocalizedStrings()
   
   [HttpThread setDownloadIndicatorProtocol:[MapsAppDelegate theApp]];
 
-  [[Statistics instance] startSessionWithLaunchOptions:launchOptions];
-
   [self trackWatchUser];
 
   NSUUID const * const advertisingId = [AppInfo sharedInfo].advertisingId;
@@ -248,8 +248,8 @@ void InitLocalizedStrings()
   Framework & f = GetFramework();
   application.applicationIconBadgeNumber = f.GetCountryTree().GetActiveMapLayout().GetOutOfDateCount();
   f.GetLocationState()->InvalidatePosition();
-  
-  return [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
+
+  return YES;
 }
 
 - (void)application:(UIApplication *)application performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
@@ -338,10 +338,9 @@ void InitLocalizedStrings()
   m_mwmURL = nil;
   m_fileURL = nil;
 
-  [FBSDKAppEvents activateApp];
   [self restoreRouteState];
-  // Special FB events to improve marketing campaigns quality.
-  [MWMCustomFacebookEvents optimizeExpenses];
+
+  [Statistics.instance applicationDidBecomeActive];
 }
 
 - (void)dealloc
@@ -399,7 +398,6 @@ void InitLocalizedStrings()
   [[LocalNotificationManager sharedManager] processNotification:notification onLaunch:NO];
 }
 
-// We don't support HandleOpenUrl as it's deprecated from iOS 4.2
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
 {
   m_sourceApplication = sourceApplication;
diff --git a/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm b/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
index 83c02865ad..122edc5900 100644
--- a/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
+++ b/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
@@ -1,4 +1,3 @@
-#import "Statistics.h"
 #import "MWMCustomFacebookEvents.h"
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
@@ -41,9 +40,6 @@ static int gStorageSubscriptionId = kNotSubscribed;
 
 + (void)optimizeExpenses
 {
-  if (!Statistics.instance.enabled)
-    return;
-
   NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
   BOOL const isFirstSession = [Alohalytics isFirstSession];
   if (isFirstSession)
diff --git a/iphone/Maps/Statistics/Statistics.h b/iphone/Maps/Statistics/Statistics.h
index 4d51808f1d..ef5a239d85 100644
--- a/iphone/Maps/Statistics/Statistics.h
+++ b/iphone/Maps/Statistics/Statistics.h
@@ -4,7 +4,10 @@
 {
 }
 
-- (void)startSessionWithLaunchOptions:(NSDictionary *)launchOptions;
+// Should be called from the same method in AppDelegate.
+- (void)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions;
+// Should be called from the same method in AppDelegate.
+- (void)applicationDidBecomeActive;
 - (void)logEvent:(NSString *)eventName;
 - (void)logEvent:(NSString *)eventName withParameters:(NSDictionary *)parameters;
 - (void)logApiUsage:(NSString *)programName;
diff --git a/iphone/Maps/Statistics/Statistics.mm b/iphone/Maps/Statistics/Statistics.mm
index a629dd6413..af43903ad2 100644
--- a/iphone/Maps/Statistics/Statistics.mm
+++ b/iphone/Maps/Statistics/Statistics.mm
@@ -1,8 +1,10 @@
-#import "Statistics.h"
-#import "Flurry.h"
 #import "AppInfo.h"
+#import "Flurry.h"
+#import "MWMCustomFacebookEvents.h"
+#import "Statistics.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 
 #include "platform/settings.hpp"
 
@@ -14,11 +16,12 @@ static constexpr char const * kStatisticsEnabledSettingsKey = "StatisticsEnabled
 
 @implementation Statistics
 
-- (void)startSessionWithLaunchOptions:(NSDictionary *)launchOptions
+- (void)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   if (self.enabled)
   {
     [Flurry startSession:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"FlurryKey"]];
+    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
   }
 }
 
@@ -57,6 +60,16 @@ static constexpr char const * kStatisticsEnabledSettingsKey = "StatisticsEnabled
   }
 }
 
+- (void)applicationDidBecomeActive
+{
+  if (self.enabled)
+  {
+    [FBSDKAppEvents activateApp];
+    // Special FB events to improve marketing campaigns quality.
+    [MWMCustomFacebookEvents optimizeExpenses];
+  }
+}
+
 - (BOOL)enabled
 {
 #ifdef DEBUG