RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #1738 from yunikkk/showcase

Browse source 
[android] Fixed myTracker error.
This commit is contained in:
Alex Zolotarev 2016-01-30 18:15:47 +03:00
commit 9557195a5d
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -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);
}
}