Fix token not found error

mapbox · May 24, 2021 · 58566ee · 58566ee
1 parent fdaefbe
commit 58566ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/sdk/src/main/java/com/mapbox/maps/MapInitOptions.kt b/sdk/src/main/java/com/mapbox/maps/MapInitOptions.kt
@@ -94,7 +94,10 @@ fun MapOptions.Builder.applyDefaultParams(context: Context): MapOptions.Builder
  * Get a default [ResourceOptions.Builder] with token from default [CredentialsManager]
  * @property context the context of the application.
  */
-fun ResourceOptions.Builder.applyDefaultParams(context: Context): ResourceOptions.Builder = also {
+fun ResourceOptions.Builder.applyDefaultParams(
+  context: Context,
+  token: String? = null
+): ResourceOptions.Builder = also {
   // make sure that directory `/mapbox/maps` exists
   val databaseDirectoryPath = "${context.filesDir.absolutePath}/$DATABASE_PATH"
   val databaseDirectory = File(databaseDirectoryPath)
@@ -104,7 +107,7 @@ fun ResourceOptions.Builder.applyDefaultParams(context: Context): ResourceOption
     }
   }
 
-  accessToken(CredentialsManager.default.getAccessToken(context))
+  accessToken(token ?: CredentialsManager.default.getAccessToken(context))
   cachePath("$databaseDirectoryPath/$DATABASE_NAME")
   cacheSize(DEFAULT_CACHE_SIZE) // 50 mb
 }
diff --git a/sdk/src/main/java/com/mapbox/maps/ResourceOptionsManager.kt b/sdk/src/main/java/com/mapbox/maps/ResourceOptionsManager.kt
@@ -30,10 +30,10 @@ class ResourceOptionsManager(
      * The default shared instance with default resource options.
      */
     @Synchronized
-    fun getDefault(context: Context): ResourceOptionsManager {
+    fun getDefault(context: Context, token: String? = null): ResourceOptionsManager {
       if (!this::default.isInitialized) {
         default = ResourceOptionsManager(
-          ResourceOptions.Builder().applyDefaultParams(context)
+          ResourceOptions.Builder().applyDefaultParams(context, token)
             .build()
         )
       }

diff --git a/sdk/src/main/java/com/mapbox/maps/ResourcesAttributeParser.kt b/sdk/src/main/java/com/mapbox/maps/ResourcesAttributeParser.kt
@@ -19,14 +19,9 @@ internal object ResourcesAttributeParser {
     typedArray: TypedArray,
     credentialsManager: CredentialsManager
   ): ResourceOptions {
-    val builder = ResourceOptionsManager.getDefault(context).resourceOptions.toBuilder()
 
-    if (typedArray.hasValue(R.styleable.mapbox_MapView_mapbox_resourcesAccessToken)) {
-      builder.accessToken(
-        typedArray.getString(R.styleable.mapbox_MapView_mapbox_resourcesAccessToken)
-          ?: credentialsManager.getAccessToken(context)
-      )
-    }
+    val token = typedArray.getString(R.styleable.mapbox_MapView_mapbox_resourcesAccessToken)
+    val builder = ResourceOptionsManager.getDefault(context, token).resourceOptions.toBuilder()
 
     if (typedArray.hasValue(R.styleable.mapbox_MapView_mapbox_resourcesBaseUrl)) {
       builder.baseURL(typedArray.getString(R.styleable.mapbox_MapView_mapbox_resourcesBaseUrl))