@tokamakdev/plugin-location 0.1.0-beta.65 → 0.1.0-beta.70

package/android/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+</manifest>

package/android/LocationPlugin.kt

@@ -22,7 +22,6 @@ class TokamakLocationPlugin(
     private val context = host.context
     private val manager =
         context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-    private val permissionRequests = mutableListOf<(Boolean) -> Unit>()
 
     override fun call(method: String, arguments: Any?, reply: TokamakPluginReply) {
         if (method != "getCurrentPosition") {
@@ -55,41 +54,15 @@ class TokamakLocationPlugin(
         }
     }
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray,
-    ) {
-        if (requestCode != LOCATION_PERMISSION_REQUEST) return
-        val granted = grantResults.any { it == PackageManager.PERMISSION_GRANTED }
-        val requests = permissionRequests.toList()
-        permissionRequests.clear()
-        requests.forEach { it(granted) }
-    }
-
+    /** Passes [action] whether the app may read fine or coarse location, asking when it may not. */
     private fun withPermission(action: (Boolean) -> Unit) {
-        if (hasPermission()) {
+        if (PERMISSIONS.any { context.checkSelfPermission(it) == PackageManager.PERMISSION_GRANTED }) {
             action(true)
             return
         }
-        val activity = host.activity ?: return action(false)
-        permissionRequests.add(action)
-        if (permissionRequests.size > 1) return
-        activity.requestPermissions(
-            arrayOf(
-                Manifest.permission.ACCESS_FINE_LOCATION,
-                Manifest.permission.ACCESS_COARSE_LOCATION,
-            ),
-            LOCATION_PERMISSION_REQUEST,
-        )
+        host.requestPermissions(PERMISSIONS) { granted -> action(granted.containsValue(true)) }
     }
 
-    private fun hasPermission(): Boolean =
-        context.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) ==
-            PackageManager.PERMISSION_GRANTED ||
-            context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) ==
-            PackageManager.PERMISSION_GRANTED
-
     private fun currentPosition(reply: TokamakPluginReply) {
         val provider = availableProvider(reply) ?: return
         runCatching {
@@ -172,6 +145,6 @@ class TokamakLocationPlugin(
         else unavailable(error.message ?: "Location is unavailable")
 
     private companion object {
-        const val LOCATION_PERMISSION_REQUEST = 0xA771
+        val PERMISSIONS = setOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/plugin-location",
-  "version": "0.1.0-beta.65",
+  "version": "0.1.0-beta.70",
   "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.65"
+    "@tokamakdev/plugin": "0.1.0-beta.70"
   },
   "files": [
     "android",

package/src/index.ts

@@ -30,9 +30,7 @@ class Location extends FrontendPlugin {
 
   watchPosition(next: PositionCallback, error: PositionErrorCallback): () => void {
     if (!this.hasNativeTransport) return web.watchPosition(next, error);
-    return this.listen("watchPosition", (position) => {
-      next(position as Position);
-    }, error);
+    return this.listen("watchPosition", next, error);
   }
 }
 

package/tokamak-plugin.json

@@ -5,28 +5,17 @@
     "macos": {
       "class": "TokamakLocationPlugin",
       "sources": ["apple/LocationPlugin.swift"],
-      "frameworks": ["CoreLocation"],
       "plist": "apple/macos/Info.plist"
     },
     "ios": {
       "class": "TokamakLocationPlugin",
       "sources": ["apple/LocationPlugin.swift"],
-      "frameworks": ["CoreLocation"],
-      "plist": "apple/ios/Info.plist"
-    },
-    "ios-simulator": {
-      "class": "TokamakLocationPlugin",
-      "sources": ["apple/LocationPlugin.swift"],
-      "frameworks": ["CoreLocation"],
       "plist": "apple/ios/Info.plist"
     },
     "android": {
       "class": "com.tokamak.plugins.location.TokamakLocationPlugin",
       "sources": ["android/LocationPlugin.kt"],
-      "permissions": [
-        "android.permission.ACCESS_COARSE_LOCATION",
-        "android.permission.ACCESS_FINE_LOCATION"
-      ]
+      "manifest": "android/AndroidManifest.xml"
     }
   }
 }