[android] #5058 - Deprecating get/set Access Token In OfflineManager and automatically setting it if MapboxAccountManager is in use

1 files changed, 17 insertions, 2 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 85b3d619b8..e81c366dba 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
@@ -5,7 +5,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.util.Log;
-
+import com.mapbox.mapboxsdk.MapboxAccountManager;
 import java.io.File;
 
 /**
@@ -92,6 +92,10 @@ public class OfflineManager {
         String cachePath = assetRoot  + File.separator + DATABASE_NAME;
         mDefaultFileSourcePtr = createDefaultFileSource(cachePath, assetRoot, DEFAULT_MAX_CACHE_SIZE);
 
+        if (MapboxAccountManager.getInstance() != null) {
+            setAccessToken(mDefaultFileSourcePtr, MapboxAccountManager.getInstance().getAccessToken());
+        }
+
         // Delete any existing previous ambient cache database
         deleteAmbientDatabase(context);
     }
@@ -123,13 +127,24 @@ public class OfflineManager {
         return instance;
     }
 
-    /*
+    /**
      * Access token getter/setter
+     * @param accessToken
+     *
+     * @deprecated As of release 4.1.0, replaced by {@link MapboxAccountManager#start(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 MapboxAccountManager#getAccessToken()}
+     */
+    @Deprecated
     public String getAccessToken() {
         return getAccessToken(mDefaultFileSourcePtr);
     }