@tokamakdev/plugin-location 0.1.0-beta.48 → 0.1.0-beta.50

package/android/LocationPlugin.kt

@@ -1,7 +1,6 @@
 package com.tokamak.plugins.location
 
 import android.Manifest
-import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
 import android.location.Location
@@ -10,17 +9,19 @@ import android.location.LocationManager
 import android.os.Bundle
 import android.os.CancellationSignal
 import android.os.Looper
+import com.tokamak.runtime.TokamakHost
 import com.tokamak.runtime.TokamakPlugin
 import com.tokamak.runtime.TokamakPluginError
 import com.tokamak.runtime.TokamakPluginReply
 
-internal class TokamakLocationPlugin(
-    private val activity: Activity,
+class TokamakLocationPlugin(
+    private val host: TokamakHost,
 ) : TokamakPlugin {
     override val id = "location"
 
+    private val context = host.context
     private val manager =
-        activity.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
     private val permissionRequests = mutableListOf<(Boolean) -> Unit>()
 
     override fun call(method: String, arguments: Any?, reply: TokamakPluginReply) {
@@ -71,6 +72,7 @@ internal class TokamakLocationPlugin(
             action(true)
             return
         }
+        val activity = host.activity ?: return action(false)
         permissionRequests.add(action)
         if (permissionRequests.size > 1) return
         activity.requestPermissions(
@@ -83,9 +85,9 @@ internal class TokamakLocationPlugin(
     }
 
     private fun hasPermission(): Boolean =
-        activity.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) ==
+        context.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) ==
             PackageManager.PERMISSION_GRANTED ||
-            activity.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) ==
+            context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) ==
             PackageManager.PERMISSION_GRANTED
 
     private fun currentPosition(reply: TokamakPluginReply) {
@@ -101,7 +103,7 @@ internal class TokamakLocationPlugin(
             manager.getCurrentLocation(
                 provider,
                 CancellationSignal(),
-                activity.mainExecutor,
+                context.mainExecutor,
             ) { location ->
                 if (location == null) reply(unavailable("Location is unavailable"))
                 else reply(Result.success(position(location)))

package/apple/LocationPlugin.swift

@@ -10,7 +10,7 @@ final class TokamakLocationPlugin: NSObject, TokamakPlugin,
   private var current: [TokamakPluginReply] = []
   private var watchers: [UUID: TokamakPluginReply] = [:]
 
-  override init() {
+  init(host: TokamakHost) {
     super.init()
     manager.delegate = self
     manager.desiredAccuracy = kCLLocationAccuracyBest

package/apple/ios/Info.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app uses your location when you request location features.</string>
+</dict>
+</plist>

package/apple/macos/Info.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSLocationUsageDescription</key>
+	<string>This app uses your location when you request location features.</string>
+</dict>
+</plist>

package/package.json

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

package/src/index.ts

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

package/tokamak-plugin.json

@@ -1,31 +1,24 @@
 {
   "schemaVersion": 1,
   "id": "location",
-  "kind": "frontend",
   "platforms": {
     "macos": {
       "class": "TokamakLocationPlugin",
       "sources": ["apple/LocationPlugin.swift"],
       "frameworks": ["CoreLocation"],
-      "plist": {
-        "NSLocationUsageDescription": "This app uses your location when you request location features."
-      }
+      "plist": "apple/macos/Info.plist"
     },
     "ios": {
       "class": "TokamakLocationPlugin",
       "sources": ["apple/LocationPlugin.swift"],
       "frameworks": ["CoreLocation"],
-      "plist": {
-        "NSLocationWhenInUseUsageDescription": "This app uses your location when you request location features."
-      }
+      "plist": "apple/ios/Info.plist"
     },
     "ios-simulator": {
       "class": "TokamakLocationPlugin",
       "sources": ["apple/LocationPlugin.swift"],
       "frameworks": ["CoreLocation"],
-      "plist": {
-        "NSLocationWhenInUseUsageDescription": "This app uses your location when you request location features."
-      }
+      "plist": "apple/ios/Info.plist"
     },
     "android": {
       "class": "com.tokamak.plugins.location.TokamakLocationPlugin",