@capgo/inappbrowser 5.0.0 → 6.0.2

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

@@ -1,5 +1,6 @@
 package ee.forgr.capacitor_inappbrowser;
 
+import android.Manifest;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -8,26 +9,71 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.WebStorage;
+import android.webkit.CookieManager;
+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;
   private CustomTabsSession currentSession;
   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
@@ -43,12 +89,40 @@ 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");
     if (url == null || TextUtils.isEmpty(url)) {
       call.reject("Invalid URL");
     }
+    currentUrl = url;
     this.getActivity()
       .runOnUiThread(
         new Runnable() {
@@ -71,6 +145,7 @@ public class InAppBrowserPlugin extends Plugin {
     if (url == null || TextUtils.isEmpty(url)) {
       call.reject("Invalid URL");
     }
+    currentUrl = url;
     CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(
       getCustomTabsSession()
     );
@@ -112,8 +187,51 @@ public class InAppBrowserPlugin extends Plugin {
 
   @PluginMethod
   public void clearCookies(PluginCall call) {
-    WebStorage.getInstance().deleteAllData();
-    call.resolve();
+    String url = call.getString("url");
+    Boolean clearCache = call.getBoolean("cache", false);
+    if (url == null || TextUtils.isEmpty(url)) {
+      call.reject("Invalid URL");
+    } else {
+      CookieManager cookieManager = CookieManager.getInstance();
+      String cookie = cookieManager.getCookie(url);
+      if (cookie != null) {
+        String[] cookies = cookie.split(";");
+        for (String c : cookies) {
+          String cookieName = c.substring(0, c.indexOf("="));
+          cookieManager.setCookie(
+            url,
+            cookieName + "=; Expires=Thu, 01 Jan 1970 00:00:01 GMT"
+          );
+          if (clearCache) {
+            cookieManager.removeSessionCookie();
+          }
+        }
+      }
+      call.resolve();
+    }
+  }
+
+  @PluginMethod
+  public void getCookies(PluginCall call) {
+    String url = call.getString("url");
+    if (url == null || TextUtils.isEmpty(url)) {
+      call.reject("Invalid URL");
+    } else {
+      CookieManager cookieManager = CookieManager.getInstance();
+      String cookieString = cookieManager.getCookie(url);
+      if (cookieString != null) {
+        String[] cookiePairs = cookieString.split("; ");
+        JSObject result = new JSObject();
+        for (String cookie : cookiePairs) {
+          String[] parts = cookie.split("=", 2);
+          if (parts.length == 2) {
+            result.put(parts[0], parts[1]);
+          }
+        }
+        call.resolve(result);
+      }
+      call.resolve(new JSObject());
+    }
   }
 
   @PluginMethod
@@ -122,17 +240,44 @@ public class InAppBrowserPlugin extends Plugin {
     if (url == null || TextUtils.isEmpty(url)) {
       call.reject("Invalid URL");
     }
+    currentUrl = url;
     final Options options = new Options();
     options.setUrl(url);
     options.setHeaders(call.getObject("headers"));
-    options.setTitle(call.getString("title", "New Window"));
+    options.setShowReloadButton(call.getBoolean("showReloadButton", false));
+    if (Boolean.TRUE.equals(call.getBoolean("visibleTitle", true))) {
+      options.setTitle(call.getString("title", "New Window"));
+    } else {
+      options.setTitle(call.getString("title", ""));
+    }
+    options.setToolbarColor(call.getString("toolbarColor", "#ffffff"));
+    options.setArrow(Boolean.TRUE.equals(call.getBoolean("showArrow", false)));
+
     options.setShareDisclaimer(call.getObject("shareDisclaimer", null));
     options.setShareSubject(call.getString("shareSubject", null));
     options.setToolbarType(call.getString("toolbarType", ""));
+    options.setActiveNativeNavigationForWebview(
+      call.getBoolean("activeNativeNavigationForWebview", false)
+    );
+    options.setDisableGoBackOnNativeApplication(
+      call.getBoolean("disableGoBackOnNativeApplication", false)
+    );
     options.setPresentAfterPageLoad(
       call.getBoolean("isPresentAfterPageLoad", false)
     );
+    if (call.getBoolean("closeModal", false)) {
+      options.setCloseModal(true);
+      options.setCloseModalTitle(call.getString("closeModalTitle", "Close"));
+      options.setCloseModalDescription(
+        call.getString("closeModalDescription", "Are you sure ?")
+      );
+      options.setCloseModalOk(call.getString("closeModalOk", "Ok"));
+      options.setCloseModalCancel(call.getString("closeModalCancel", "Cancel"));
+    } else {
+      options.setCloseModal(false);
+    }
     options.setPluginCall(call);
+    //    options.getToolbarItemTypes().add(ToolbarItemType.RELOAD); TODO: fix this
     options.setCallbacks(
       new WebViewCallbacks() {
         @Override
@@ -156,39 +301,91 @@ public class InAppBrowserPlugin extends Plugin {
         }
       }
     );
-    getActivity()
+    this.getActivity()
       .runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
-            webViewDialog =
-              new WebViewDialog(
-                getContext(),
-                android.R.style.Theme_NoTitleBar,
-                options
-              );
+            webViewDialog = new WebViewDialog(
+              getContext(),
+              android.R.style.Theme_NoTitleBar,
+              options,
+              InAppBrowserPlugin.this
+            );
             webViewDialog.presentWebView();
+            webViewDialog.activity = InAppBrowserPlugin.this.getActivity();
           }
         }
       );
   }
 
   @PluginMethod
-  public void close(PluginCall call) {
+  public void executeScript(PluginCall call) {
+    String script = call.getString("code");
+    if (script == null || TextUtils.isEmpty(script)) {
+      call.reject("No script to run");
+    }
+
     if (webViewDialog != null) {
-      webViewDialog.dismiss();
-      webViewDialog = null;
-    } else {
-      Intent intent = new Intent(
-        getContext(),
-        getBridge().getActivity().getClass()
-      );
-      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-      getContext().startActivity(intent);
+      this.getActivity()
+        .runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              webViewDialog.executeScript(script);
+            }
+          }
+        );
     }
