@capgo/inappbrowser 6.13.1 → 6.14.0

package/README.md

@@ -107,7 +107,7 @@ Add the following to your `Info.plist` file:
 open(options: OpenOptions) => Promise<any>
 ```
 
-Open url in a new window fullscreen
+Open url in a new window fullscreen, on android it use chrome custom tabs, on ios it use SFSafariViewController
 
 | Param         | Type                                                |
 | ------------- | --------------------------------------------------- |
@@ -210,7 +210,7 @@ Open url in a new webview with toolbars, and enhanced capabilities, like camera
 JavaScript Interface:
 When you open a webview with this method, a JavaScript interface is automatically injected that provides:
 - `window.mobileApp.close()`: Closes the webview from JavaScript
-- `window.mobileApp.postMessage(obj)`: Sends a message from the webview to the app
+- `window.mobileApp.postMessage({detail: {message: 'myMessage'}})`: Sends a message from the webview to the app, detail object is the data you want to send to the webview
 
 | Param         | Type                                                              |
 | ------------- | ----------------------------------------------------------------- |
@@ -244,7 +244,7 @@ Injects JavaScript code into the InAppBrowser window.
 postMessage(options: { detail: Record<string, any>; }) => Promise<void>
 ```
 
-Sends an event to the webview(inappbrowser). you can listen to this event in the inappbrowser JS with window.addListener("messageFromNative", listenerFunc: (event: <a href="#record">Record</a>&lt;string, any&gt;) =&gt; void)
+Sends an event to the webview(inappbrowser). you can listen to this event in the inappbrowser JS with window.addEventListener("messageFromNative", listenerFunc: (event: <a href="#record">Record</a>&lt;string, any&gt;) =&gt; void)
 detail is the data you want to send to the webview, it's a requirement of Capacitor we cannot send direct objects
 Your object has to be serializable to JSON, so no functions or other non-JSON-serializable types are allowed.
 
@@ -439,24 +439,11 @@ Reload the current web page.
 
 #### OpenOptions
 
-| Prop                         | Type                                                | Description                                                                                                           | Since |
-| ---------------------------- | --------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | ----- |
-| **`url`**                    | <code>string</code>                                 | Target URL to load.                                                                                                   | 0.1.0 |
-| **`headers`**                | <code><a href="#headers">Headers</a></code>         | <a href="#headers">Headers</a> to send with the request.                                                              | 0.1.0 |
-| **`credentials`**            | <code><a href="#credentials">Credentials</a></code> | <a href="#credentials">Credentials</a> to send with the request and all subsequent requests for the same host.        | 6.1.0 |
-| **`isPresentAfterPageLoad`** | <code>boolean</code>                                | if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately. | 0.1.0 |
-| **`preventDeeplink`**        | <code>boolean</code>                                | if true the deeplink will not be opened, if false the deeplink will be opened when clicked on the link                | 0.1.0 |
-
-
-#### Headers
-
-
-#### Credentials
-
-| Prop           | Type                |
-| -------------- | ------------------- |
-| **`username`** | <code>string</code> |
-| **`password`** | <code>string</code> |
+| Prop                         | Type                 | Description                                                                                                           | Since |
+| ---------------------------- | -------------------- | --------------------------------------------------------------------------------------------------------------------- | ----- |
+| **`url`**                    | <code>string</code>  | Target URL to load.                                                                                                   | 0.1.0 |
+| **`isPresentAfterPageLoad`** | <code>boolean</code> | if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately. | 0.1.0 |
+| **`preventDeeplink`**        | <code>boolean</code> | if true the deeplink will not be opened, if false the deeplink will be opened when clicked on the link                | 0.1.0 |
 
 
 #### ClearCookieOptions
