Merge branch '24-locationstate-livedata-returns-outdated-values' into 'master'

Resolve "LocationState LiveData returns outdated values"

Closes #24

See merge request pace/mobile/android/pace-cloud-sdk!19

Author: Michael Tran

library/src/main/java/cloud/pace/sdk/appkit/location/AppLocationManager.kt

@@ -39,26 +39,25 @@ class AppLocationManagerImpl(
             }
         }
     }
-    private val locationStateObserver: Observer<LocationState> by lazy {
-        Observer<LocationState> {
-            if (it == LocationState.PERMISSION_DENIED) {
-                callback?.invoke(Result.failure(PermissionDenied))
-                stop()
-            } else if (it == LocationState.NO_LOCATION_FOUND) {
-                callback?.invoke(Result.failure(NoLocationFound))
-                stop()
-            }
-        }
-    }
 
     override fun start(callback: (Result<Location>) -> Unit) {
         this.callback = callback
         startTime = systemManager.getCurrentTimeMillis()
         handler.postDelayed(locationTimeoutRunnable, LOCATION_TIMEOUT)
-        locationProvider.apply {
-            location.observeForever(locationObserver)
-            locationState.observeForever(locationStateObserver)
-            requestLocationUpdates()
+
+        when (locationProvider.getLocationState()) {
+            LocationState.PERMISSION_DENIED -> {
+                callback(Result.failure(PermissionDenied))
+                stop()
+            }
+            LocationState.NO_LOCATION_FOUND -> {
+                callback(Result.failure(NoLocationFound))
+                stop()
+            }
+            else -> {
+                locationProvider.location.observeForever(locationObserver)
+                locationProvider.requestLocationUpdates()
+            }
         }
     }
 
@@ -99,11 +98,8 @@ class AppLocationManagerImpl(
 
     override fun stop() {
         handler.removeCallbacks(locationTimeoutRunnable)
-        locationProvider.apply {
-            location.removeObserver(locationObserver)
-            locationState.removeObserver(locationStateObserver)
-            removeLocationUpdates()
-        }
+        locationProvider.location.removeObserver(locationObserver)
+        locationProvider.removeLocationUpdates()
     }
 
     companion object {

library/src/main/java/cloud/pace/sdk/utils/LocationProvider.kt

@@ -22,6 +22,7 @@ interface LocationProvider {
 
     fun requestLocationUpdates()
     fun getLastKnownLocation(completion: (Location?) -> Unit)
+    fun getLocationState(): LocationState
     fun removeLocationUpdates()
 }
 
@@ -129,6 +130,23 @@ class LocationProviderImpl(
         }
     }
 
+    override fun getLocationState(): LocationState {
+        return when {
+            !systemManager.isLocationPermissionGranted() -> {
+                LocationState.PERMISSION_DENIED
+            }
+            locationManager?.isProviderEnabled(LocationManager.GPS_PROVIDER) == true -> {
+                LocationState.LOCATION_HIGH_ACCURACY
+            }
+            locationManager?.isProviderEnabled(LocationManager.NETWORK_PROVIDER) == true -> {
+                LocationState.LOCATION_LOW_ACCURACY
+            }
+            else -> {
+                LocationState.NO_LOCATION_FOUND
+            }
+        }
+    }
+
     override fun removeLocationUpdates() {
         try {
             context.unregisterReceiver(locationProviderReceiver)

library/src/test/java/cloud/pace/sdk/appkit/utils/MockFactory.kt

@@ -40,6 +40,10 @@ open class TestLocationProvider(private val mockedLocationState: LocationState,
         completion(mockedLocation)
     }
 
+    override fun getLocationState(): LocationState {
+        return mockedLocationState
+    }
+
     override fun removeLocationUpdates() {}
 }