@capgo/inappbrowser 7.6.4 → 7.6.7

package/README.md

@@ -24,6 +24,11 @@ InAppBrowser.open({ url: "YOUR_URL" });
 
 Web platform is not supported. Use `window.open` instead.
 
+
+### Test app and code:
+
+https://github.com/Cap-go/demo-app/blob/main/src/views/plugins/Web.vue
+
 ### Camera usage
 
 #### Android
@@ -147,7 +152,7 @@ window.mobileApp.close();
 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                                                |
 | ------------- | --------------------------------------------------- |
@@ -479,24 +484,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
@@ -559,6 +551,17 @@ Reload the current web page.
 | **`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  |
 
 
+#### Headers
+
+
+#### Credentials
+
+| Prop           | Type                |
+| -------------- | ------------------- |
+| **`username`** | <code>string</code> |
+| **`password`** | <code>string</code> |
+
+
 #### DisclaimerOptions
 
 | Prop             | Type                | Description                            | Default                |

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
       <intent>
@@ -8,4 +7,16 @@
       </intent>
     </queries>
   <uses-permission android:name="android.permission.CAMERA"/>
+  
+  <application>
+    <provider
+      android:name="androidx.core.content.FileProvider"
+      android:authorities="${applicationId}.fileprovider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/file_paths" />
+    </provider>
+  </application>
 </manifest>

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 isPresentAfterPageLoad = call.getBoolean(
+      "isPresentAfterPageLoad",
+      false
+    );
 
     if (url == null || TextUtils.isEmpty(url)) {
       call.reject("Invalid URL");
@@ -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(
@@ -534,7 +548,7 @@ public class InAppBrowserPlugin
 
     // 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 +567,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 +579,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 +712,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) {