[android] - remove deprecated setAccessToken and getAccessToken from OfflineManager, make validating the access token a part of getAccessToken in Mapbox. (#7582)

1 files changed, 1 insertions, 27 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
index 1a396f6897..beaea73024 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
@@ -7,7 +7,6 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.NonNull;
-import android.text.TextUtils;
 
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
@@ -97,10 +96,7 @@ public class OfflineManager {
     String assetRoot = getDatabasePath(context);
     String cachePath = assetRoot + File.separator + DATABASE_NAME;
     mDefaultFileSourcePtr = createDefaultFileSource(cachePath, assetRoot, DEFAULT_MAX_CACHE_SIZE);
-
-    if (!TextUtils.isEmpty(Mapbox.getAccessToken())) {
-      setAccessToken(mDefaultFileSourcePtr, Mapbox.getAccessToken());
-    }
+    setAccessToken(mDefaultFileSourcePtr, Mapbox.getAccessToken());
 
     // Delete any existing previous ambient cache database
     deleteAmbientDatabase(context);
@@ -191,28 +187,6 @@ public class OfflineManager {
     return instance;
   }
 
-  /**
-   * Access token getter/setter
-   *
-   * @param accessToken the accessToken to be used by the offline manager.
-   * @deprecated As of release 4.1.0, replaced by {@link Mapbox#getInstance(Context, String)}}
-   */
-  @Deprecated
-  public void setAccessToken(String accessToken) {
-    setAccessToken(mDefaultFileSourcePtr, accessToken);
-  }
-
-  /**
-   * Get Access Token
-   *
-   * @return Access Token
-   * @deprecated As of release 4.1.0, replaced by {@link Mapbox#getAccessToken()}
-   */
-  @Deprecated
-  public String getAccessToken() {
-    return getAccessToken(mDefaultFileSourcePtr);
-  }
-
   private Handler getHandler() {
     if (handler == null) {
       handler = new Handler(Looper.getMainLooper());