From 842a0314768c68eb1f710fd34278018ee4d8db41 Mon Sep 17 00:00:00 2001 From: velichkomarija Date: Mon, 16 Nov 2020 17:23:06 +0300 Subject: [PATCH] [android] [jni] Remove myTracker lib. --- android/build.gradle | 1 - .../jni/com/mapswithme/core/jni_helper.cpp | 3 - .../jni/com/mapswithme/core/jni_helper.hpp | 1 - .../jni/com/mapswithme/platform/Platform.cpp | 10 --- .../jni/com/mapswithme/platform/Platform.hpp | 1 - android/multidex-config.txt | 1 - .../com/mapswithme/maps/SplashActivity.java | 2 - .../maps/analytics/EventLoggerAggregator.java | 1 - .../maps/analytics/MyTrackerEventLogger.java | 67 ------------------- .../util/MultipleTrackerReferrerReceiver.java | 5 -- .../util/statistics/Statistics.java | 9 --- 11 files changed, 101 deletions(-) delete mode 100644 android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java diff --git a/android/build.gradle b/android/build.gradle index 183b9fdf5c..7bb9ab68b1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -60,7 +60,6 @@ dependencies { implementation 'com.mopub.mediation:facebookaudiencenetwork:5.6.1.0' implementation 'com.google.code.gson:gson:2.6.1' implementation 'com.pushwoosh:pushwoosh:5.19.7' - implementation 'com.my.tracker:mytracker-sdk:1.5.3' implementation ('com.my.target:mytarget-sdk:5.2.2') { exclude group: 'com.google.android.exoplayer', module:'exoplayer-core' exclude group: 'com.google.android.exoplayer', module:'exoplayer-dash' diff --git a/android/jni/com/mapswithme/core/jni_helper.cpp b/android/jni/com/mapswithme/core/jni_helper.cpp index dfc668d00f..79cc0e1a2c 100644 --- a/android/jni/com/mapswithme/core/jni_helper.cpp +++ b/android/jni/com/mapswithme/core/jni_helper.cpp @@ -17,7 +17,6 @@ extern JavaVM * GetJVM() jclass g_mapObjectClazz; jclass g_featureIdClazz; jclass g_bookmarkClazz; -jclass g_myTrackerClazz; jclass g_httpClientClazz; jclass g_httpParamsClazz; jclass g_platformSocketClazz; @@ -48,7 +47,6 @@ JNI_OnLoad(JavaVM * jvm, void *) g_mapObjectClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/MapObject"); g_featureIdClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/FeatureId"); g_bookmarkClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/Bookmark"); - g_myTrackerClazz = jni::GetGlobalClassRef(env, "com/my/tracker/MyTracker"); g_httpClientClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpClient"); g_httpParamsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpClient$Params"); g_platformSocketClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/location/PlatformSocket"); @@ -78,7 +76,6 @@ JNI_OnUnload(JavaVM *, void *) env->DeleteGlobalRef(g_mapObjectClazz); env->DeleteGlobalRef(g_featureIdClazz); env->DeleteGlobalRef(g_bookmarkClazz); - env->DeleteGlobalRef(g_myTrackerClazz); env->DeleteGlobalRef(g_httpClientClazz); env->DeleteGlobalRef(g_httpParamsClazz); env->DeleteGlobalRef(g_platformSocketClazz); diff --git a/android/jni/com/mapswithme/core/jni_helper.hpp b/android/jni/com/mapswithme/core/jni_helper.hpp index f11879b35c..49bec3c877 100644 --- a/android/jni/com/mapswithme/core/jni_helper.hpp +++ b/android/jni/com/mapswithme/core/jni_helper.hpp @@ -18,7 +18,6 @@ extern jclass g_mapObjectClazz; extern jclass g_featureIdClazz; extern jclass g_bookmarkClazz; -extern jclass g_myTrackerClazz; extern jclass g_httpClientClazz; extern jclass g_httpParamsClazz; extern jclass g_platformSocketClazz; diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index 67872c30dd..6def99a3ac 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -184,8 +184,6 @@ void Platform::Initialize(JNIEnv * env, jobject functorProcessObject, jstring ap "(Ljava/lang/String;[Ljava/lang/String;)V"); m_sendAppsFlyerTagsMethod = env->GetMethodID(functorProcessClass, "sendAppsFlyerTags", "(Ljava/lang/String;[Lcom/mapswithme/util/KeyValue;)V"); - m_myTrackerTrackMethod = env->GetStaticMethodID(g_myTrackerClazz, "trackEvent", - "(Ljava/lang/String;)Z"); m_guiThread = std::make_unique(m_functorProcessObject); @@ -290,15 +288,7 @@ void Platform::SendPushWooshTag(std::string const & tag, std::vector const & params) { - ASSERT(m_myTrackerTrackMethod, ()); - JNIEnv * env = jni::GetEnv(); - std::string eventData = tag; - for (auto const & item : params) - eventData.append("_" + item.first + "_" + item.second); - - env->CallStaticBooleanMethod(g_myTrackerClazz, m_myTrackerTrackMethod, - jni::TScopedLocalRef(env, jni::ToJavaString(env, eventData)).get()); ASSERT(m_functorProcessObject, ()); ASSERT(m_sendAppsFlyerTagsMethod, ()); diff --git a/android/jni/com/mapswithme/platform/Platform.hpp b/android/jni/com/mapswithme/platform/Platform.hpp index 24d94a5800..e11e851cf3 100644 --- a/android/jni/com/mapswithme/platform/Platform.hpp +++ b/android/jni/com/mapswithme/platform/Platform.hpp @@ -70,7 +70,6 @@ private: jobject m_functorProcessObject = nullptr; jmethodID m_sendPushWooshTagsMethod = nullptr; jmethodID m_sendAppsFlyerTagsMethod = nullptr; - jmethodID m_myTrackerTrackMethod = nullptr; AndroidSecureStorage m_secureStorage; std::unique_ptr m_guiThread; diff --git a/android/multidex-config.txt b/android/multidex-config.txt index ec4eaa7e21..44108d379e 100644 --- a/android/multidex-config.txt +++ b/android/multidex-config.txt @@ -28,4 +28,3 @@ com/mapswithme/util/NetworkPolicy.class com/mapswithme/util/sharing/ShareableInfoProvider.class com/mapswithme/util/StorageUtils.class com/mapswithme/util/Utils.class -com/my/tracker/MyTracker.class diff --git a/android/src/com/mapswithme/maps/SplashActivity.java b/android/src/com/mapswithme/maps/SplashActivity.java index 48d5108969..6ab4e5209f 100644 --- a/android/src/com/mapswithme/maps/SplashActivity.java +++ b/android/src/com/mapswithme/maps/SplashActivity.java @@ -37,7 +37,6 @@ import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import com.mapswithme.util.statistics.PushwooshHelper; -import com.my.tracker.MyTracker; public class SplashActivity extends AppCompatActivity implements BaseNewsFragment.NewsDialogListener, BaseActivity, @@ -125,7 +124,6 @@ public class SplashActivity extends AppCompatActivity { LOGGER.i(TAG, "Limit ad tracking disabled, sensitive tracking initialized"); mediator.initSensitiveData(); - MyTracker.trackLaunchManually(SplashActivity.this); } else { diff --git a/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java b/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java index 5ca2f3ff81..9a131f4aa2 100644 --- a/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java +++ b/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java @@ -18,7 +18,6 @@ class EventLoggerAggregator extends ContextDependentEventLogger super(application); mLoggers = new HashMap<>(); mLoggers.put(PushWooshEventLogger.class, new PushWooshEventLogger(application)); - mLoggers.put(MyTrackerEventLogger.class, new MyTrackerEventLogger(application)); mLoggers.put(FlurryEventLogger.class, new FlurryEventLogger(application)); } diff --git a/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java b/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java deleted file mode 100644 index 24793cc29f..0000000000 --- a/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.mapswithme.maps.analytics; - -import android.app.Activity; -import android.app.Application; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.mapswithme.maps.BuildConfig; -import com.mapswithme.maps.PrivateVariables; -import com.mapswithme.util.PermissionsUtils; -import com.my.tracker.MyTracker; -import com.my.tracker.MyTrackerParams; - -import java.util.Map; - -class MyTrackerEventLogger extends ContextDependentEventLogger -{ - MyTrackerEventLogger(@NonNull Application application) - { - super(application); - } - - @Override - public void initialize() - { - initTracker(); - } - - @Override - public void sendTags(@NonNull String tag, @Nullable String[] params) - { - /* Do nothing */ - } - - @Override - public void logEvent(@NonNull String event, @NonNull Map params) - { - MyTracker.trackEvent(event, params); - } - - @Override - public void startActivity(@NonNull Activity context) - { - MyTracker.onStartActivity(context); - } - - @Override - public void stopActivity(@NonNull Activity context) - { - MyTracker.onStopActivity(context); - } - - private void initTracker() - { - MyTracker.setDebugMode(BuildConfig.DEBUG); - MyTracker.createTracker(PrivateVariables.myTrackerKey(), getApplication()); - final MyTrackerParams myParams = MyTracker.getTrackerParams(); - if (myParams != null) - { - myParams.setDefaultVendorAppPackage(); - boolean isLocationGranted = PermissionsUtils.isLocationGranted(getApplication()); - myParams.setTrackingLocationEnabled(isLocationGranted); - myParams.setTrackingEnvironmentEnabled(isLocationGranted); - } - MyTracker.initTracker(); - } -} diff --git a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java index e7c83c7a83..2425bafe6e 100644 --- a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java +++ b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java @@ -8,7 +8,6 @@ import android.util.Log; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import com.mapswithme.util.statistics.AlohaHelper; -import com.my.tracker.campaign.CampaignReceiver; import static com.mapswithme.maps.MwmApplication.backgroundTracker; @@ -54,9 +53,5 @@ public class MultipleTrackerReferrerReceiver extends BroadcastReceiver { e.printStackTrace(); } - intent.setComponent(null); - // now send intent to myTracker - CampaignReceiver receiver = new CampaignReceiver(); - receiver.onReceive(context, intent); } } diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index c77be96a43..e8f76175c3 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -45,7 +45,6 @@ import com.mapswithme.util.Counters; import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.PowerManagment; import com.mapswithme.util.SharedPropertiesUtils; -import com.my.tracker.MyTracker; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -1217,9 +1216,6 @@ public enum Statistics .add(BANNER, ad.getBannerId()) .add(PROVIDER, ad.getProvider()) .add(STATE, String.valueOf(state))); - - if (!eventName.equals(PP_BANNER_SHOW) || state == PP_BANNER_STATE_PREVIEW) - MyTracker.trackEvent(eventName); } public void trackPPBannerError(@NonNull String bannerId, @NonNull String provider, @@ -1234,7 +1230,6 @@ public enum Statistics .add(PROVIDER, provider) .add(STATE, String.valueOf(state)); trackEvent(eventName, builder.get()); - MyTracker.trackEvent(eventName); } public void trackBookingSearchEvent(@NonNull MapObject mapObject) @@ -1339,9 +1334,6 @@ public enum Statistics .add(PLACEMENT, placement.toString()) .add(STATE, state.toString()) .add(COUNT_LOWERCASE, itemsCount)); - - if (state == GalleryState.ONLINE) - MyTracker.trackEvent(PP_SPONSORED_SHOWN + "_" + type.getProvider()); } public void trackGalleryError(@NonNull GalleryType type, @@ -1388,7 +1380,6 @@ public enum Statistics public void trackSearchPromoCategory(@NonNull String eventName, @NonNull String provider) { trackEvent(eventName, Statistics.params().add(PROVIDER, provider).get()); - MyTracker.trackEvent(eventName + "_" + provider); } public void trackSettingsToggle(boolean value)