Refactor LocationService

Author: Artur Artikov

core/src/main/kotlin/ru/mobileup/samples/core/location/AndroidLocationService.kt

@@ -11,27 +11,24 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withTimeout
 import ru.mobileup.samples.core.error_handling.LocationNotAvailableException
+import kotlin.coroutines.cancellation.CancellationException
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.nanoseconds
 
 class AndroidLocationService(
     private val context: Context
 ) : LocationService {
 
-    private companion object {
-        const val DEFAULT_TIMEOUT_SECONDS = 10
-    }
-
-    override suspend fun getCurrentLocation(): GeoCoordinate {
+    override suspend fun getCurrentLocation(timeout: Duration): GeoCoordinate {
         return try {
             val fusedLocationProviderClient = LocationServices
                 .getFusedLocationProviderClient(context)
-            getLocation(
-                client = fusedLocationProviderClient,
-                timeout = DEFAULT_TIMEOUT_SECONDS.nanoseconds
-            )
+            getLocation(fusedLocationProviderClient, timeout)
+        } catch (e: CancellationException) {
+            throw e
+        } catch (e: LocationNotAvailableException) {
+            throw e
         } catch (e: Exception) {
-            throw LocationNotAvailableException(e)
+            throw LocationNotAvailableException(e, message = null)
         }
     }
 
@@ -41,21 +38,19 @@ class AndroidLocationService(
         client: FusedLocationProviderClient,
         timeout: Duration
     ): GeoCoordinate {
+        val cancellationTokenSource = CancellationTokenSource()
         return try {
             withTimeout(timeout) {
-                val cancellationTokenSource = CancellationTokenSource()
                 client
-                    .getCurrentLocation(
-                        PRIORITY_HIGH_ACCURACY,
-                        cancellationTokenSource.token
-                    ).await(cancellationTokenSource)
+                    .getCurrentLocation(PRIORITY_HIGH_ACCURACY, cancellationTokenSource.token)
+                    .await(cancellationTokenSource)
                     .let { location ->
-                        GeoCoordinate(
-                            lat = location.latitude,
-                            lng = location.longitude
-                        )
+                        GeoCoordinate(location.latitude, location.longitude)
                     }
             }
+        } catch (e: CancellationException) {
+            cancellationTokenSource.cancel()
+            throw e
         } catch (_: Exception) {
             getLastLocation(client)
         }
@@ -67,10 +62,7 @@ class AndroidLocationService(
     ): GeoCoordinate {
         val location: Location? = client.lastLocation.await()
         return location?.let { location ->
-            GeoCoordinate(
-                lat = location.latitude,
-                lng = location.longitude
-            )
-        } ?: throw LocationNotAvailableException(message = "Last location is null")
+            GeoCoordinate(location.latitude, location.longitude)
+        } ?: throw LocationNotAvailableException(cause = null, "Last location is null")
     }
 }

core/src/main/kotlin/ru/mobileup/samples/core/location/LocationService.kt

@@ -1,8 +1,10 @@
 package ru.mobileup.samples.core.location
 
 import ru.mobileup.samples.core.error_handling.LocationNotAvailableException
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 interface LocationService {
     @Throws(LocationNotAvailableException::class)
-    suspend fun getCurrentLocation(): GeoCoordinate
+    suspend fun getCurrentLocation(timeout: Duration = 10.seconds): GeoCoordinate
 }

core/src/main/kotlin/ru/mobileup/samples/core/permissions/SinglePermissionResult.kt

@@ -13,6 +13,7 @@ sealed class SinglePermissionResult {
     /**
      * Permission has been denied by user
      * If [permanently] == true permission was denied permanently (user chose "Never ask again")
+     * If [automatically] == true permission was denied automatically (user didn't interact with the request)
      */
     class Denied(val permanently: Boolean, val automatically: Boolean) : SinglePermissionResult()
 }

features/module_graph/modules.dot

@@ -1,5 +1,6 @@
 digraph {
 audio
+bluetooth
 calendar
 charts
 chat
@@ -22,9 +23,11 @@ shared_element_transitions
 tutorial
 video
 work_manager
+bluetooth -> charts
 photo -> image
 photo -> video
 root -> audio
+root -> bluetooth
 root -> calendar
 root -> charts
 root -> chat