@capgo/inappbrowser 6.6.5 → 6.6.6

package/README.md

@@ -28,7 +28,9 @@ Web platform is not supported. Use `window.open` instead.
 Add the following to your `AndroidManifest.xml` file:
 
 ```xml
-<uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA" />
+		<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+		<uses-permission android:name="android.permission.RECORD_AUDIO"/>
 ```
 
 Then the permission will be asked when the camera is used.

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/InAppBrowserPlugin.java

@@ -9,14 +9,10 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.ArrayMap;
 import android.util.Log;
-import android.view.View;
-import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.PermissionRequest;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
+import androidx.annotation.NonNull;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
@@ -32,11 +28,6 @@ import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.Semaphore;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -94,33 +85,27 @@ public class InAppBrowserPlugin
   }
 
   @PermissionCallback
-  private void microphonePermissionCallback() {
+  private void microphonePermissionCallback(PluginCall call) {
     if (getPermissionState("microphone") == PermissionState.GRANTED) {
-      grantCameraPermission();
+      grantCameraAndMicrophonePermission();
     } else {
       if (currentPermissionRequest != null) {
         currentPermissionRequest.deny();
         currentPermissionRequest = null;
       }
-      // Handle the case where permission was not granted
+      call.reject("Microphone permission is required");
     }
   }
 
-  @PermissionCallback
-  private void microphonePermissionCallback(PluginCall call) {
-    if (getPermissionState("microphone") == PermissionState.GRANTED) {
-      // Permission granted, notify the WebView to proceed
-      if (
-        webViewDialog != null && webViewDialog.currentPermissionRequest != null
-      ) {
-        webViewDialog.currentPermissionRequest.grant(
-          new String[] { PermissionRequest.RESOURCE_AUDIO_CAPTURE }
-        );
-        webViewDialog.currentPermissionRequest = null;
-      }
-      call.resolve();
-    } else {
-      call.reject("Camera permission is required");
+  private void grantCameraAndMicrophonePermission() {
+    if (currentPermissionRequest != null) {
+      currentPermissionRequest.grant(
+        new String[] {
+          PermissionRequest.RESOURCE_VIDEO_CAPTURE,
+          PermissionRequest.RESOURCE_AUDIO_CAPTURE,
+        }
+      );
+      currentPermissionRequest = null;
     }
   }
 
@@ -128,8 +113,14 @@ public class InAppBrowserPlugin
     this.currentPermissionRequest = request;
     if (getPermissionState("camera") != PermissionState.GRANTED) {
       requestPermissionForAlias("camera", null, "cameraPermissionCallback");
+    } else if (getPermissionState("microphone") != PermissionState.GRANTED) {
+      requestPermissionForAlias(
+        "microphone",
+        null,
+        "microphonePermissionCallback"
+      );
     } else {
-      grantCameraPermission();
+      grantCameraAndMicrophonePermission();
     }
   }
 
@@ -188,17 +179,20 @@ public class InAppBrowserPlugin
   @PermissionCallback
   private void cameraPermissionCallback(PluginCall call) {
     if (getPermissionState("camera") == PermissionState.GRANTED) {
-      // Permission granted, notify the WebView to proceed
-      if (
-        webViewDialog != null && webViewDialog.currentPermissionRequest != null
-      ) {
-        webViewDialog.currentPermissionRequest.grant(
-          new String[] { PermissionRequest.RESOURCE_VIDEO_CAPTURE }
+      if (getPermissionState("microphone") != PermissionState.GRANTED) {
+        requestPermissionForAlias(
+          "microphone",
+          null,
+          "microphonePermissionCallback"
         );
-        webViewDialog.currentPermissionRequest = null;
+      } else {
+        grantCameraAndMicrophonePermission();
       }
-      call.resolve();
     } else {
+      if (currentPermissionRequest != null) {
+        currentPermissionRequest.deny();
+        currentPermissionRequest = null;
+      }
       call.reject("Camera permission is required");
     }
   }
@@ -215,7 +209,7 @@ public class InAppBrowserPlugin
   CustomTabsServiceConnection connection = new CustomTabsServiceConnection() {
     @Override
     public void onCustomTabsServiceConnected(
-      ComponentName name,
+      @NonNull ComponentName name,
       CustomTabsClient client
     ) {
       customTabsClient = client;
@@ -339,8 +333,6 @@ public class InAppBrowserPlugin
     String cookieString = cookieManager.getCookie(url);
     ArrayList<String> cookiesToRemove = new ArrayList<>();
 
-    cookiesToRemove.clear();
-
     if (cookieString != null) {
       String[] cookies = cookieString.split("; ");
 
@@ -417,8 +409,12 @@ public class InAppBrowserPlugin
     options.setUrl(url);
     options.setHeaders(call.getObject("headers"));
     options.setCredentials(call.getObject("credentials"));
-    options.setShowReloadButton(call.getBoolean("showReloadButton", false));
-    options.setVisibleTitle(call.getBoolean("visibleTitle", true));
+    options.setShowReloadButton(
+      Boolean.TRUE.equals(call.getBoolean("showReloadButton", false))
+    );
+    options.setVisibleTitle(
+      Boolean.TRUE.equals(call.getBoolean("visibleTitle", true))
+    );
     if (Boolean.TRUE.equals(options.getVisibleTitle())) {
       options.setTitle(call.getString("title", "New Window"));
     } else {
@@ -434,15 +430,19 @@ public class InAppBrowserPlugin
     options.setShareSubject(call.getString("shareSubject", null));
     options.setToolbarType(call.getString("toolbarType", ""));
     options.setActiveNativeNavigationForWebview(
-      call.getBoolean("activeNativeNavigationForWebview", false)
+      Boolean.TRUE.equals(
+        call.getBoolean("activeNativeNavigationForWebview", false)
+      )
     );
     options.setDisableGoBackOnNativeApplication(
-      call.getBoolean("disableGoBackOnNativeApplication", false)
+      Boolean.TRUE.equals(
+        call.getBoolean("disableGoBackOnNativeApplication", false)
+      )
     );
     options.setPresentAfterPageLoad(
-      call.getBoolean("isPresentAfterPageLoad", false)
+      Boolean.TRUE.equals(call.getBoolean("isPresentAfterPageLoad", false))
     );
-    if (call.getBoolean("closeModal", false)) {
+    if (Boolean.TRUE.equals(call.getBoolean("closeModal", false))) {
       options.setCloseModal(true);
       options.setCloseModalTitle(call.getString("closeModalTitle", "Close"));
       options.setCloseModalDescription(
@@ -541,11 +541,11 @@ public class InAppBrowserPlugin
     }
     JSObject eventData = call.getObject("detail");
     // Log event data
-    Log.d("InAppBrowserPlugin", "Event data: " + eventData.toString());
     if (eventData == null) {
       call.reject("No event data provided");
       return;
     }
+    Log.d("InAppBrowserPlugin", "Event data: " + eventData.toString());
     this.getActivity()
       .runOnUiThread(
         new Runnable() {

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -14,7 +14,6 @@ import android.net.Uri;
 import android.net.http.SslError;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -26,17 +25,16 @@ import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
-import androidx.annotation.Nullable;
 import com.getcapacitor.JSObject;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -45,7 +43,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class WebViewDialog extends Dialog {
@@ -116,14 +113,14 @@ public class WebViewDialog extends Dialog {
     }
   }
 
+  @SuppressLint("SetJavaScriptEnabled")
   public void presentWebView() {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setCancelable(true);
-    getWindow()
-      .setFlags(
-        WindowManager.LayoutParams.FLAG_FULLSCREEN,
-        WindowManager.LayoutParams.FLAG_FULLSCREEN
-      );
+    Objects.requireNonNull(getWindow()).setFlags(
+      WindowManager.LayoutParams.FLAG_FULLSCREEN,
+      WindowManager.LayoutParams.FLAG_FULLSCREEN
+    );
     setContentView(R.layout.activity_browser);
     getWindow()
       .setLayout(
@@ -178,7 +175,7 @@ public class WebViewDialog extends Dialog {
         public void onPermissionRequest(final PermissionRequest request) {
           Log.i(
             "INAPPBROWSER",
-            "onPermissionRequest " + request.getResources().toString()
+            "onPermissionRequest " + Arrays.toString(request.getResources())
           );
           final String[] requestedResources = request.getResources();
           for (String r : requestedResources) {
@@ -191,7 +188,7 @@ public class WebViewDialog extends Dialog {
               if (permissionHandler != null) {
                 permissionHandler.handleCameraPermissionRequest(request);
               }
-              break;
+              return; // Return here to avoid denying the request
             } else if (r.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {
               Log.i("INAPPBROWSER", "RESOURCE_AUDIO_CAPTURE req");
               // Store the permission request
@@ -200,9 +197,11 @@ public class WebViewDialog extends Dialog {
               if (permissionHandler != null) {
                 permissionHandler.handleMicrophonePermissionRequest(request);
               }
-              break;
+              return; // Return here to avoid denying the request
             }
           }
+          // If no matching permission is found, deny the request
+          request.deny();
         }
 
         @Override

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "6.6.5",
+  "version": "6.6.6",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",