fix(andorid): pass accessToken to tileStore, in case it's called befo…

…re mapview (#3218)
rnmapbox · Nov 30, 2023 · e899c24 · e899c24
1 parent 6712ddf
commit e899c24
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt b/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt
@@ -30,6 +30,7 @@ import java.nio.file.StandardCopyOption
 import java.util.concurrent.CountDownLatch
 
 import com.rnmapbox.rnmbx.v11compat.offlinemanager.*
+import com.rnmapbox.rnmbx.v11compat.resourceoption.getMapboxAccessToken
 
 data class ZoomRange(val minZoom: Byte, val maxZoom: Byte) {
 
@@ -103,7 +104,9 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
 
 
     val tileStore: TileStore by lazy {
-        TileStore.create()
+        val result = TileStore.create()
+        result.setAccessToken(RNMBXModule.getAccessToken(mReactContext));
+        result
     }
 
     val offlineManager: OfflineManager by lazy {

diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt
@@ -1,6 +1,8 @@
 package com.rnmapbox.rnmbx.v11compat.offlinemanager;
 
 import com.mapbox.common.TileStore
+import com.mapbox.common.TileStoreOptions
+import com.mapbox.common.toValue
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
 import com.mapbox.maps.ResourceOptions
@@ -16,4 +18,8 @@ fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): Offli
         tileStore
       ).build()
   )
+}
+
+fun TileStore.setAccessToken(token: String) {
+  this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue());
 }
diff --git a/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt b/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt
@@ -1,5 +1,6 @@
 package com.rnmapbox.rnmbx.v11compat.offlinemanager;
 
+import com.mapbox.common.MapboxOptions
 import com.mapbox.common.TileStore
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
@@ -9,4 +10,7 @@ fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager
 }
 fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): OfflineManager {
   return OfflineManager()
+}
+fun TileStore.setAccessToken(token: String) {
+  MapboxOptions.accessToken = token
 }