diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-01-04 12:15:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-04 12:15:26 +0100 |
commit | b38710541941797c2937ea262e9905abccf56287 (patch) | |
tree | d4536b0e53ffb92e18562e549359095c340e1b14 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java | |
parent | 654061c7d1596a3de0a40233c08ccea007ffc2e5 (diff) | |
download | qtlocation-mapboxgl-b38710541941797c2937ea262e9905abccf56287.tar.gz |
[android] - remove deprecated setAccessToken and getAccessToken from OfflineManager, make validating the access token a part of getAccessToken in Mapbox. (#7582)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java index d9cf407677..90f52604df 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java @@ -39,22 +39,16 @@ public final class Mapbox { * @return Mapbox Access Token */ public static String getAccessToken() { + validateAccessToken(); return INSTANCE.accessToken; } /** - * Application context - */ - public static Context getApplicationContext() { - return INSTANCE.context; - } - - /** * Runtime validation of Access Token. * - * @throws InvalidAccessTokenException the exception thrown + * @throws InvalidAccessTokenException exception thrown when not using a valid accessToken */ - public static void validateAccessToken() throws InvalidAccessTokenException { + private static void validateAccessToken() throws InvalidAccessTokenException { String accessToken = INSTANCE.accessToken; if (TextUtils.isEmpty(accessToken) || (!accessToken.toLowerCase(MapboxConstants.MAPBOX_LOCALE).startsWith("pk.") && !accessToken.toLowerCase(MapboxConstants.MAPBOX_LOCALE).startsWith("sk."))) { @@ -63,6 +57,13 @@ public final class Mapbox { } /** + * Application context + */ + public static Context getApplicationContext() { + return INSTANCE.context; + } + + /** * Manually sets the connectivity state of the app. This is useful for apps that control their * own connectivity state and want to bypass any checks to the ConnectivityManager. * |