@capacitor-plus/android 8.5.3 → 8.6.1

package/capacitor/proguard-rules.pro

@@ -15,14 +15,39 @@
 
  -keep public class * extends com.getcapacitor.Plugin { *; }
 
+# The annotation types are read at runtime via reflection. If they are not kept, R8 full mode
+# treats them as never instantiated and optimizes the annotation cached in PluginHandle to null,
+# even with -keepattributes *Annotation*.
+-keep @interface com.getcapacitor.annotation.** { *; }
+-keep @interface com.getcapacitor.PluginMethod { *; }
+
+# Callback methods are found by reflection, including on non-public base classes.
+-keepclassmembers class * extends com.getcapacitor.Plugin {
+    @com.getcapacitor.annotation.ActivityCallback <methods>;
+    @com.getcapacitor.annotation.PermissionCallback <methods>;
+}
+
 # Rules for Capacitor v2 plugins and annotations
 # These are deprecated but can still be used with Capacitor for now
 -keep @com.getcapacitor.NativePlugin public class * {
   @com.getcapacitor.PluginMethod public <methods>;
 }
+-keep @interface com.getcapacitor.NativePlugin { *; }
 
 # Rules for Cordova plugins
 -keep public class * extends org.apache.cordova.* {
   public <methods>;
   public <fields>;
+}
+
+# CapacitorHttp loads these via reflection when an SSL pinning plugin is present.
+-keep class io.ionic.sslpinning.SSLPinning {
+  <init>();
+  public javax.net.ssl.SSLSocketFactory getSSLSocketFactory(com.getcapacitor.Bridge);
+  public boolean isDomainExcluded(com.getcapacitor.Bridge, java.net.URL);
+}
+-keep class com.getcapacitor.community.sslpinning.SSLPinning {
+  <init>();
+  public javax.net.ssl.SSLSocketFactory getSSLSocketFactory(com.getcapacitor.Bridge);
+  public boolean isDomainExcluded(com.getcapacitor.Bridge, java.net.URL);
 }

package/capacitor/src/main/assets/native-bridge.js

@@ -417,12 +417,6 @@ var nativeBridge = (function (exports) {
                 }
             };
             const platform = getPlatformId(win);
-            if (platform == 'android' && typeof win.CapacitorSystemBarsAndroidInterface !== 'undefined') {
-                // add DOM ready listener for System Bars
-                document.addEventListener('DOMContentLoaded', function () {
-                    win.CapacitorSystemBarsAndroidInterface.onDOMReady();
-                });
-            }
             if (platform == 'android' || platform == 'ios') {
                 // patch document.cookie on Android/iOS
                 win.CapacitorCookiesDescriptor =

package/capacitor/src/main/java/com/getcapacitor/Bridge.java

@@ -393,7 +393,39 @@ public class Bridge {
         return 0;
     }
 
+    private static int effectivePort(Uri uri) {
+        int port = uri.getPort();
+        if (port != -1) {
+            return port;
+        }
+        if ("https".equals(uri.getScheme())) {
+            return 443;
+        }
+        if ("http".equals(uri.getScheme())) {
+            return 80;
+        }
+        return -1;
+    }
+
+    public static boolean shouldBlockHttpInterceptorNavigation(Uri url, Uri appOrigin) {
+        String path = url.getPath();
+        if (path == null || !path.startsWith(CAPACITOR_HTTP_INTERCEPTOR_START)) {
+            return false;
+        }
+        return (
+            appOrigin.getHost().equals(url.getHost()) &&
+            url.getScheme().equals(appOrigin.getScheme()) &&
+            effectivePort(appOrigin) == effectivePort(url)
+        );
+    }
+
     public boolean launchIntent(Uri url) {
+        // The proxy returns a remote body at the app origin, so block it before plugins can allow it.
+        Uri appUri = Uri.parse(appUrl);
+        if (shouldBlockHttpInterceptorNavigation(url, appUri)) {
+            return true;
+        }
+
         /*
          * Give plugins the chance to handle the url
          */
@@ -411,7 +443,6 @@ public class Bridge {
             return false;
         }
 
-        Uri appUri = Uri.parse(appUrl);
         if (
             !(appUri.getHost().equals(url.getHost()) && url.getScheme().equals(appUri.getScheme())) &&
             !appAllowNavigationMask.matches(url.getHost())
@@ -1262,6 +1293,10 @@ public class Bridge {
                     }
                 }
             }
+        } else {
+            Logger.warn(
+                String.format("getPermissionStates: missing @CapacitorPlugin annotation for plugin %s", plugin.getPluginHandle().getId())
+            );
         }
 
         return permissionsResults;

