From e8d197cedc5d21a3b50ed0702c2238227b272a5c Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Wed, 28 Jan 2015 13:47:05 +0300
Subject: [PATCH] Move statistics initialisation to first MwmActivity start.

---
 .../src/com/mapswithme/maps/MWMActivity.java  |  2 +-
 .../com/mapswithme/maps/MWMApplication.java   | 28 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index d7de2c0b78..40a82792a5 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -700,7 +700,7 @@ public class MWMActivity extends NvEventQueueActivity
     super.onCreate(savedInstanceState);
 
     // Log app start events - successful installation means that user has passed DownloadResourcesActivity
-    MWMApplication.get().onMwmStart(this);
+    MWMApplication.get().onMwmCreate(this);
 
     // Do not turn off the screen while benchmarking
     if (MWMApplication.get().nativeIsBenchmarking())
diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java
index 1a9ec9209f..57102084e7 100644
--- a/android/src/com/mapswithme/maps/MWMApplication.java
+++ b/android/src/com/mapswithme/maps/MWMApplication.java
@@ -47,6 +47,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
 
   private static MWMApplication mSelf;
 
+  private boolean mAreStatsInitialised;
   private boolean mIsYota = false;
 
   // We check how old is modified date of our MapsWithMe folder
@@ -139,12 +140,6 @@ public class MWMApplication extends android.app.Application implements ActiveCou
 
     // init BookmarkManager (automatically loads bookmarks)
     BookmarkManager.getBookmarkManager();
-
-    updateLaunchNumbers();
-    updateSessionsNumber();
-    initMrgs();
-    WorkerService.startActionUpdateAds(this);
-    PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
   }
 
   private void initMrgs()
@@ -244,10 +239,25 @@ public class MWMApplication extends android.app.Application implements ActiveCou
 
   public native void nativeSetDouble(String name, double value);
 
-  public void onMwmStart(Activity activity)
+  public void onMwmCreate(Activity activity)
   {
     FbUtil.activate(activity);
-    initMAT(activity);
+    initMat(activity);
+
+    initStats();
+  }
+
+  private void initStats()
+  {
+    if (!mAreStatsInitialised)
+    {
+      mAreStatsInitialised = true;
+      updateLaunchNumbers();
+      updateSessionsNumber();
+      initMrgs();
+      WorkerService.startActionUpdateAds(this);
+      PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+    }
   }
 
   public void onMwmResume(Activity activity)
@@ -319,7 +329,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
     return nativeGetInt(FIRST_INSTALL_VERSION, 0);
   }
 
-  private void initMAT(Activity activity)
+  private void initMat(Activity activity)
   {
     if (!Utils.hasAnyGoogleStoreInstalled())
     {