@capgo/inappbrowser 8.1.26 → 8.3.0-alpha.0

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

@@ -6,6 +6,11 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -16,6 +21,8 @@ import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
@@ -39,8 +46,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -55,7 +60,7 @@ import org.json.JSONObject;
 )
 public class InAppBrowserPlugin extends Plugin implements WebViewDialog.PermissionHandler {
 
-    private final String pluginVersion = "8.1.26";
+    private final String pluginVersion = "8.3.0-alpha.0";
 
     public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome"; // Change when in stable
     private CustomTabsClient customTabsClient;
@@ -337,7 +342,66 @@ public class InAppBrowserPlugin extends Plugin implements WebViewDialog.Permissi
         }
         currentUrl = url;
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(getCustomTabsSession());
+
+        // --- Chrome Custom Tab UI customization ---
+
+        // Toolbar color (applied to both light and dark color schemes)
+        String toolbarColor = call.getString("toolbarColor");
+        if (toolbarColor != null) {
+            try {
+                int colorInt = Color.parseColor(toolbarColor);
+                CustomTabColorSchemeParams colorParams = new CustomTabColorSchemeParams.Builder()
+                    .setToolbarColor(colorInt)
+                    .setNavigationBarColor(colorInt)
+                    .build();
+                builder.setDefaultColorSchemeParams(colorParams);
+                builder.setColorSchemeParams(CustomTabsIntent.COLOR_SCHEME_DARK, colorParams);
+            } catch (IllegalArgumentException e) {
+                Log.w(getLogTag(), "Invalid toolbarColor value: " + toolbarColor, e);
+            }
+        }
+
+        // Auto-hide URL bar on scroll
+        if (call.getBoolean("urlBarHidingEnabled", false)) {
+            builder.setUrlBarHidingEnabled(true);
+        }
+
+        // Show page <title> instead of URL
+        if (call.getBoolean("showTitle", false)) {
+            builder.setShowTitle(true);
+        }
+
+        // Replace X close icon with a back arrow
+        if (call.getBoolean("showArrow", false)) {
+            Drawable arrowDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.arrow_back_enabled);
+            if (arrowDrawable != null) {
+                Bitmap backArrow = Bitmap.createBitmap(
+                    arrowDrawable.getIntrinsicWidth(),
+                    arrowDrawable.getIntrinsicHeight(),
+                    Bitmap.Config.ARGB_8888
+                );
+                Canvas canvas = new Canvas(backArrow);
+                arrowDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+                arrowDrawable.draw(canvas);
+                builder.setCloseButtonIcon(backArrow);
+            }
+        }
+
+        // Remove share action from overflow menu
+        if (call.getBoolean("disableShare", false)) {
+            builder.setShareState(CustomTabsIntent.SHARE_STATE_OFF);
+        }
+
         CustomTabsIntent tabsIntent = builder.build();
+
+        // Undocumented Chromium flags — these may stop working on future Chrome updates
+        if (call.getBoolean("disableBookmark", false)) {
+            tabsIntent.intent.putExtra("org.chromium.chrome.browser.customtabs.EXTRA_DISABLE_STAR_BUTTON", true);
+        }
+        if (call.getBoolean("disableDownload", false)) {
+            tabsIntent.intent.putExtra("org.chromium.chrome.browser.customtabs.EXTRA_DISABLE_DOWNLOAD_BUTTON", true);
+        }
+
         tabsIntent.intent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(Intent.URI_ANDROID_APP_SCHEME + "//" + getContext().getPackageName()));
         tabsIntent.intent.putExtra(android.provider.Browser.EXTRA_HEADERS, this.getHeaders(call));
 
@@ -511,14 +575,7 @@ public class InAppBrowserPlugin extends Plugin implements WebViewDialog.Permissi
             options.setTextZoom(textZoom);
         }
 
-        String proxyRequestsStr = call.getString("proxyRequests");
-        if (proxyRequestsStr != null) {
-            try {
-                options.setProxyRequestsPattern(Pattern.compile(proxyRequestsStr));
-            } catch (PatternSyntaxException e) {
-                Log.e("WebViewDialog", String.format("Pattern '%s' is not a valid pattern", proxyRequestsStr));
-            }
-        }
+        options.setProxyRequests(Boolean.TRUE.equals(call.getBoolean("proxyRequests", false)));
 
         try {
             // Try to set buttonNearDone if present, with better error handling
@@ -667,6 +724,22 @@ public class InAppBrowserPlugin extends Plugin implements WebViewDialog.Permissi
                     notifyListeners("confirmBtnClicked", new JSObject().put("id", webViewId).put("url", url));
                 }
 
