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

[android] [jni] Remove myTracker lib.

Browse source
This commit is contained in:
velichkomarija 2020-11-16 17:23:06 +03:00 • committed by Alexander Boriskov
parent da98672379
commit 842a031476
11 changed files with 0 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/build.gradle
View file

@ -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'

3
android/jni/com/mapswithme/core/jni_helper.cpp
View file

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

1
android/jni/com/mapswithme/core/jni_helper.hpp
View file

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

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

@ -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<GuiThread>(m_functorProcessObject);
@ -290,15 +288,7 @@ void Platform::SendPushWooshTag(std::string const & tag, std::vector<std::string
void Platform::SendMarketingEvent(std::string const & tag,
std::map<std::string, std::string> 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, ());

1
android/jni/com/mapswithme/platform/Platform.hpp
View file

@ -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<base::TaskLoop> m_guiThread;

1
android/multidex-config.txt
View file

@ -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

2
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -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
{

1
android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java
View file

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

67
android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java
View file

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

5
android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java
View file

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

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

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