diff options
2 files changed, 17 insertions, 6 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); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java index 9f7ad46e6f..fde46b1cab 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java @@ -12,7 +12,6 @@ import android.view.View; import android.widget.Button; import android.widget.ProgressBar; import android.widget.Toast; - import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.Style; @@ -30,9 +29,7 @@ import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.model.constants.AppConstant; import com.mapbox.mapboxsdk.testapp.model.other.OfflineDownloadRegionDialog; import com.mapbox.mapboxsdk.testapp.model.other.OfflineListRegionsDialog; - import org.json.JSONObject; - import java.util.ArrayList; public class OfflineActivity extends AppCompatActivity @@ -118,7 +115,6 @@ public class OfflineActivity extends AppCompatActivity // Set up the OfflineManager mOfflineManager = OfflineManager.getInstance(this); - mOfflineManager.setAccessToken(getString(R.string.mapbox_access_token)); } @Override |