diff options
author | Dmitry Donskoy <donskdmitry@mail.ru> | 2018-09-27 14:47:15 +0300 |
---|---|---|
committer | Aleksandr Zatsepin <alexzatsepin@users.noreply.github.com> | 2018-09-27 15:40:37 +0300 |
commit | 0ca4d6245c1a019f5000278ab7530846c3853d62 (patch) | |
tree | f7cdd1ca35943a69b3883afa570d413dc2be47ea | |
parent | 2c67f6f235eb6e683fbb783118e5c824683c7deb (diff) |
Revert "[android] Added EventLogger interface injection to Statistics class, removed deprecated calls from Activity delegate, replaced by event logger calls"
This reverts commit 722e67953f234e3f65bcfa6c82f7bfb8cedd2de4.
-rw-r--r-- | android/src/com/mapswithme/maps/MwmApplication.java | 9 | ||||
-rw-r--r-- | android/src/com/mapswithme/util/statistics/Statistics.java | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index 99a4e372a8..82b9aa07dd 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -72,9 +72,6 @@ public class MwmApplication extends Application @SuppressWarnings("NullableProblems") @NonNull private ExternalLibrariesMediator mMediator; - @SuppressWarnings("NullableProblems") - @NonNull - private Statistics mStatistics; @NonNull public SubwayManager getSubwayManager() @@ -309,12 +306,6 @@ public class MwmApplication extends Application return mConnectivityListener; } - @NonNull - public Statistics getStatistics() - { - return mStatistics; - } - private native void nativeInitPlatform(String apkPath, String storagePath, String privatePath, String tmpPath, String obbGooglePath, String flavorName, String buildType, boolean isTablet); diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index 8894ef1e46..98cf05bab7 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -146,7 +146,7 @@ import static com.mapswithme.util.statistics.Statistics.ParamValue.UNKNOWN; import static com.mapswithme.util.statistics.Statistics.ParamValue.VEHICLE; import static com.mapswithme.util.statistics.Statistics.ParamValue.VIATOR; -public final class Statistics +public enum Statistics { INSTANCE; @@ -492,9 +492,8 @@ public final class Statistics // avoid their initialization if user has disabled statistics collection. private final boolean mEnabled; - public Statistics(@NonNull ExternalLibrariesMediator mediator) + Statistics() { - mMediator = mediator; mEnabled = SharedPropertiesUtils.isStatisticsEnabled(); final Context context = MwmApplication.get(); // At the moment we need special handling for Alohalytics to enable/disable logging of events in core C++ code. |