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

[android] Reverted switch to public myTracker build.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-02-01 14:16:54 +03:00
parent 2ef865b0bd
commit a25fc8d5d6
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/3rd_party/myTracker.jar vendored
View file

Binary file not shown.

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.MyTracker;
import ru.mail.android.mytracker.MyTrackerParams;
import ru.mail.android.mytracker.MRMyTracker;
import ru.mail.android.mytracker.MRMyTrackerParams;
public enum Statistics
{
@ -178,13 +178,12 @@ public enum Statistics
FlurryAgent.setCaptureUncaughtExceptions(false);
FlurryAgent.init(context, PrivateVariables.flurryKey());
MyTracker.setDebugMode(BuildConfig.DEBUG);
MyTracker.createTracker(PrivateVariables.myTrackerKey(), context);
final MyTrackerParams myParams = MyTracker.getTrackerParams();
// TODO get MyTracker version with preinstall tracking
// myParams.setTrackingPreinstallsEnabled(true);
MRMyTracker.setDebugMode(BuildConfig.DEBUG);
MRMyTracker.createTracker(PrivateVariables.myTrackerKey(), context);
final MRMyTrackerParams myParams = MRMyTracker.getTrackerParams();
myParams.setTrackingPreinstallsEnabled(true);
myParams.setTrackingLaunchEnabled(true);
MyTracker.initTracker();
MRMyTracker.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.
@ -222,7 +221,7 @@ public enum Statistics
{
FlurryAgent.onStartSession(activity);
AppEventsLogger.activateApp(activity);
MyTracker.onStartActivity(activity);
MRMyTracker.onStartActivity(activity);
org.alohalytics.Statistics.onStart(activity);
}
}
@ -233,7 +232,7 @@ public enum Statistics
{
FlurryAgent.onEndSession(activity);
AppEventsLogger.deactivateApp(activity);
MyTracker.onStopActivity(activity);
MRMyTracker.onStopActivity(activity);
org.alohalytics.Statistics.onStop(activity);
}
}
@ -308,13 +307,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()));
MyTracker.trackEvent(event, params.get());
MRMyTracker.trackEvent(event, params.get());
trackEvent(event, params);
}
}