fix(android): honor permission handler for geolocation

подтверждено

Author: F0RLE

src/android/binding.rs

@@ -95,6 +95,14 @@ macro_rules! android_binding {
       [JString, jni::objects::JObjectArray],
       jint
     );
+    android_fn!(
+      $domain,
+      $package,
+      RustWebChromeClient,
+      onGeolocationPermissionRequestNative,
+      [JString, JString],
+      jint
+    );
   }};
 }
 
@@ -545,3 +553,27 @@ pub unsafe fn onPermissionRequestNative(
     2 // Default
   }
 }
+
+#[allow(non_snake_case)]
+pub unsafe fn onGeolocationPermissionRequestNative(
+  mut env: JNIEnv,
+  _: JClass,
+  webview_id: JString,
+  _origin: JString,
+) -> jint {
+  let Ok(webview_id) = env.get_string(&webview_id) else {
+    return 2;
+  };
+  let webview_id = webview_id.to_str().ok().unwrap_or_default();
+  let permission_handlers = PERMISSION_HANDLER.lock().unwrap();
+  let Some(handler) = permission_handlers.get(webview_id) else {
+    return 2;
+  };
+
+  match (handler.handler)(PermissionKind::Geolocation) {
+    PermissionResponse::Allow => 0,
+    PermissionResponse::Deny => 1,
+    PermissionResponse::Default => 2,
+    PermissionResponse::Prompt => 3,
+  }
+}

src/android/kotlin/RustWebChromeClient.kt

@@ -92,10 +92,15 @@ class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
   }
 
   override fun onPermissionRequest(request: PermissionRequest) {
+    val requestedResources = safePermissionRequestResources(request.resources)
     val response = onPermissionRequestNative(activity.currentWebViewId(), request.resources)
     when (response) {
       0 -> { // Allow
-        request.grant(request.resources)
+        if (requestedResources.isNotEmpty()) {
+          request.grant(requestedResources)
+        } else {
+          request.deny()
+        }
         return
       }
       1 -> { // Deny
@@ -112,31 +117,34 @@ class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
 
     val isRequestPermissionRequired = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
     val permissionList: MutableList<String> = ArrayList()
-    if (listOf(*request.resources).contains("android.webkit.resource.VIDEO_CAPTURE")) {
+    if (requestedResources.contains(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
       permissionList.add(Manifest.permission.CAMERA)
     }
-    if (listOf(*request.resources).contains("android.webkit.resource.AUDIO_CAPTURE")) {
+    if (requestedResources.contains(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {
       permissionList.add(Manifest.permission.MODIFY_AUDIO_SETTINGS)
       permissionList.add(Manifest.permission.RECORD_AUDIO)
     }
-    if (permissionList.isNotEmpty() && isRequestPermissionRequired) {
+    if (requestedResources.isEmpty()) {
+      request.deny()
+    } else if (permissionList.isNotEmpty() && isRequestPermissionRequired) {
       val permissions = permissionList.toTypedArray()
       permissionListener = object : PermissionListener {
         override fun onPermissionSelect(isGranted: Boolean?) {
           if (isGranted == true) {
-            request.grant(request.resources)
+            request.grant(requestedResources)
           } else {
             request.deny()
           }
         }
       }
       permissionLauncher.launch(permissions)
     } else {
-      request.grant(request.resources)
+      request.grant(requestedResources)
     }
   }
 
   private external fun onPermissionRequestNative(webviewId: String, resources: Array<String>): Int
+  private external fun onGeolocationPermissionRequestNative(webviewId: String, origin: String): Int
 
   /**
    * Show the browser alert modal
@@ -260,9 +268,20 @@ class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
     callback: GeolocationPermissions.Callback
   ) {
     super.onGeolocationPermissionsShowPrompt(origin, callback)
+    when (onGeolocationPermissionRequestNative(activity.currentWebViewId(), origin)) {
+      1 -> {
+        callback.invoke(origin, false, false)
+        return
+      }
+    }
+
     Logger.debug("onGeolocationPermissionsShowPrompt: DOING IT HERE FOR ORIGIN: $origin")
-    val geoPermissions =
-      arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)
+    val geoPermissions = definedGeolocationPermissions()
+    if (geoPermissions.isEmpty()) {
+      callback.invoke(origin, false, false)
+      return
+    }
+
     if (!PermissionHelper.hasPermissions(activity, geoPermissions)) {
       permissionListener = object : PermissionListener {
         override fun onPermissionSelect(isGranted: Boolean?) {
@@ -289,6 +308,26 @@ class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
     }
   }
 
+  private fun safePermissionRequestResources(resources: Array<String>): Array<String> {
+    return resources.filter {
+      it == PermissionRequest.RESOURCE_AUDIO_CAPTURE ||
+        it == PermissionRequest.RESOURCE_VIDEO_CAPTURE ||
+        it == PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID ||
+        it == PermissionRequest.RESOURCE_MIDI_SYSEX
+    }.toTypedArray()
+  }
+
+  private fun definedGeolocationPermissions(): Array<String> {
+    val permissions = ArrayList<String>()
+    if (PermissionHelper.hasDefinedPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION)) {
+      permissions.add(Manifest.permission.ACCESS_COARSE_LOCATION)
+    }
+    if (PermissionHelper.hasDefinedPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION)) {
+      permissions.add(Manifest.permission.ACCESS_FINE_LOCATION)
+    }
+    return permissions.toTypedArray()
+  }
+
   override fun onShowFileChooser(
     webView: WebView,
     filePathCallback: ValueCallback<Array<Uri?>?>,

src/lib.rs

@@ -808,7 +808,9 @@ struct WebViewAttributes<'a> {
   /// - **Windows**: Fully supported via WebView2's PermissionRequested event.
   /// - **macOS / iOS**: Fully supported via WKUIDelegate's requestMediaCapturePermission.
   /// - **Linux**: Fully supported via WebKitGTK's permission-request signal.
-  /// - **Android**: Supported via JNI bridge with some limitations (WIP).
+  /// - **Android**: Supported via JNI bridge for geolocation, microphone, camera,
+  ///   protected media, and MIDI requests. Android runtime permissions may still
+  ///   trigger native OS prompts before access is granted.
   ///
   /// ## Example
   ///

src/permissions.rs

@@ -9,6 +9,13 @@ pub enum PermissionKind {
   /// Camera access permission.
   Camera,
   /// Geolocation access permission.
+  ///
+  /// ## Platform-specific
+  ///
+  /// - **Windows**: Supported via `COREWEBVIEW2_PERMISSION_KIND_GEOLOCATION`.
+  /// - **Linux**: Supported via `GeolocationPermissionRequest`.
+  /// - **Android**: Supported via `WebChromeClient.onGeolocationPermissionsShowPrompt`.
+  /// - **macOS / iOS**: Not yet supported by platform backends.
   Geolocation,
   /// Notifications permission.
   ///