@tokamakdev/plugin-location 0.1.0-beta.55 → 0.1.0-beta.56

package/android/LocationPlugin.kt

@@ -91,14 +91,7 @@ class TokamakLocationPlugin(
             PackageManager.PERMISSION_GRANTED
 
     private fun currentPosition(reply: TokamakPluginReply) {
-        val provider = runCatching(::provider).getOrElse {
-            reply(locationFailure(it, "Location is unavailable"))
-            return
-        }
-        if (provider == null) {
-            reply(unavailable("No location provider is available"))
-            return
-        }
+        val provider = availableProvider(reply) ?: return
         runCatching {
             manager.getCurrentLocation(
                 provider,
@@ -108,18 +101,11 @@ class TokamakLocationPlugin(
                 if (location == null) reply(unavailable("Location is unavailable"))
                 else reply(Result.success(position(location)))
             }
-        }.onFailure { reply(locationFailure(it, "Location is unavailable")) }
+        }.onFailure { reply(locationFailure(it)) }
     }
 
     private fun watchPosition(reply: TokamakPluginReply): () -> Unit {
-        val provider = runCatching(::provider).getOrElse {
-            reply(locationFailure(it, "Location is unavailable"))
-            return {}
-        }
-        if (provider == null) {
-            reply(unavailable("No location provider is available"))
-            return {}
-        }
+        val provider = availableProvider(reply) ?: return {}
         val listener = object : LocationListener {
             override fun onLocationChanged(location: Location) {
                 reply(Result.success(position(location)))
@@ -131,16 +117,25 @@ class TokamakLocationPlugin(
 
             override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) = Unit
         }
-        val started = runCatching {
+        runCatching {
             manager.requestLocationUpdates(provider, 1000, 0F, listener, Looper.getMainLooper())
-        }
-        if (started.isFailure) {
-            reply(locationFailure(started.exceptionOrNull(), "Location is unavailable"))
+        }.onFailure {
+            reply(locationFailure(it))
             return {}
         }
         return { manager.removeUpdates(listener) }
     }
 
+    /** The provider to use, or null once [reply] has the reason there is none. */
+    private fun availableProvider(reply: TokamakPluginReply): String? {
+        val provider = runCatching(::provider).getOrElse {
+            reply(locationFailure(it))
+            return null
+        }
+        if (provider == null) reply(unavailable("No location provider is available"))
+        return provider
+    }
+
     private fun provider(): String? =
         listOf(
             LocationManager.GPS_PROVIDER,
@@ -172,9 +167,9 @@ class TokamakLocationPlugin(
     private fun unavailable(message: String): Result<Any?> =
         Result.failure(TokamakPluginError("NotReadableError", message))
 
-    private fun locationFailure(error: Throwable?, fallback: String): Result<Any?> =
+    private fun locationFailure(error: Throwable): Result<Any?> =
         if (error is SecurityException) permissionDenied()
-        else unavailable(error?.message ?: fallback)
+        else unavailable(error.message ?: "Location is unavailable")
 
     private companion object {
         const val LOCATION_PERMISSION_REQUEST = 0xA771

package/apple/LocationPlugin.swift

@@ -6,6 +6,11 @@ final class TokamakLocationPlugin: NSObject, TokamakPlugin,
 {
   let id = "location"
 
+  private static let permissionDenied = TokamakPluginError(
+    name: "NotAllowedError",
+    message: "Location permission was denied"
+  )
+
   private let manager = CLLocationManager()
   private var current: [TokamakPluginReply] = []
   private var watchers: [UUID: TokamakPluginReply] = [:]
@@ -50,20 +55,7 @@ final class TokamakLocationPlugin: NSObject, TokamakPlugin,
   func locationManagerDidChangeAuthorization(
     _ manager: CLLocationManager
   ) {
-    switch manager.authorizationStatus {
-    case .authorizedAlways, .authorizedWhenInUse:
-      manager.startUpdatingLocation()
-    case .denied, .restricted:
-      fail(
-        TokamakPluginError(
-          name: "NotAllowedError",
-          message: "Location permission was denied"
-        ))
-    case .notDetermined:
-      break
-    @unknown default:
-      fail(.notSupported("Location authorization is not supported"))
-    }
+    startIfAuthorized(manager.authorizationStatus)
   }
 
   func locationManager(
@@ -71,16 +63,7 @@ final class TokamakLocationPlugin: NSObject, TokamakPlugin,
     didUpdateLocations locations: [CLLocation]
   ) {
     guard let location = locations.last else { return }
-    let result = Result<Any?, TokamakPluginError>.success(position(location))
-    let waiting = current
-    current.removeAll()
-    for reply in waiting {
-      reply(result)
-    }
-    for reply in watchers.values {
-      reply(result)
-    }
-    stopIfIdle()
+    deliver(.success(position(location)))
   }
 
   func locationManager(
@@ -98,40 +81,47 @@ final class TokamakLocationPlugin: NSObject, TokamakPlugin,
       fail(unavailable("Location services are disabled"))
       return
     }
-    switch manager.authorizationStatus {
+    let status = manager.authorizationStatus
+    if status == .notDetermined {
+      manager.requestWhenInUseAuthorization()
+    } else {
+      startIfAuthorized(status)
+    }
+  }
+
+  /// Starts updates when `status` allows them and fails every request when it
+  /// forbids them.
+  private func startIfAuthorized(_ status: CLAuthorizationStatus) {
+    switch status {
     case .authorizedAlways, .authorizedWhenInUse:
       manager.startUpdatingLocation()
-    case .notDetermined:
-      manager.requestWhenInUseAuthorization()
     case .denied, .restricted:
-      fail(
-        TokamakPluginError(
-          name: "NotAllowedError",
-          message: "Location permission was denied"
-        ))
+      fail(Self.permissionDenied)
+    case .notDetermined:
+      break
     @unknown default:
       fail(.notSupported("Location authorization is not supported"))
     }
   }
 
   private func fail(_ error: TokamakPluginError) {
-    let result = Result<Any?, TokamakPluginError>.failure(error)
+    deliver(.failure(error))
+  }
+
+  /// Replies to the waiting requests and every watcher, then stops when none
+  /// remain.
+  private func deliver(_ result: Result<Any?, TokamakPluginError>) {
     let replies = current + Array(watchers.values)
     current.removeAll()
     for reply in replies {
       reply(result)
     }
-    if watchers.isEmpty {
-      manager.stopUpdatingLocation()
-    }
+    stopIfIdle()
   }
 
   private func locationError(_ error: Error) -> TokamakPluginError {
     if (error as NSError).code == CLError.Code.denied.rawValue {
-      return TokamakPluginError(
-        name: "NotAllowedError",
-        message: "Location permission was denied"
-      )
+      return Self.permissionDenied
     }
     return unavailable(error.localizedDescription)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/plugin-location",
-  "version": "0.1.0-beta.55",
+  "version": "0.1.0-beta.56",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mantty/tokamak.git",
@@ -11,7 +11,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@tokamakdev/plugin": "0.1.0-beta.55"
+    "@tokamakdev/plugin": "0.1.0-beta.56"
   },
   "files": [
     "android",

package/src/index.ts

@@ -25,19 +25,14 @@ class Location extends FrontendPlugin {
   }
 
   getCurrentPosition(): Promise<Position> {
-    if (this.hasNativeTransport) {
-      return this.call("getCurrentPosition");
-    }
-    return web.getCurrentPosition();
+    return this.hasNativeTransport ? this.call("getCurrentPosition") : web.getCurrentPosition();
   }
 
   watchPosition(next: PositionCallback, error: PositionErrorCallback): () => void {
-    if (this.hasNativeTransport) {
-      return this.listen("watchPosition", (position) => {
-        next(position as Position);
-      }, error);
-    }
-    return web.watchPosition(next, error);
+    if (!this.hasNativeTransport) return web.watchPosition(next, error);
+    return this.listen("watchPosition", (position) => {
+      next(position as Position);
+    }, error);
   }
 }