From 0d816916b108bfe830bddf1c01ebe9e12caa88ba Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 18 Mar 2016 16:48:42 -0400 Subject: [PATCH] [android] #4328 - Make Telemetry start only when savedInstanceState is null --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 4 ++-- .../com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java | 2 +- 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 bbe886a0e..1f2b2bd48 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 @@ -369,13 +369,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 baf37e5c6..7ac42b826 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;