+                @Override
+                public void proxyRequestEvent(String requestId, String url, String method, String headersJson, String body, String wvId) {
+                    JSObject data = new JSObject();
+                    data.put("requestId", requestId);
+                    data.put("url", url);
+                    data.put("method", method);
+                    try {
+                        data.put("headers", new JSObject(headersJson));
+                    } catch (Exception e) {
+                        data.put("headers", new JSObject());
+                    }
+                    data.put("body", body);
+                    data.put("webviewId", wvId);
+                    notifyListeners("proxyRequest", data);
+                }
+
                 @Override
                 public void javascriptCallback(String message) {
                     // Handle the message received from JavaScript
@@ -1004,24 +1077,20 @@ public class InAppBrowserPlugin extends Plugin implements WebViewDialog.Permissi
     }
 
     @PluginMethod
-    public void lsuakdchgbbaHandleProxiedRequest(PluginCall call) {
+    public void handleProxyRequest(PluginCall call) {
+        String requestId = call.getString("requestId");
+        if (requestId == null) {
+            call.reject("requestId is required");
+            return;
+        }
         String webviewId = call.getString("webviewId");
         WebViewDialog webViewDialog = webviewId != null ? webViewDialogs.get(webviewId) : resolveDialog(null);
-        if (webViewDialog != null) {
-            Boolean ok = call.getBoolean("ok", false);
-            String id = call.getString("id");
-            if (id == null) {
-                Log.e("InAppBrowserProxy", "CRITICAL ERROR, proxy id = null");
-                return;
-            }
-            if (Boolean.FALSE.equals(ok)) {
-                String result = call.getString("result", "");
-                webViewDialog.handleProxyResultError(result, id);
-            } else {
-                JSONObject object = call.getObject("result");
-                webViewDialog.handleProxyResultOk(object, id);
-            }
+        if (webViewDialog == null) {
+            call.reject("Target WebView not found for proxy request");
+            return;
         }
+        JSObject response = call.getObject("response");
+        webViewDialog.handleProxyResponse(requestId, response);
         call.resolve();
     }
 

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

@@ -9,8 +9,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Objects;
-import java.util.regex.Pattern;
 
 public class Options {
 
@@ -170,7 +168,7 @@ public class Options {
     private boolean ignoreUntrustedSSLError;
     private String preShowScript;
     private String toolbarTextColor;
-    private Pattern proxyRequestsPattern = null;
+    private boolean proxyRequests = false;
     private boolean materialPicker = false;
     private int textZoom = 100; // Default text zoom is 100%
     private boolean preventDeeplink = false;
@@ -262,12 +260,12 @@ public class Options {
         this.useTopInset = useTopInset;
     }
 
-    public Pattern getProxyRequestsPattern() {
-        return proxyRequestsPattern;
+    public boolean getProxyRequests() {
+        return proxyRequests;
     }
 
-    public void setProxyRequestsPattern(Pattern proxyRequestsPattern) {
-        this.proxyRequestsPattern = proxyRequestsPattern;
+    public void setProxyRequests(boolean proxyRequests) {
+        this.proxyRequests = proxyRequests;
     }
 
     public PluginCall getPluginCall() {

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

@@ -0,0 +1,60 @@
+package ee.forgr.capacitor_inappbrowser;
+
+import android.webkit.JavascriptInterface;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ProxyBridge {
+
+    private static final int MAX_STORED_REQUESTS = 256;
+
+    public static class StoredRequest {
+
+        public final String method;
+        public final String headersJson;
+        public final String base64Body;
+
+        public StoredRequest(String method, String headersJson, String base64Body) {
+            this.method = method != null ? method : "";
+            this.headersJson = headersJson != null ? headersJson : "{}";
+            this.base64Body = base64Body != null ? base64Body : "";
+        }
+    }
+
+    private final ConcurrentHashMap<String, StoredRequest> storedRequests = new ConcurrentHashMap<>();
+    private final String accessToken;
+
+    /**
+     * @param accessToken Random token generated per webview instance.
+     *     The injected proxy-bridge script receives this token and must
+     *     pass it on every storeRequest call. Page JS that doesn't know
+     *     the token cannot abuse the interface.
+     */
+    public ProxyBridge(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    @JavascriptInterface
+    public void storeRequest(String token, String requestId, String method, String headersJson, String base64Body) {
+        if (token == null || !token.equals(accessToken)) {
+            return;
+        }
+        if (requestId == null || requestId.isEmpty()) {
+            return;
+        }
+        if (storedRequests.size() >= MAX_STORED_REQUESTS) {
+            // Remove an arbitrary entry to prevent unbounded growth
+            var it = storedRequests.keys().asIterator();
+            if (it.hasNext()) {
+                storedRequests.remove(it.next());
+            }
+        }
+        storedRequests.put(requestId, new StoredRequest(method, headersJson, base64Body));
+    }
+
+    public StoredRequest getAndRemove(String requestId) {
+        if (requestId == null) {
+            return null;
+        }
+        return storedRequests.remove(requestId);
+    }
+}

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

@@ -14,4 +14,6 @@ public interface WebViewCallbacks {
     public void buttonNearDoneClicked();
 
     public void confirmBtnClicked(String url);
+
+    public void proxyRequestEvent(String requestId, String url, String method, String headersJson, String body, String webviewId);
 }