react-native-google-maps-plus 1.8.2 → 1.8.4-dev.1

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -17,6 +17,7 @@ import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.MapView
+import com.google.android.gms.maps.MapsInitializer
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.CircleOptions
@@ -105,6 +106,7 @@ class GoogleMapsViewImpl(
   private var cameraMoveReason = -1
 
   init {
+    MapsInitializer.initialize(reactContext)
     reactContext.addLifecycleEventListener(this)
   }
 

package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -265,19 +265,32 @@ class MapMarkerBuilder(
         try {
           ensureActive()
           val bmp = renderBitmap(m)
-          if (bmp != null) {
+
+          if (bmp == null) {
+            withContext(Dispatchers.Main) { onReady(null) }
+            return@launch
+          }
+          ensureActive()
+          val desc = BitmapDescriptorFactory.fromBitmap(bmp)
+
+          iconCache.put(key, desc)
+          bmp.recycle()
+
+          withContext(Dispatchers.Main) {
             ensureActive()
-            val desc = BitmapDescriptorFactory.fromBitmap(bmp)
-            iconCache.put(key, desc)
-            bmp.recycle()
-            withContext(Dispatchers.Main) {
-              ensureActive()
-              onReady(desc)
-            }
+            onReady(desc)
           }
         } catch (_: OutOfMemoryError) {
           iconCache.evictAll()
+          withContext(Dispatchers.Main) {
+            ensureActive()
+            onReady(null)
+          }
         } catch (_: Throwable) {
+          withContext(Dispatchers.Main) {
+            ensureActive()
+            onReady(null)
+          }
         } finally {
           jobsById.remove(m.id)
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.8.2",
+  "version": "1.8.4-dev.1",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",