@@ -517,6 +504,18 @@ Reload the current web page.
 | **`proxyRequests`**                    | <code>string</code>                                                                                                                                                    | proxyRequests is a regex expression. Please see [this pr](https://github.com/Cap-go/capacitor-inappbrowser/pull/222) for more info. (Android only)                                                                                                                                                                                                                                                                                                                                                                                            |                                                            | 6.9.0  |
 | **`buttonNearDone`**                   | <code>{ ios: { iconType: 'sf-symbol' \| 'asset'; icon: string; }; android: { iconType: 'asset' \| 'vector'; icon: string; width?: number; height?: number; }; }</code> | buttonNearDone allows for a creation of a custom button near the done/close button. The button is only shown when toolbarType is not "activity", "navigation", or "blank". For Android: - iconType must be "asset" - icon path should be in the public folder (e.g. "monkey.svg") - width and height are optional, defaults to 48dp - button is positioned at the end of toolbar with 8dp margin For iOS: - iconType can be "sf-symbol" or "asset" - for sf-symbol, icon should be the symbol name - for asset, icon should be the asset name |                                                            | 6.7.0  |
 | **`textZoom`**                         | <code>number</code>                                                                                                                                                    | textZoom: sets the text zoom of the page in percent. Allows users to increase or decrease the text size for better readability.                                                                                                                                                                                                                                                                                                                                                                                                               | <code>100</code>                                           | 7.6.0  |
+| **`preventDeeplink`**                  | <code>boolean</code>                                                                                                                                                   | preventDeeplink: if true, the deeplink will not be opened, if false the deeplink will be opened when clicked on the link. on IOS each schema need to be added to info.plist file under LSApplicationQueriesSchemes when false to make it work.                                                                                                                                                                                                                                                                                                | <code>false</code>                                         | 0.1.0  |
+
+
+#### Headers
+
+
+#### Credentials
+
+| Prop           | Type                |
+| -------------- | ------------------- |
+| **`username`** | <code>string</code> |
+| **`password`** | <code>string</code> |
 
 
 #### DisclaimerOptions

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

@@ -12,6 +12,9 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.PermissionRequest;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
@@ -29,7 +32,6 @@ import com.getcapacitor.annotation.PermissionCallback;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import org.json.JSONException;
@@ -62,6 +64,54 @@ public class InAppBrowserPlugin
 
   private PermissionRequest currentPermissionRequest;
 
+  private ActivityResultLauncher<Intent> fileChooserLauncher;
+
+  @Override
+  public void load() {
+    super.load();
+    fileChooserLauncher = getActivity()
+      .registerForActivityResult(
+        new ActivityResultContracts.StartActivityForResult(),
+        this::handleFileChooserResult
+      );
+  }
+
+  private void handleFileChooserResult(ActivityResult result) {
+    if (webViewDialog != null && webViewDialog.mFilePathCallback != null) {
+      Uri[] results = null;
+      Intent data = result.getData();
+
+      if (result.getResultCode() == Activity.RESULT_OK) {
+        // Handle camera capture result
+        if (
+          webViewDialog.tempCameraUri != null &&
+          (data == null || data.getData() == null)
+        ) {
+          results = new Uri[] { webViewDialog.tempCameraUri };
+        }
+        // Handle regular file picker result
+        else if (data != null) {
+          if (data.getClipData() != null) {
+            // Handle multiple files
+            int count = data.getClipData().getItemCount();
+            results = new Uri[count];
+            for (int i = 0; i < count; i++) {
+              results[i] = data.getClipData().getItemAt(i).getUri();
+            }
+          } else if (data.getData() != null) {
+            // Handle single file
+            results = new Uri[] { data.getData() };
+          }
+        }
+      }
+
+      // Send the result to WebView and clean up
+      webViewDialog.mFilePathCallback.onReceiveValue(results);
+      webViewDialog.mFilePathCallback = null;
+      webViewDialog.tempCameraUri = null;
+    }
+  }
+
   public void handleMicrophonePermissionRequest(PermissionRequest request) {
     this.currentPermissionRequest = request;
     if (getPermissionState("microphone") != PermissionState.GRANTED) {
@@ -126,57 +176,6 @@ public class InAppBrowserPlugin
     }
   }
 
-  @Override
-  public void handleOnActivityResult(
-    int requestCode,
-    int resultCode,
-    Intent data
-  ) {
-    super.handleOnActivityResult(requestCode, resultCode, data);
-
-    // Handle file chooser result
-    if (requestCode == WebViewDialog.FILE_CHOOSER_REQUEST_CODE) {
-      if (webViewDialog != null && webViewDialog.mFilePathCallback != null) {
-        Uri[] results = null;
-
-        // Check if response is valid
-        if (resultCode == Activity.RESULT_OK) {
-          if (data != null) {
-            // Get the data
-            if (data.getClipData() != null) {
-              // Handle multiple files
-              int count = data.getClipData().getItemCount();
-              results = new Uri[count];
-              for (int i = 0; i < count; i++) {
-                results[i] = data.getClipData().getItemAt(i).getUri();
-              }
-            } else if (data.getData() != null) {
-              // Handle single file
-              results = new Uri[] { data.getData() };
-            }
-          }
-        }
-
-        // Send the result to WebView
-        webViewDialog.mFilePathCallback.onReceiveValue(results);
-        webViewDialog.mFilePathCallback = null;
-      }
-    }
-  }
-
-  @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
-    }
-  }
-
   @PermissionCallback
   private void cameraPermissionCallback(PluginCall call) {
     if (getPermissionState("camera") == PermissionState.GRANTED) {
@@ -194,7 +193,23 @@ public class InAppBrowserPlugin
         currentPermissionRequest.deny();
         currentPermissionRequest = null;
       }
-      call.reject("Camera permission is required");
+
+      // Reject only if there's a call - could be null for WebViewDialog flow
+      if (call != null) {
+        call.reject("Camera permission is required");
+      }
+    }
+  }
+
+  @PermissionCallback
+  private void cameraPermissionCallback() {
+    if (getPermissionState("camera") == PermissionState.GRANTED) {
+      grantCameraPermission();
+    } else {
+      if (currentPermissionRequest != null) {
+        currentPermissionRequest.deny();
+        currentPermissionRequest = null;
+      }
     }
   }
 
