diff options
author | Brad Leege <bleege@gmail.com> | 2016-05-25 16:49:53 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2016-05-25 20:40:17 -0500 |
commit | 485a644d3208582238ae579c28747157a50ebf63 (patch) | |
tree | 77492bc06d199c87087a30c568411476bf3aafbe | |
parent | 50b891561f8cbf31d3ab9d81a3987ff2960b3718 (diff) | |
download | qtlocation-mapboxgl-485a644d3208582238ae579c28747157a50ebf63.tar.gz |
[android] #5075 - Setting MapboxAccountManager as preferred source for access token
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 a9c53ad4ea..27ecb7520b 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 ce2cfbf7af..3d96727758 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(); } |