From 57872f6b24c218e6b346ec73b644edd11bf3b063 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Tue, 24 Feb 2015 12:30:14 +0300 Subject: [PATCH] [android] Statistics review fixes --- .../src/android/java/org/alohalytics/Statistics.java | 7 ++++--- android/src/com/mapswithme/maps/MWMApplication.java | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3party/Alohalytics/src/android/java/org/alohalytics/Statistics.java b/3party/Alohalytics/src/android/java/org/alohalytics/Statistics.java index afc603e4f7..fab5c9bfbe 100644 --- a/3party/Alohalytics/src/android/java/org/alohalytics/Statistics.java +++ b/3party/Alohalytics/src/android/java/org/alohalytics/Statistics.java @@ -73,10 +73,11 @@ public class Statistics { } final SharedPreferences prefs = context.getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE); Location lastKnownLocation = null; - if (SystemInfo.hasPermission("android.permission.ACCESS_FINE_LOCATION", context)) { + if (SystemInfo.hasPermission(android.Manifest.permission.ACCESS_FINE_LOCATION, context)) { // Requires ACCESS_FINE_LOCATION permission. final LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); - lastKnownLocation = (lm == null) ? null : lm.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER); + if (lm != null) + lastKnownLocation = lm.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER); } // Is it a real new install? if (id.second && installTime == updateTime) { @@ -95,7 +96,7 @@ public class Statistics { SystemInfo.getDeviceInfoAsync(context); prefs.edit().putLong(PREF_APP_UPDATE_TIME, updateTime).apply(); } - logEvent("$launch", SystemInfo.hasPermission("android.permission.ACCESS_NETWORK_STATE", context) + logEvent("$launch", SystemInfo.hasPermission(android.Manifest.permission.ACCESS_NETWORK_STATE, context) ? SystemInfo.getConnectionInfo(context) : null, lastKnownLocation); } diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java index 579dace3f9..9e54b91ffe 100644 --- a/android/src/com/mapswithme/maps/MWMApplication.java +++ b/android/src/com/mapswithme/maps/MWMApplication.java @@ -258,7 +258,6 @@ public class MWMApplication extends android.app.Application implements ActiveCou PreferenceManager.setDefaultValues(this, R.xml.preferences, false); org.alohalytics.Statistics.setDebugMode(BuildConfig.DEBUG); - // We try to take into an account if app was previously installed. org.alohalytics.Statistics.setup(BuildConfig.STATISTICS_URL, this); } }