diff --git a/android/3rd_party/MRGService-no-inapp.jar b/android/3rd_party/MRGService-no-inapp.jar deleted file mode 100644 index eb306eb278..0000000000 Binary files a/android/3rd_party/MRGService-no-inapp.jar and /dev/null differ diff --git a/android/3rd_party/mrgsmanifest.jar b/android/3rd_party/mrgsmanifest.jar deleted file mode 100644 index 634b195581..0000000000 Binary files a/android/3rd_party/mrgsmanifest.jar and /dev/null differ diff --git a/android/3rd_party/myTracker.jar b/android/3rd_party/myTracker.jar index 963a221de2..0609083869 100644 Binary files a/android/3rd_party/myTracker.jar and b/android/3rd_party/myTracker.jar differ diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f001f628b1..f86c219401 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -282,27 +282,12 @@ - - - - - - - - - + - - - - - - - - - + 185237551520383 - - ***REMOVED*** - 150 + + ***REMOVED*** sans-serif-light diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java index 57c8a987a0..ee7679552a 100644 --- a/android/src/com/mapswithme/maps/MWMApplication.java +++ b/android/src/com/mapswithme/maps/MWMApplication.java @@ -1,7 +1,6 @@ package com.mapswithme.maps; import android.content.pm.PackageManager.NameNotFoundException; -import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; import android.text.TextUtils; @@ -22,12 +21,11 @@ import com.parse.Parse; import com.parse.ParseInstallation; import java.io.File; -import java.util.Date; +import java.util.HashMap; +import java.util.Map; -import ru.mail.mrgservice.MRGSApplication; -import ru.mail.mrgservice.MRGSMap; -import ru.mail.mrgservice.MRGSServerData; -import ru.mail.mrgservice.MRGService; +import ru.mail.android.mytracker.MRMyTracker; +import ru.mail.android.mytracker.MRMyTrackerParams; public class MWMApplication extends android.app.Application implements ActiveCountryTree.ActiveCountryListener { @@ -39,6 +37,10 @@ public class MWMApplication extends android.app.Application implements ActiveCou private static final String FIRST_INSTALL_VERSION = "FirstInstallVersion"; private static final String FIRST_INSTALL_FLAVOR = "FirstInstallFlavor"; private static final String IS_PREINSTALL_ACTIVATED = "PreinstallActivated"; + // for myTracker + private static final String MY_MAP_DOWNLOAD = "DownloadMap"; + private static final String MY_MAP_UPDATE = "UpdateMap"; + private static final String MY_TOTAL_COUNT = "Count"; private static MWMApplication mSelf; private final Gson mGson = new Gson(); @@ -78,12 +80,17 @@ public class MWMApplication extends android.app.Application implements ActiveCou @Override public void onCountryGroupChanged(int oldGroup, int oldPosition, int newGroup, int newPosition) { - if (!nativeGetBoolean(IS_PREINSTALL_ACTIVATED, false) && newGroup == ActiveCountryTree.GROUP_UP_TO_DATE && - ((oldGroup == ActiveCountryTree.GROUP_OUT_OF_DATE) || (oldGroup == ActiveCountryTree.GROUP_NEW && ActiveCountryTree.getTotalDownloadedCount() > 1))) - { - nativeSetBoolean(IS_PREINSTALL_ACTIVATED, true); - Statistics.INSTANCE.trackPreinstallActivation(getFirstInstallFlavor()); - } + if (oldGroup == ActiveCountryTree.GROUP_NEW && newGroup == ActiveCountryTree.GROUP_UP_TO_DATE) + myTrackerTrackMapChange(MY_MAP_DOWNLOAD); + else if (oldGroup == ActiveCountryTree.GROUP_OUT_OF_DATE && newGroup == ActiveCountryTree.GROUP_UP_TO_DATE) + myTrackerTrackMapChange(MY_MAP_UPDATE); + } + + private void myTrackerTrackMapChange(String eventType) + { + final Map params = new HashMap<>(); + params.put(MY_TOTAL_COUNT, String.valueOf(ActiveCountryTree.getTotalDownloadedCount())); + MRMyTracker.trackEvent(eventType, params); } @Override @@ -143,22 +150,17 @@ public class MWMApplication extends android.app.Application implements ActiveCou initParse(); } - private void initMrgs() + private void initMyTracker() { - MRGService.setAppContext(this); - final Bundle options = new Bundle(); - options.putBoolean("locations", false); - MRGService.service(this, new MRGSServerData.MRGSServerDataDelegate() - { - @Override - public void loadServerDataDidFinished(MRGSMap mrgsMap) {} + MRMyTracker.setDebugMode(BuildConfig.DEBUG); - @Override - public void loadPromoBannersDidFinished(MRGSMap mrgsMap) {} - }, getString(R.string.mrgs_id), getString(R.string.mrgs_key), options); + MRMyTracker.createTracker(getString(R.string.my_tracker_app_id), this); - if (getLaunchesNumber() == 1) - MRGSApplication.instance().markAsUpdated(new Date()); + final MRMyTrackerParams myParams = MRMyTracker.getTrackerParams(); + myParams.setTrackingPreinstallsEnabled(true); + myParams.setTrackingLaunchEnabled(true); + + MRMyTracker.initTracker(); } public String getApkPath() @@ -259,7 +261,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou mAreStatsInitialised = true; updateLaunchNumbers(); updateSessionsNumber(); - initMrgs(); + initMyTracker(); PreferenceManager.setDefaultValues(this, R.xml.preferences, false); org.alohalytics.Statistics.setDebugMode(BuildConfig.DEBUG); diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index bab7d0eb85..0f628dde8b 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -12,7 +12,7 @@ import com.mapswithme.maps.R; import com.mapswithme.util.Utils; import com.mapswithme.util.statistics.Statistics; -import ru.mail.mrgservice.MRGService; +import ru.mail.android.mytracker.MRMyTracker; public class BaseMwmFragmentActivity extends AppCompatActivity { @@ -42,7 +42,7 @@ public class BaseMwmFragmentActivity extends AppCompatActivity super.onStart(); Statistics.INSTANCE.startActivity(this); - MRGService.instance().onStart(this); + MRMyTracker.onStartActivity(this); } @Override @@ -51,7 +51,7 @@ public class BaseMwmFragmentActivity extends AppCompatActivity Statistics.INSTANCE.stopActivity(this); super.onStop(); - MRGService.instance().onStop(this); + MRMyTracker.onStopActivity(this); } @Override diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java index b44a8e54a1..82da7a2e24 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java +++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java @@ -37,7 +37,7 @@ import com.mapswithme.util.Yota; import com.mapswithme.util.statistics.AlohaHelper; import com.mapswithme.util.statistics.Statistics; -import ru.mail.mrgservice.MRGService; +import ru.mail.android.mytracker.MRMyTracker; public class SettingsActivity extends PreferenceActivity implements OnPreferenceClickListener, Preference.OnPreferenceChangeListener { @@ -137,7 +137,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference super.onStart(); Statistics.INSTANCE.startActivity(this); - MRGService.instance().onStart(this); + MRMyTracker.onStartActivity(this); } @Override @@ -146,7 +146,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference super.onStop(); Statistics.INSTANCE.stopActivity(this); - MRGService.instance().onStop(this); + MRMyTracker.onStopActivity(this); } @Override diff --git a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java index daf61c0439..a7e151a637 100644 --- a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java +++ b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java @@ -7,7 +7,7 @@ import android.content.Intent; import com.mapswithme.maps.MWMApplication; import com.mapswithme.util.statistics.AlohaHelper; -import ru.mail.mrgservice.MRGSBroadcastReceiver; +import ru.mail.android.mytracker.campaign.CampaignReceiver; /** * Custom broadcast receiver to send intent to MRGS & Alohalytics at the same time @@ -46,8 +46,8 @@ public class MultipleTrackerReferrerReceiver extends BroadcastReceiver e.printStackTrace(); } intent.setComponent(null); - // now send intent to MRGS tools - MRGSBroadcastReceiver receiver = new MRGSBroadcastReceiver(); + // 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 170e459fc3..06ee7a4ded 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -76,7 +76,6 @@ public enum Statistics public static final String FACEBOOK_INVITE_LATER = "Facebook invites dialog cancelled."; public static final String FACEBOOK_INVITE_INVITED = "GPlay dialog cancelled."; public static final String RATE_DIALOG_RATED = "GPlay dialog. Rating set"; - public static final String PREINSTALL_ACTIVATED = "Preinstalled application activated."; } public static class EventParam @@ -99,7 +98,7 @@ public enum Statistics public static final String RATING = "Rating"; } - private Statistics() + Statistics() { configure(); mLogger.d("Created Statistics instance."); @@ -149,13 +148,6 @@ public enum Statistics trackIfEnabled(mEventBuilder.setName(EventName.COUNTRY_DELETE).buildEvent()); } - public void trackPreinstallActivation(String flavor) - { - trackIfEnabled(mEventBuilder. - setName(EventName.PREINSTALL_ACTIVATED + flavor). - buildEvent()); - } - public void trackSearchCategoryClicked(String category) { final Event event = mEventBuilder