From 485a644d3208582238ae579c28747157a50ebf63 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 25 May 2016 16:49:53 -0500 Subject: [PATCH] [android] #5075 - Setting MapboxAccountManager as preferred source for access token --- .../main/java/com/mapbox/mapboxsdk/maps/MapFragment.java | 8 +++++++- .../com/mapbox/mapboxsdk/maps/SupportMapFragment.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index a9c53ad4e..27ecb7520 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -11,6 +11,7 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.mapbox.mapboxsdk.MapboxAccountManager; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException; @@ -68,7 +69,12 @@ public final class MapFragment extends Fragment { // Assign an AccessToken if needed if (options == null || options.getAccessToken() == null) { - String token = getToken(inflater.getContext()); + String token = null; + if (MapboxAccountManager.getInstance() != null) { + token = MapboxAccountManager.getInstance().getAccessToken(); + } else { + token = getToken(inflater.getContext()); + } if (TextUtils.isEmpty(token)) { throw new InvalidAccessTokenException(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index ce2cfbf7a..3d9672775 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -11,6 +11,7 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.mapbox.mapboxsdk.MapboxAccountManager; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException; @@ -77,7 +78,12 @@ public class SupportMapFragment extends Fragment { // Assign an AccessToken if needed if (options == null || options.getAccessToken() == null) { - String token = getToken(inflater.getContext()); + String token = null; + if (MapboxAccountManager.getInstance() != null) { + token = MapboxAccountManager.getInstance().getAccessToken(); + } else { + token = getToken(inflater.getContext()); + } if (TextUtils.isEmpty(token)) { throw new InvalidAccessTokenException(); }