[android] Moved onStart/onStop code to Statistics.

3 files changed, 7 insertions, 14 deletions

diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
index 1e10e20e62..164f31dc4f 100644
--- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
+++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
@@ -13,8 +13,6 @@ import com.mapswithme.maps.R;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.statistics.Statistics;
 
-import ru.mail.android.mytracker.MRMyTracker;
-
 public class BaseMwmFragmentActivity extends AppCompatActivity
 {
   @Override
@@ -50,18 +48,13 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
   {
     super.onStart();
     Statistics.INSTANCE.startActivity(this);
-    MRMyTracker.onStartActivity(this);
-    org.alohalytics.Statistics.onStart(this);
   }
 
   @Override
   protected void onStop()
   {
-    org.alohalytics.Statistics.onStop(this);
-    Statistics.INSTANCE.stopActivity(this);
     super.onStop();
-
-    MRMyTracker.onStopActivity(this);
+    Statistics.INSTANCE.stopActivity(this);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
index 558faac100..f1f273de6c 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
@@ -38,8 +38,6 @@ import com.mapswithme.util.Yota;
 import com.mapswithme.util.statistics.AlohaHelper;
 import com.mapswithme.util.statistics.Statistics;
 
-import ru.mail.android.mytracker.MRMyTracker;
-
 public class SettingsActivity extends PreferenceActivity implements OnPreferenceClickListener, Preference.OnPreferenceChangeListener
 {
   public final static String ZOOM_BUTTON_ENABLED = "ZoomButtonsEnabled";
@@ -144,18 +142,14 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
   protected void onStart()
   {
     super.onStart();
-
     Statistics.INSTANCE.startActivity(this);
-    MRMyTracker.onStartActivity(this);
   }
 
   @Override
   protected void onStop()
   {
     super.onStop();
-
     Statistics.INSTANCE.stopActivity(this);
-    MRMyTracker.onStopActivity(this);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index ca0c6a2679..440dc60f72 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -16,6 +16,8 @@ import com.mapswithme.util.log.StubLogger;
 
 import java.util.HashMap;
 
+import ru.mail.android.mytracker.MRMyTracker;
+
 public enum Statistics
 {
   INSTANCE;
@@ -203,6 +205,8 @@ public enum Statistics
     {
       FlurryAgent.onStartSession(activity);
       AppEventsLogger.activateApp(activity);
+      MRMyTracker.onStartActivity(activity);
+      org.alohalytics.Statistics.onStart(activity);
     }
   }
 
@@ -221,6 +225,8 @@ public enum Statistics
     {
       FlurryAgent.onEndSession(activity);
       AppEventsLogger.deactivateApp(activity);
+      MRMyTracker.onStopActivity(activity);
+      org.alohalytics.Statistics.onStop(activity);
     }
   }