+
     call.resolve();
   }
 
+  @PluginMethod
+  public void reload(PluginCall call) {
+    if (webViewDialog != null) {
+      this.getActivity()
+        .runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              webViewDialog.reload();
+            }
+          }
+        );
+    }
+    call.resolve();
+  }
+
+  @PluginMethod
+  public void close(PluginCall call) {
+    this.getActivity()
+      .runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            if (webViewDialog != null) {
+              notifyListeners(
+                "closeEvent",
+                new JSObject().put("url", webViewDialog.getUrl())
+              );
+              webViewDialog.dismiss();
+              webViewDialog.destroy();
+              webViewDialog = null;
+            } else {
+              Intent intent = new Intent(
+                getContext(),
+                getBridge().getActivity().getClass()
+              );
+              intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+              getContext().startActivity(intent);
+            }
+            call.resolve();
+          }
+        }
+      );
+  }
+
   private Bundle getHeaders(PluginCall pluginCall) {
     JSObject headersProvided = pluginCall.getObject("headers");
     Bundle headers = new Bundle();
@@ -223,19 +420,18 @@ public class InAppBrowserPlugin extends Plugin {
     }
 
     if (currentSession == null) {
-      currentSession =
-        customTabsClient.newSession(
-          new CustomTabsCallback() {
-            @Override
-            public void onNavigationEvent(int navigationEvent, Bundle extras) {
-              switch (navigationEvent) {
-                case NAVIGATION_FINISHED:
-                  notifyListeners("browserPageLoaded", new JSObject());
-                  break;
-              }
+      currentSession = customTabsClient.newSession(
+        new CustomTabsCallback() {
+          @Override
+          public void onNavigationEvent(int navigationEvent, Bundle extras) {
+            switch (navigationEvent) {
+              case NAVIGATION_FINISHED:
+                notifyListeners("browserPageLoaded", new JSObject());
+                break;
             }
           }
-        );
+        }
+      );
     }
     return currentSession;
   }

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

@@ -6,14 +6,24 @@ import com.getcapacitor.PluginCall;
 public class Options {
 
   private String title;
+  private boolean CloseModal;
+  private String CloseModalTitle;
+  private String CloseModalDescription;
+  private String CloseModalCancel;
+  private String CloseModalOk;
   private String url;
   private JSObject headers;
   private String toolbarType;
   private JSObject shareDisclaimer;
   private String shareSubject;
+  private boolean disableGoBackOnNativeApplication;
+  private boolean activeNativeNavigationForWebview;
   private boolean isPresentAfterPageLoad;
   private WebViewCallbacks callbacks;
   private PluginCall pluginCall;
+  private boolean VisibleTitle;
+  private String ToolbarColor;
+  private boolean ShowArrow;
 
   public PluginCall getPluginCall() {
     return pluginCall;
@@ -31,6 +41,46 @@ public class Options {
     this.title = title;
   }
 
+  public boolean getCloseModal() {
+    return CloseModal;
+  }
+
+  public void setCloseModal(boolean CloseModal) {
+    this.CloseModal = CloseModal;
+  }
+
+  public String getCloseModalTitle() {
+    return CloseModalTitle;
+  }
+
+  public void setCloseModalTitle(String CloseModalTitle) {
+    this.CloseModalTitle = CloseModalTitle;
+  }
+
+  public String getCloseModalDescription() {
+    return CloseModalDescription;
+  }
+
+  public void setCloseModalDescription(String CloseModalDescription) {
+    this.CloseModalDescription = CloseModalDescription;
+  }
+
+  public String getCloseModalCancel() {
+    return CloseModalCancel;
+  }
+
+  public void setCloseModalCancel(String CloseModalCancel) {
+    this.CloseModalCancel = CloseModalCancel;
+  }
+
+  public String getCloseModalOk() {
+    return CloseModalOk;
+  }
+
+  public void setCloseModalOk(String CloseModalOk) {
+    this.CloseModalOk = CloseModalOk;
+  }
+
   public String getUrl() {
     return url;
   }
@@ -59,6 +109,16 @@ public class Options {
     return shareDisclaimer;
   }
 
+  public boolean showReloadButton;
+
+  public boolean getShowReloadButton() {
+    return showReloadButton;
+  }
+
+  public void setShowReloadButton(boolean showReloadButton) {
+    this.showReloadButton = showReloadButton;
+  }
+
   public void setShareDisclaimer(JSObject shareDisclaimer) {
     this.shareDisclaimer = shareDisclaimer;
   }
@@ -71,6 +131,26 @@ public class Options {
     this.shareSubject = shareSubject;
   }
 
+  public boolean getActiveNativeNavigationForWebview() {
+    return activeNativeNavigationForWebview;
+  }
+
+  public void setActiveNativeNavigationForWebview(
+    boolean activeNativeNavigationForWebview
+  ) {
+    this.activeNativeNavigationForWebview = activeNativeNavigationForWebview;
+  }
+
+  public boolean getDisableGoBackOnNativeApplication() {
+    return disableGoBackOnNativeApplication;
+  }
+
+  public void setDisableGoBackOnNativeApplication(
+    boolean disableGoBackOnNativeApplication
+  ) {
+    this.disableGoBackOnNativeApplication = disableGoBackOnNativeApplication;
+  }
+
   public boolean isPresentAfterPageLoad() {
     return isPresentAfterPageLoad;
   }
@@ -86,4 +166,28 @@ public class Options {
   public void setCallbacks(WebViewCallbacks callbacks) {
     this.callbacks = callbacks;
   }
+
+  public boolean getVisibleTitle() {
+    return VisibleTitle;
+  }
+
+  public void setVisibleTitle(boolean _visibleTitle) {
+    this.VisibleTitle = _visibleTitle;
+  }
+
+  public String getToolbarColor() {
+    return ToolbarColor;
+  }
+
+  public void setToolbarColor(String toolbarColor) {
+    this.ToolbarColor = toolbarColor;
+  }
+
+  public boolean showArrow() {
+    return ShowArrow;
+  }
+
+  public void setArrow(boolean _showArrow) {
+    this.ShowArrow = _showArrow;
+  }
 }