react-native-google-maps-plus 1.10.0-dev.3 → 1.10.0-dev.5

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

@@ -152,6 +152,7 @@ class GoogleMapsViewImpl(
           super.addView(it)
           it.getMapAsync { map ->
             googleMap = map
+            googleMap?.setLocationSource(locationHandler)
             googleMap?.setOnMapLoadedCallback {
               googleMap?.setOnCameraMoveStartedListener(this@GoogleMapsViewImpl)
               googleMap?.setOnCameraMoveListener(this@GoogleMapsViewImpl)
@@ -288,11 +289,7 @@ class GoogleMapsViewImpl(
           isCompassEnabled = value?.compassEnabled ?: false
           isIndoorLevelPickerEnabled = value?.indoorLevelPickerEnabled ?: false
           isMapToolbarEnabled = value?.mapToolbarEnabled ?: false
-
-          val myLocationEnabled = value?.myLocationButtonEnabled ?: false
-          googleMap?.setLocationSource(if (myLocationEnabled) locationHandler else null)
-          isMyLocationButtonEnabled = myLocationEnabled
-
+          isMyLocationButtonEnabled = value?.myLocationButtonEnabled ?: false
           isRotateGesturesEnabled = value?.rotateEnabled ?: true
           isScrollGesturesEnabled = value?.scrollEnabled ?: true
           isScrollGesturesEnabledDuringRotateOrZoom =

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

@@ -19,7 +19,6 @@ import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationSettingsRequest
 import com.google.android.gms.location.Priority
 import com.google.android.gms.maps.LocationSource
-import com.google.android.gms.tasks.OnSuccessListener
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 private const val REQ_LOCATION_SETTINGS = 2001
@@ -144,13 +143,12 @@ class LocationHandler(
     }
     try {
       fusedLocationClientProviderClient.lastLocation
-        .addOnSuccessListener(
-          OnSuccessListener { location ->
-            if (location != null) {
-              onUpdate?.invoke(location)
-            }
-          },
-        ).addOnFailureListener { e ->
+        .addOnSuccessListener { location ->
+          if (location != null) {
+            listener?.onLocationChanged(location)
+            onUpdate?.invoke(location)
+          }
+        }.addOnFailureListener { e ->
           val error = e.toLocationErrorCode(context)
           onError?.invoke(error)
         }
@@ -166,14 +164,14 @@ class LocationHandler(
             }
           }
         }
+
+      val req = locationRequest ?: return
+      val callback = locationCallback ?: return
+
       fusedLocationClientProviderClient
-        .requestLocationUpdates(
-          locationRequest!!,
-          locationCallback!!,
-          Looper.getMainLooper(),
-        ).addOnFailureListener { e ->
-          val error = e.toLocationErrorCode(context)
-          onError?.invoke(error)
+        .requestLocationUpdates(req, callback, Looper.getMainLooper())
+        .addOnFailureListener { e ->
+          onError?.invoke(e.toLocationErrorCode(context))
         }
     } catch (_: SecurityException) {
       onError?.invoke(RNLocationErrorCode.PERMISSION_DENIED)
@@ -186,11 +184,10 @@ class LocationHandler(
   fun stop() {
     if (!isActive) return
     isActive = false
-    if (locationCallback != null) {
-      fusedLocationClientProviderClient.removeLocationUpdates(locationCallback!!)
-      fusedLocationClientProviderClient.flushLocations()
-      locationCallback = null
-    }
+    val callback = locationCallback ?: return
+    fusedLocationClientProviderClient.removeLocationUpdates(callback)
+    fusedLocationClientProviderClient.flushLocations()
+    locationCallback = null
   }
 
   override fun activate(listener: LocationSource.OnLocationChangedListener) {

package/package.json

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