package/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java

@@ -412,12 +412,9 @@ public class BridgeWebChromeClient extends WebChromeClient {
         }
         takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageFileUri);
         takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-        // Store in static variables to survive activity recreation
         pendingFilePathCallback = filePathCallback;
         pendingImageFileUri = imageFileUri;
         pendingFileChooserType = FileChooserType.IMAGE_CAPTURE;
-
         activityListener = (activityResult) -> {
             Uri[] result = null;
             if (activityResult.getResultCode() == Activity.RESULT_OK) {

package/capacitor/src/main/java/com/getcapacitor/Plugin.java

@@ -485,6 +485,13 @@ public class Plugin {
             return;
         }
 
+        if (handle.getPluginAnnotation() == null) {
+            String error = String.format("Cannot request permissions for plugin %s without a @CapacitorPlugin annotation", handle.getId());
+            Logger.error(error);
+            call.reject(error);
+            return;
+        }
+
         String[] permissions = getPermissionStringsForAliases(aliases);
 
         if (permissions.length > 0) {
@@ -502,10 +509,14 @@ public class Plugin {
     private String[] getPermissionStringsForAliases(@NonNull String[] aliases) {
         CapacitorPlugin annotation = handle.getPluginAnnotation();
         HashSet<String> perms = new HashSet<>();
-        for (Permission perm : annotation.permissions()) {
-            if (Arrays.asList(aliases).contains(perm.alias())) {
-                perms.addAll(Arrays.asList(perm.strings()));
+        if (annotation != null) {
+            for (Permission perm : annotation.permissions()) {
+                if (Arrays.asList(aliases).contains(perm.alias())) {
+                    perms.addAll(Arrays.asList(perm.strings()));
+                }
             }
+        } else {
+            Logger.warn(String.format("getPermissionStringsForAliases: missing @CapacitorPlugin annotation for plugin %s", handle.getId()));
         }
 
         return perms.toArray(new String[0]);
@@ -1003,7 +1014,8 @@ public class Plugin {
      * Give the plugins a chance to take control when a URL is about to be loaded in the WebView.
      * Returning true causes the WebView to abort loading the URL.
      * Returning false causes the WebView to continue loading the URL.
-     * Returning null will defer to the default Capacitor policy
+     * Returning null will defer to the default Capacitor policy.
+     * Not called for Capacitor's internal HTTP proxy path, which is always blocked.
      */
     @SuppressWarnings("unused")
     public Boolean shouldOverrideLoad(Uri url) {

package/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java

@@ -185,6 +185,11 @@ public class WebViewLocalServer {
         Uri loadingUrl = request.getUrl();
 
         if (null != loadingUrl.getPath() && loadingUrl.getPath().startsWith(Bridge.CAPACITOR_HTTP_INTERCEPTOR_START)) {
+            // Only fetch/XHR should reach the proxy; a document would run remote content at the app origin.
+            boolean httpEnabled = bridge.getConfig().getPluginConfiguration("CapacitorHttp").getBoolean("enabled", false);
+            if (!httpEnabled || isDocumentRequest(request)) {
+                return null;
+            }
             Logger.debug("Handling CapacitorHttp request: " + loadingUrl);
             try {
                 return handleCapacitorHttpRequest(request);
@@ -210,6 +215,24 @@ public class WebViewLocalServer {
         }
     }
 
+    /** isForMainFrame() is false for an iframe and a fetch alike; only navigations send this header. */
+    private boolean isDocumentRequest(WebResourceRequest request) {
+        if (request.isForMainFrame()) {
+            return true;
+        }
+        Map<String, String> headers = request.getRequestHeaders();
+        if (headers == null) {
+            // The proxy needs the headers too, so the request fails there anyway.
+            return false;
+        }
+        for (String header : headers.keySet()) {
+            if ("Upgrade-Insecure-Requests".equalsIgnoreCase(header)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private boolean isLocalFile(Uri uri) {
         String path = uri.getPath();
         return path.startsWith(capacitorContentStart) || path.startsWith(capacitorFileStart);
@@ -333,6 +356,9 @@ public class WebViewLocalServer {
         int responseCode = connection.getResponseCode();
         String reasonPhrase = getReasonPhraseFromResponseCode(responseCode);
 
+        // Nothing should render this. If anything does, sandbox keeps it inert and off the app origin.
+        responseHeaders.put("Content-Security-Policy", "sandbox; frame-ancestors 'none'");
+
         return new WebResourceResponse(mimeType, encoding, responseCode, reasonPhrase, responseHeaders, inputStream);
     }
 
@@ -756,9 +782,7 @@ public class WebViewLocalServer {
         }
     }
 
-    /**
-     * An InputStream wrapper that limits the number of bytes that can be read.
-     */
+    // For L and above.
     static class BoundedInputStream extends InputStream {
 
         private final InputStream in;

package/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java

@@ -192,7 +192,14 @@ public class MockCordovaWebViewImpl implements CordovaWebView {
     }
 
     public void triggerDocumentEvent(final String eventName) {
-        eval("window.Capacitor.triggerEvent('" + eventName + "', 'document');", (s) -> {});
+        // Pages served without the bridge (e.g. server.errorPath) have no window.Capacitor; drop the event rather than throw
+        eval(
+            "if (window.Capacitor != null && typeof window.Capacitor.triggerEvent === 'function') {" +
+                "window.Capacitor.triggerEvent('" +
+                eventName +
+                "', 'document'); }",
+            (s) -> {}
+        );
     }
 
     @Override

package/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java

@@ -9,7 +9,6 @@ import android.os.Build;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.Window;
-import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
@@ -37,6 +36,7 @@ public class SystemBars extends Plugin {
     // TODO: In Cap 9, add an additional option "full"
     static final String INSETS_HANDLING_CSS = "css";
     static final String INSETS_HANDLING_DISABLE = "disable";
+    static final String INSETS_HANDLING_NATIVE = "native";
 
     // https://issues.chromium.org/issues/40699457
     private static final int WEBVIEW_VERSION_WITH_SAFE_AREA_FIX = 140;
@@ -62,11 +62,22 @@ public class SystemBars extends Plugin {
     private String currentStatusBarStyle = STYLE_DEFAULT;
     private String currentGestureBarStyle = STYLE_DEFAULT;
 
-    private boolean navBarVisible = true;
+    // Declare variable at this scope to help prevent adding multiple listeners.
+    private WebViewListener webViewListener;
+
+    private void warnAboutUnsupportedConfigurationValues() {
+        boolean keyboardResizeOnFullScreen = bridge.getConfig().getPluginConfiguration("Keyboard").getBoolean("resizeOnFullScreen", false);
+
+        if (!INSETS_HANDLING_DISABLE.equals(insetsHandling) && keyboardResizeOnFullScreen) {
+            Logger.warn(
+                "SystemBars",
+                "You should omit `Keyboard.resizeOnFullScreen` in your `capacitor.config.json`. Other values can lead to unexpected behavior."
+            );
+        }
+    }
 
     @Override
     public void load() {
-        getBridge().getWebView().addJavascriptInterface(this, "CapacitorSystemBarsAndroidInterface");
         super.load();
 
         initSystemBars();
@@ -76,23 +87,27 @@ public class SystemBars extends Plugin {
     protected void handleOnStart() {
         super.handleOnStart();
 
-        this.getBridge().addWebViewListener(
-            new WebViewListener() {
+        if (INSETS_HANDLING_DISABLE.equals(insetsHandling)) {
+            return;
+        }
+
+        if (webViewListener == null) {
+            webViewListener = new WebViewListener() {
                 @Override
                 public void onPageCommitVisible(WebView view, String url) {
                     super.onPageCommitVisible(view, url);
-                    View parentView = (View) getBridge().getWebView().getParent();
-                    ViewCompat.requestApplyInsets(parentView);
-                    if (INSETS_HANDLING_CSS.equals(insetsHandling)) {
-                        WindowInsetsCompat rootInsets = ViewCompat.getRootWindowInsets(parentView);
-                        if (rootInsets != null) {
-                            Insets safeArea = calcSafeAreaInsets(rootInsets);
-                            injectSafeAreaCSS(safeArea.top, safeArea.right, safeArea.bottom, safeArea.left);
-                        }
-                    }
+                    bridge
+                        .getWebView()
+                        .evaluateJavascript(viewportMetaJSFunction, (res) -> {
+                            hasViewportCover = "true".equals(res);
+
+                            // Request new execution tree of `setOnApplyWindowInsetsListener`
+                            bridge.getWebView().requestApplyInsets();
+                        });
                 }
-            }
-        );
+            };
+            this.getBridge().addWebViewListener(webViewListener);
+        }
     }
 
     @Override
@@ -104,11 +119,20 @@ public class SystemBars extends Plugin {
     }
 
     private void initSystemBars() {
+        // If you already know what the value of the `viewport-fit=` meta tag is going to be,
+        // passing it here through `initialViewportFitValueHint` can help prevent layout shifting.
+        String configuredInitialViewportFitValueHint = getConfig().getString("initialViewportFitValueHint", "");
+        hasViewportCover = "cover".equals(configuredInitialViewportFitValueHint);
+
         String style = getConfig().getString("style", STYLE_DEFAULT).toUpperCase(Locale.US);
         boolean hidden = getConfig().getBoolean("hidden", false);
 
         String configuredInsetsHandling = getConfig().getString("insetsHandling", INSETS_HANDLING_CSS);
-        if (INSETS_HANDLING_CSS.equals(configuredInsetsHandling) || INSETS_HANDLING_DISABLE.equals(configuredInsetsHandling)) {
+        if (
+            INSETS_HANDLING_CSS.equals(configuredInsetsHandling) ||
+            INSETS_HANDLING_DISABLE.equals(configuredInsetsHandling) ||
+            INSETS_HANDLING_NATIVE.equals(configuredInsetsHandling)
+        ) {
             insetsHandling = configuredInsetsHandling;
         } else {
             Logger.warn(
@@ -118,8 +142,9 @@ public class SystemBars extends Plugin {
             insetsHandling = INSETS_HANDLING_CSS;
         }
 
+        warnAboutUnsupportedConfigurationValues();
+
         initWindowInsetsListener();
-        initSafeAreaCSSVariables();
 
         getBridge().executeOnMainThread(() -> {
             Window window = getActivity().getWindow();
@@ -172,96 +197,14 @@ public class SystemBars extends Plugin {
         call.resolve();
     }
 
-    @Override
-    protected void handleOnResume() {
-        super.handleOnResume();
-        getBridge().executeOnMainThread(() -> {
-            Window window = getActivity().getWindow();
-            WindowCompat.setDecorFitsSystemWindows(window, false);
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                window.setNavigationBarColor(android.graphics.Color.TRANSPARENT);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.setNavigationBarContrastEnforced(false);
-                }
-            }
-            setStyle(currentGestureBarStyle, BAR_GESTURE_BAR);
-            setStyle(currentStatusBarStyle, BAR_STATUS_BAR);
-            ViewCompat.requestApplyInsets((View) getBridge().getWebView().getParent());
-        });
-    }
-
-    @JavascriptInterface
-    public void onDOMReady() {
-        if (INSETS_HANDLING_CSS.equals(insetsHandling)) {
-            getActivity().runOnUiThread(() -> {
-                this.bridge.getWebView().evaluateJavascript(viewportMetaJSFunction, (res) -> {
-                    hasViewportCover = res.equals("true");
-
-                    getBridge().getWebView().requestApplyInsets();
-                });
-            });
-        }
-    }
-
-    private Insets calcSafeAreaInsets(WindowInsetsCompat insets) {
-        Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
-
-        int bottom = safeArea.bottom;
-
-        if (bottom == 0 && Build.VERSION.SDK_INT < Build.VERSION_CODES.R && safeArea.left == 0 && safeArea.right == 0) {
-            // skip if nav bar is on a side (landscape)
-            bottom = getNavBarHeightFromResources();
-        }
-
-        boolean imeVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-            ? insets.isVisible(WindowInsetsCompat.Type.ime())
-            : insets.getInsets(WindowInsetsCompat.Type.ime()).bottom > 0;
-
-        if (imeVisible) {
-            return Insets.of(safeArea.left, safeArea.top, safeArea.right, 0);
-        }
-        return Insets.of(safeArea.left, safeArea.top, safeArea.right, bottom);
-    }
-
-    // Only reached on API < 30 when the window reports no inset on any edge, so the
-    // choice is this approximation or a hardcoded 0. Lint rejects the internal
-    // resource because OEMs may change it; a wrong height still beats no inset.
-    @SuppressLint({ "InternalInsetResource", "DiscouragedApi" })
-    private int getNavBarHeightFromResources() {
-        if (!navBarVisible) return 0;
-        android.content.res.Resources res = getActivity().getResources();
-        int heightId = res.getIdentifier("navigation_bar_height", "dimen", "android");
-        return heightId > 0 ? res.getDimensionPixelSize(heightId) : 0;
-    }
-
-    private void initSafeAreaCSSVariables() {
-        if (INSETS_HANDLING_CSS.equals(insetsHandling)) {
-            WindowInsetsCompat insets;
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                View v = (View) this.getBridge().getWebView().getParent();
-                insets = ViewCompat.getRootWindowInsets(v);
-            } else {
-                insets = WindowInsetsCompat.CONSUMED;
-            }
-
-            if (insets != null) {
-                Insets safeAreaInsets = calcSafeAreaInsets(insets);
-                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-            }
-        }
-    }
-
     private void initWindowInsetsListener() {
         if (INSETS_HANDLING_DISABLE.equals(insetsHandling)) {
             return;
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
-            // getRootWindowInsets() bypasses AppCompat's intermediate view consuming the bottom inset on API < 30
-            WindowInsetsCompat rawInsets = ViewCompat.getRootWindowInsets(v);
-            WindowInsetsCompat safeAreaSource = (rawInsets != null) ? rawInsets : insets;
+        View view = getActivity().getWindow().getDecorView();
 
+        ViewCompat.setOnApplyWindowInsetsListener(view, (v, insets) -> {
             boolean shouldPassthroughInsets = getWebViewMajorVersion() >= WEBVIEW_VERSION_WITH_SAFE_AREA_FIX && hasViewportCover;
 
             Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
@@ -272,10 +215,7 @@ public class SystemBars extends Plugin {
                 // We need to correct for a possible shown IME
                 v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
 
-                Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
-                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-
-                return new WindowInsetsCompat.Builder(insets)
+                WindowInsetsCompat newInsets = new WindowInsetsCompat.Builder(insets)
                     .setInsets(
                         WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(),
                         Insets.of(
@@ -286,9 +226,19 @@ public class SystemBars extends Plugin {
                         )
                     )
                     .build();
+
+                injectSafeAreaCSS(newInsets);
+
+                return newInsets;
             }
 
-            v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
+            // We need to correct for a possible shown IME
+            v.setPadding(
+                systemBarsInsets.left,
+                systemBarsInsets.top,
+                systemBarsInsets.right,
+                keyboardVisible ? imeInsets.bottom : systemBarsInsets.bottom
+            );
 
             // Returning `WindowInsetsCompat.CONSUMED` breaks recalculation of safe area insets
             // So we have to explicitly set insets to `0`
@@ -297,20 +247,28 @@ public class SystemBars extends Plugin {
                 .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(), Insets.of(0, 0, 0, 0))
                 .build();
 
-            Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
-            injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+            injectSafeAreaCSS(insets);
 
             return newInsets;
         });
     }
 
-    private void injectSafeAreaCSS(int top, int right, int bottom, int left) {
+    private void injectSafeAreaCSS(WindowInsetsCompat insets) {
+        if (!INSETS_HANDLING_CSS.equals(insetsHandling)) {
+            return;
+        }
+
+        Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+        boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+
         // Convert pixels to density-independent pixels
         float density = getActivity().getResources().getDisplayMetrics().density;
-        float topPx = top / density;
-        float rightPx = right / density;
-        float bottomPx = bottom / density;
-        float leftPx = left / density;
+        float topPx = systemBarsInsets.top / density;
+        float rightPx = systemBarsInsets.right / density;
+        // For native insets the value gets automatically corrected when the IME is visible (in newer WebView versions),
+        // but for these injected values we have to handle that manually (for all WebView versions).
+        float bottomPx = (keyboardVisible ? 0 : systemBarsInsets.bottom) / density;
+        float leftPx = systemBarsInsets.left / density;
 
         // Execute JavaScript to inject the CSS
         getBridge().executeOnMainThread(() -> {
@@ -364,24 +322,20 @@ public class SystemBars extends Plugin {
         if (hide) {
             if (bar.isEmpty()) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.systemBars());
-                navBarVisible = false;
             } else if (bar.equals(BAR_STATUS_BAR)) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.statusBars());
             } else if (bar.equals(BAR_GESTURE_BAR)) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.navigationBars());
-                navBarVisible = false;
             }
             return;
         }
 
         if (bar.isEmpty()) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.systemBars());
-            navBarVisible = true;
         } else if (bar.equals(BAR_STATUS_BAR)) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.statusBars());
         } else if (bar.equals(BAR_GESTURE_BAR)) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.navigationBars());
-            navBarVisible = true;
         }
     }
 

package/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java

@@ -499,9 +499,12 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
     }
 
     public void setSSLSocketFactory(Bridge bridge) {
-        // Attach SSL Certificates if Enterprise Plugin is available
+        // Attach SSL Certificates if an SSL Pinning plugin is available
         try {
-            Class<?> sslPinningImpl = Class.forName("io.ionic.sslpinning.SSLPinning");
+            Class<?> sslPinningImpl = findSSLPinningClass();
+            if (sslPinningImpl == null) {
+                return;
+            }
             Method method = sslPinningImpl.getDeclaredMethod("getSSLSocketFactory", Bridge.class);
             SSLSocketFactory sslSocketFactory = (SSLSocketFactory) method.invoke(
                 sslPinningImpl.getDeclaredConstructor().newInstance(),
@@ -512,4 +515,13 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
             }
         } catch (Exception ignored) {}
     }
+
+    private static Class<?> findSSLPinningClass() {
+        for (String className : new String[] { "io.ionic.sslpinning.SSLPinning", "com.getcapacitor.community.sslpinning.SSLPinning" }) {
+            try {
+                return Class.forName(className);
+            } catch (ClassNotFoundException ignored) {}
+        }
+        return null;
+    }
 }

package/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java

@@ -450,7 +450,10 @@ public class HttpRequestHandler {
 
     public static Boolean isDomainExcludedFromSSL(Bridge bridge, URL url) {
         try {
-            Class<?> sslPinningImpl = Class.forName("io.ionic.sslpinning.SSLPinning");
+            Class<?> sslPinningImpl = findSSLPinningClass();
+            if (sslPinningImpl == null) {
+                return false;
+            }
             Method method = sslPinningImpl.getDeclaredMethod("isDomainExcluded", Bridge.class, URL.class);
             return (Boolean) method.invoke(sslPinningImpl.getDeclaredConstructor().newInstance(), bridge, url);
         } catch (Exception ignored) {
@@ -458,6 +461,15 @@ public class HttpRequestHandler {
         }
     }
 
+    private static Class<?> findSSLPinningClass() {
+        for (String className : new String[] { "io.ionic.sslpinning.SSLPinning", "com.getcapacitor.community.sslpinning.SSLPinning" }) {
+            try {
+                return Class.forName(className);
+            } catch (ClassNotFoundException ignored) {}
+        }
+        return null;
+    }
+
     @FunctionalInterface
     public interface ProgressEmitter {
         void emit(Integer bytes, Integer contentLength);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/android",
-  "version": "8.5.3",
+  "version": "8.6.1",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",
@@ -23,8 +23,8 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor-plus/core": "^8.5.0",
-    "@capacitor/core": "^8.5.0"
+    "@capacitor-plus/core": "^8.6.0",
+    "@capacitor/core": "^8.6.0"
   },
   "publishConfig": {
     "access": "public"