kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2016-09-21 12:46:39 +03:00 • committed by Vladimir Byko-Ianko
parent 2f2bb22100
commit 7bf8328b21
3 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -101,7 +101,7 @@ void Platform::SendMarketingEvent(string const & tag, map<string, string> const
env->GetStaticMethodID(g_myTrackerClazz, "trackEvent", "(Ljava/lang/String;)V");
env->CallStaticVoidMethod(g_myTrackerClazz, myTrackerTrackEvent,
jni::ToJavaString(env, eventData));
jni::TScopedLocalRef(env, jni::ToJavaString(env, eventData)).get());
}
Platform::EConnectionType Platform::ConnectionStatus()

3
android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
View file

@ -8,6 +8,7 @@ import com.mapswithme.util.UiUtils;
import com.mapswithme.util.ViewServer;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.statistics.Statistics;
import com.my.tracker.MyTracker;
public class BaseActivityDelegate
{
@ -38,11 +39,13 @@ public class BaseActivityDelegate
public void onStart()
{
Statistics.INSTANCE.startActivity(mActivity.get());
MyTracker.onStartActivity(mActivity.get());
}
public void onStop()
{
Statistics.INSTANCE.stopActivity(mActivity.get());
MyTracker.onStopActivity(mActivity.get());
}
public void onResume()

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

@ -26,8 +26,6 @@ import com.mapswithme.maps.editor.Editor;
import com.mapswithme.maps.editor.OsmOAuth;
import com.mapswithme.util.Config;
import com.mapswithme.util.ConnectionState;
import com.my.tracker.MyTracker;
import com.my.tracker.MyTrackerParams;
public enum Statistics
{
@ -232,13 +230,6 @@ public enum Statistics
FlurryAgent.setVersionName(BuildConfig.VERSION_NAME);
FlurryAgent.setCaptureUncaughtExceptions(false);
FlurryAgent.init(context, PrivateVariables.flurryKey());
MyTracker.setDebugMode(BuildConfig.DEBUG);
MyTracker.createTracker(PrivateVariables.myTrackerKey(), context);
final MyTrackerParams myParams = MyTracker.getTrackerParams();
myParams.setDefaultVendorAppPackage();
myParams.setTrackingLaunchEnabled(true);
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.
@ -295,7 +286,6 @@ public enum Statistics
{
FlurryAgent.onStartSession(activity);
AppEventsLogger.activateApp(activity);
MyTracker.onStartActivity(activity);
org.alohalytics.Statistics.onStart(activity);
}
}
@ -306,7 +296,6 @@ public enum Statistics
{
FlurryAgent.onEndSession(activity);
AppEventsLogger.deactivateApp(activity);
MyTracker.onStopActivity(activity);
org.alohalytics.Statistics.onStop(activity);
}
}
@ -377,7 +366,6 @@ public enum Statistics
if (mEnabled)
{
final ParameterBuilder params = params().add(EventParam.COUNT, String.valueOf(MapManager.nativeGetDownloadedCount()));
MyTracker.trackEvent(event, params.get());
trackEvent(event, params);
}
}