summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2016-03-18 16:48:42 -0400
committerBrad Leege <bleege@gmail.com>2016-03-18 17:26:38 -0400
commitd33cee7fd82d98c0993baefebff796354f3a6641 (patch)
tree06f1804e10603e10b303435fadcceed266b9f73a
parent4f816dcfbea1d2b9801d81f57152d893adbc19a2 (diff)
downloadqtlocation-mapboxgl-d33cee7fd82d98c0993baefebff796354f3a6641.tar.gz
[android] #4328 - Make Telemetry start only when savedInstanceState is null
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java4
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index a9ae39972d..e66786ab22 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -371,13 +371,13 @@ public class MapView extends FrameLayout {
trackingSettings.setMyLocationTrackingMode(savedInstanceState.getInt(MapboxConstants.STATE_MY_LOCATION_TRACKING_MODE, MyLocationTracking.TRACKING_NONE));
//noinspection ResourceType
trackingSettings.setMyBearingTrackingMode(savedInstanceState.getInt(MapboxConstants.STATE_MY_BEARING_TRACKING_MODE, MyBearingTracking.NONE));
- } else {
+ } else if (savedInstanceState == null) {
// Force a check for Telemetry
validateTelemetryServiceConfigured();
// Start Telemetry (authorization determined in initial MapboxEventManager constructor)
MapboxEventManager eventManager = MapboxEventManager.getMapboxEventManager();
- eventManager.initialise(getContext(), getAccessToken());
+ eventManager.initialize(getContext(), getAccessToken());
}
// Initialize EGL
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
index baf37e5c6a..7ac42b8266 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
@@ -101,7 +101,7 @@ public class MapboxEventManager {
* @param context The context associated with MapView
* @param accessToken The accessToken to load MapView
*/
- public void initialise(@NonNull Context context, @NonNull String accessToken) {
+ public void initialize(@NonNull Context context, @NonNull String accessToken) {
this.context = context.getApplicationContext();
this.accessToken = accessToken;