@capgo/inappbrowser 1.2.17 → 1.2.19

package/README.md

@@ -16,9 +16,19 @@ npx cap sync
 ```js
 import { InAppBrowser } from '@capgo/inappbrowser'
 
-InAppBrowser.open("YOUR_URL");
+InAppBrowser.open({ url: "YOUR_URL" });
 ```
 
+### Camera usage
+
+if you need the Camera to work in Android, you need to add the following to your `AndroidManifest.xml` file:
+
+```xml
+<uses-permission android:name="android.permission.CAMERA" />
+```
+
+Then the permission will be asked when the camera is used.
+
 ## API
 
 <docgen-index>

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

@@ -1,30 +1,40 @@
 package ee.forgr.capacitor_inappbrowser;
 
+import android.Manifest;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.CookieManager;
-import android.webkit.WebStorage;
+import android.webkit.PermissionRequest;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.customtabs.CustomTabsServiceConnection;
 import androidx.browser.customtabs.CustomTabsSession;
 import com.getcapacitor.JSObject;
+import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.annotation.Permission;
+import com.getcapacitor.annotation.PermissionCallback;
 import java.util.Iterator;
 
-@CapacitorPlugin(name = "InAppBrowser")
-public class InAppBrowserPlugin extends Plugin {
+@CapacitorPlugin(
+  name = "InAppBrowser",
+  permissions = {
+    @Permission(alias = "camera", strings = { Manifest.permission.CAMERA }),
+  }
+)
+public class InAppBrowserPlugin
+  extends Plugin
+  implements WebViewDialog.PermissionHandler {
 
   public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome"; // Change when in stable
   private CustomTabsClient customTabsClient;
@@ -32,6 +42,39 @@ public class InAppBrowserPlugin extends Plugin {
   private WebViewDialog webViewDialog = null;
   private String currentUrl = "";
 
+  private PermissionRequest currentPermissionRequest;
+
+  public void handleCameraPermissionRequest(PermissionRequest request) {
+    this.currentPermissionRequest = request;
+    if (getPermissionState("camera") != PermissionState.GRANTED) {
+      requestPermissionForAlias("camera", null, "cameraPermissionCallback");
+    } else {
+      grantCameraPermission();
+    }
+  }
+
+  @PermissionCallback
+  private void cameraPermissionCallback() {
+    if (getPermissionState("camera") == PermissionState.GRANTED) {
+      grantCameraPermission();
+    } else {
+      if (currentPermissionRequest != null) {
+        currentPermissionRequest.deny();
+        currentPermissionRequest = null;
+      }
+      // Handle the case where permission was not granted
+    }
+  }
+
+  private void grantCameraPermission() {
+    if (currentPermissionRequest != null) {
+      currentPermissionRequest.grant(
+        new String[] { PermissionRequest.RESOURCE_VIDEO_CAPTURE }
+      );
+      currentPermissionRequest = null;
+    }
+  }
+
   CustomTabsServiceConnection connection = new CustomTabsServiceConnection() {
     @Override
     public void onCustomTabsServiceConnected(
@@ -46,6 +89,33 @@ public class InAppBrowserPlugin extends Plugin {
     public void onServiceDisconnected(ComponentName name) {}
   };
 
+  @PluginMethod
+  public void requestCameraPermission(PluginCall call) {
+    if (getPermissionState("camera") != PermissionState.GRANTED) {
+      requestPermissionForAlias("camera", call, "cameraPermissionCallback");
+    } else {
+      call.resolve();
+    }
+  }
+
+  @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 }
+        );
+        webViewDialog.currentPermissionRequest = null;
+      }
+      call.resolve();
+    } else {
+      call.reject("Camera permission is required");
+    }
+  }
+
   @PluginMethod
   public void setUrl(PluginCall call) {
     String url = call.getString("url");
@@ -211,9 +281,11 @@ public class InAppBrowserPlugin extends Plugin {
               new WebViewDialog(
                 getContext(),
                 android.R.style.Theme_NoTitleBar,
-                options
+                options,
+                InAppBrowserPlugin.this
               );
             webViewDialog.presentWebView();
+            webViewDialog.activity = InAppBrowserPlugin.this.getActivity();
           }
         }
       );

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

@@ -1,5 +1,6 @@
 package ee.forgr.capacitor_inappbrowser;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -7,15 +8,19 @@ import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.webkit.PermissionRequest;
+import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
 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 java.net.URI;
 import java.net.URISyntaxException;
@@ -29,12 +34,27 @@ public class WebViewDialog extends Dialog {
   private Toolbar _toolbar;
   private Options _options;
   private Context _context;
+  public Activity activity;
   private boolean isInitialized = false;
 
-  public WebViewDialog(Context context, int theme, Options options) {
+  public PermissionRequest currentPermissionRequest;
+
+  public interface PermissionHandler {
+    void handleCameraPermissionRequest(PermissionRequest request);
+  }
+
+  private PermissionHandler permissionHandler;
+
+  public WebViewDialog(
+    Context context,
+    int theme,
+    Options options,
+    PermissionHandler permissionHandler
+  ) {
     super(context, theme);
     this._options = options;
     this._context = context;
+    this.permissionHandler = permissionHandler;
     this.isInitialized = false;
   }
 
@@ -65,6 +85,55 @@ public class WebViewDialog extends Dialog {
       .setPluginState(android.webkit.WebSettings.PluginState.ON);
     _webView.getSettings().setLoadWithOverviewMode(true);
     _webView.getSettings().setUseWideViewPort(true);
+    _webView.getSettings().setAllowFileAccessFromFileURLs(true);
+    _webView.getSettings().setAllowUniversalAccessFromFileURLs(true);
+
+    _webView.setWebViewClient(new WebViewClient());
+
+    _webView.setWebChromeClient(
+      new WebChromeClient() {
+        // Grant permissions for cam
+
+        @Override
+        public void onPermissionRequest(final PermissionRequest request) {
+          Log.i(
+            "INAPPBROWSER",
+            "onPermissionRequest " + request.getResources().toString()
+          );
+          final String[] requestedResources = request.getResources();
+          for (String r : requestedResources) {
+            Log.i("INAPPBROWSER", "requestedResources " + r);
+            if (r.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
+              Log.i("INAPPBROWSER", "RESOURCE_VIDEO_CAPTURE req");
+              // Store the permission request
+              currentPermissionRequest = request;
+              // Initiate the permission request through the plugin
+              if (permissionHandler != null) {
+                permissionHandler.handleCameraPermissionRequest(request);
+              }
+              break;
+            }
+          }
+        }
+
+        @Override
+        public void onPermissionRequestCanceled(PermissionRequest request) {
+          super.onPermissionRequestCanceled(request);
+          Toast
+            .makeText(
+              WebViewDialog.this.activity,
+              "Permission Denied",
+              Toast.LENGTH_SHORT
+            )
+            .show();
+          // Handle the denied permission
+          if (currentPermissionRequest != null) {
+            currentPermissionRequest.deny();
+            currentPermissionRequest = null;
+          }
+        }
+      }
+    );
 
     Map<String, String> requestHeaders = new HashMap<>();
     if (_options.getHeaders() != null) {

package/package.json

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