From b7cad1284843752fd625c8438024694d259d3051 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Sat, 30 Jan 2016 17:07:18 +0300
Subject: [PATCH] [android] Fixed myTracker error.

---
 .../util/statistics/Statistics.java           | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index f6c473cc40..f8f14de5a4 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -21,8 +21,8 @@ import com.mapswithme.maps.api.ParsedMwmRequest;
 import com.mapswithme.maps.bookmarks.data.MapObject;
 import com.mapswithme.util.Config;
 import com.mapswithme.util.ConnectionState;
-import ru.mail.android.mytracker.MRMyTracker;
-import ru.mail.android.mytracker.MRMyTrackerParams;
+import ru.mail.android.mytracker.MyTracker;
+import ru.mail.android.mytracker.MyTrackerParams;
 
 public enum Statistics
 {
@@ -178,12 +178,13 @@ public enum Statistics
       FlurryAgent.setCaptureUncaughtExceptions(false);
       FlurryAgent.init(context, PrivateVariables.flurryKey());
 
-      MRMyTracker.setDebugMode(BuildConfig.DEBUG);
-      MRMyTracker.createTracker(PrivateVariables.myTrackerKey(), context);
-      final MRMyTrackerParams myParams = MRMyTracker.getTrackerParams();
-      myParams.setTrackingPreinstallsEnabled(true);
+      MyTracker.setDebugMode(BuildConfig.DEBUG);
+      MyTracker.createTracker(PrivateVariables.myTrackerKey(), context);
+      final MyTrackerParams myParams = MyTracker.getTrackerParams();
+      // TODO get MyTracker version with preinstall tracking
+      //      myParams.setTrackingPreinstallsEnabled(true);
       myParams.setTrackingLaunchEnabled(true);
-      MRMyTracker.initTracker();
+      MyTracker.initTracker();
     }
     // At the moment, need to always initialize engine for correct JNI http part reusing.
     // Statistics is still enabled/disabled separately and never sent anywhere if turned off.
@@ -221,7 +222,7 @@ public enum Statistics
     {
       FlurryAgent.onStartSession(activity);
       AppEventsLogger.activateApp(activity);
-      MRMyTracker.onStartActivity(activity);
+      MyTracker.onStartActivity(activity);
       org.alohalytics.Statistics.onStart(activity);
     }
   }
@@ -232,7 +233,7 @@ public enum Statistics
     {
       FlurryAgent.onEndSession(activity);
       AppEventsLogger.deactivateApp(activity);
-      MRMyTracker.onStopActivity(activity);
+      MyTracker.onStopActivity(activity);
       org.alohalytics.Statistics.onStop(activity);
     }
   }
@@ -307,13 +308,13 @@ public enum Statistics
     else
       trackEvent(EventName.ACTIVE_CONNECTION, params().add(EventParam.CONNECTION_TYPE, "Not connected."));
   }
-  
+
   public void trackMapChanged(String event)
   {
     if (mEnabled)
     {
       final ParameterBuilder params = params().add(EventParam.COUNT, String.valueOf(ActiveCountryTree.getTotalDownloadedCount()));
-      MRMyTracker.trackEvent(event, params.get());
+      MyTracker.trackEvent(event, params.get());
       trackEvent(event, params);
     }
   }