@@ -210,15 +225,16 @@ public class InAppBrowserPlugin
   CustomTabsServiceConnection connection = new CustomTabsServiceConnection() {
     @Override
     public void onCustomTabsServiceConnected(
-      @NonNull ComponentName name,
+      ComponentName name,
       CustomTabsClient client
     ) {
       customTabsClient = client;
-      client.warmup(0);
     }
 
     @Override
-    public void onServiceDisconnected(ComponentName name) {}
+    public void onServiceDisconnected(ComponentName name) {
+      customTabsClient = null;
+    }
   };
 
   @PluginMethod
@@ -252,9 +268,17 @@ public class InAppBrowserPlugin
   @PluginMethod
   public void open(PluginCall call) {
     String url = call.getString("url");
+    if (url == null) {
+      call.reject("URL is required");
+      return;
+    }
 
     // get the deeplink prevention, if provided
-    Boolean preventDeeplink = call.getBoolean("preventDeeplink", null);
+    Boolean preventDeeplink = call.getBoolean("preventDeeplink", false);
+    Boolean isPresentAfterPageLoad = call.getBoolean(
+      "isPresentAfterPageLoad",
+      false
+    );
 
     if (url == null || TextUtils.isEmpty(url)) {
       call.reject("Invalid URL");
@@ -275,7 +299,7 @@ public class InAppBrowserPlugin
       this.getHeaders(call)
     );
 
-    if (preventDeeplink != null) {
+    if (preventDeeplink != false) {
       String browserPackageName = "";
       Intent browserIntent = new Intent(
         Intent.ACTION_VIEW,
@@ -294,6 +318,10 @@ public class InAppBrowserPlugin
       }
     }
 
+    if (isPresentAfterPageLoad) {
+      tabsIntent.intent.putExtra("isPresentAfterPageLoad", true);
+    }
+
     tabsIntent.launchUrl(getContext(), Uri.parse(url));
 
     call.resolve();
@@ -473,21 +501,7 @@ public class InAppBrowserPlugin
                 Log.e("InAppBrowser", "Vector resource not found: " + icon);
                 // List available drawable resources to help debugging
                 try {
-                  Field[] drawables = R.drawable.class.getFields();
-                  StringBuilder availableResources = new StringBuilder(
-                    "Available resources: "
-                  );
-                  for (int i = 0; i < Math.min(10, drawables.length); i++) {
-                    availableResources
-                      .append(drawables[i].getName())
-                      .append(", ");
-                  }
-                  if (drawables.length > 10) {
-                    availableResources
-                      .append("... (")
-                      .append(drawables.length - 10)
-                      .append(" more)");
-                  }
+                  final StringBuilder availableResources = getStringBuilder();
                   Log.d("InAppBrowser", availableResources.toString());
                 } catch (Exception e) {
                   Log.e(
@@ -531,10 +545,13 @@ public class InAppBrowserPlugin
     options.setPreShowScript(call.getString("preShowScript", null));
     options.setShareSubject(call.getString("shareSubject", null));
     options.setToolbarType(call.getString("toolbarType", ""));
+    options.setPreventDeeplink(
+      Boolean.TRUE.equals(call.getBoolean("preventDeeplink", false))
+    );
 
     // Validate preShowScript requires isPresentAfterPageLoad
     if (
-      call.hasOption("preShowScript") &&
+      call.getData().has("preShowScript") &&
       !Boolean.TRUE.equals(call.getBoolean("isPresentAfterPageLoad", false))
     ) {
       call.reject("preShowScript requires isPresentAfterPageLoad to be true");
@@ -553,10 +570,10 @@ public class InAppBrowserPlugin
     } else {
       // Reject if closeModal is false but closeModal options are provided
       if (
-        call.hasOption("closeModalTitle") ||
-        call.hasOption("closeModalDescription") ||
-        call.hasOption("closeModalOk") ||
-        call.hasOption("closeModalCancel")
+        call.getData().has("closeModalTitle") ||
+        call.getData().has("closeModalDescription") ||
+        call.getData().has("closeModalOk") ||
+        call.getData().has("closeModalCancel")
       ) {
         call.reject("closeModal options require closeModal to be true");
         return;
@@ -565,13 +582,16 @@ public class InAppBrowserPlugin
     }
 
     // Validate shareDisclaimer requires shareSubject
-    if (call.hasOption("shareDisclaimer") && !call.hasOption("shareSubject")) {
+    if (
+      call.getData().has("shareDisclaimer") &&
+      !call.getData().has("shareSubject")
+    ) {
       call.reject("shareDisclaimer requires shareSubject to be provided");
       return;
     }
 
     // Validate buttonNearDone compatibility with toolbar type
-    if (call.hasOption("buttonNearDone")) {
+    if (call.getData().has("buttonNearDone")) {
       String toolbarType = options.getToolbarType();
       if (
         TextUtils.equals(toolbarType, "activity") ||
@@ -695,6 +715,24 @@ public class InAppBrowserPlugin
       );
   }
 
+  @NonNull
+  private static StringBuilder getStringBuilder() {
+    Field[] drawables = R.drawable.class.getFields();
+    StringBuilder availableResources = new StringBuilder(
+      "Available resources: "
+    );
+    for (int i = 0; i < Math.min(10, drawables.length); i++) {
+      availableResources.append(drawables[i].getName()).append(", ");
+    }
+    if (drawables.length > 10) {
+      availableResources
+        .append("... (")
+        .append(drawables.length - 10)
+        .append(" more)");
+    }
+    return availableResources;
+  }
+
   @PluginMethod
   public void postMessage(PluginCall call) {
     if (webViewDialog == null) {
@@ -792,7 +830,6 @@ public class InAppBrowserPlugin
                 new JSObject().put("url", webViewDialog.getUrl())
               );
               webViewDialog.dismiss();
-              webViewDialog.destroy();
               webViewDialog = null;
             } else {
               Intent intent = new Intent(

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

@@ -174,6 +174,7 @@ public class Options {
   private Pattern proxyRequestsPattern = null;
   private boolean materialPicker = false;
   private int textZoom = 100; // Default text zoom is 100%
+  private boolean preventDeeplink = false;
 
   public int getTextZoom() {
     return textZoom;
@@ -404,4 +405,12 @@ public class Options {
   public void setPreShowScript(String preLoadScript) {
     this.preShowScript = preLoadScript;
   }
+
+  public boolean getPreventDeeplink() {
+    return preventDeeplink;
+  }
+
+  public void setPreventDeeplink(boolean preventDeeplink) {
+    this.preventDeeplink = preventDeeplink;
+  }
 }