fix(android): avoid crash if server url ends in / (#7426)

ionic-team · May 8, 2024 · e8e8bc3 · e8e8bc3
1 parent 8419a84
commit e8e8bc3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/Bridge.java b/android/capacitor/src/main/java/com/getcapacitor/Bridge.java
@@ -257,7 +257,11 @@ private void loadWebView() {
             String allowedOrigin = appUrl;
             Uri appUri = Uri.parse(appUrl);
             if (appUri.getPath() != null) {
-                allowedOrigin = appUri.toString().replace(appUri.getPath(), "");
+                if (appUri.getPath().equals("/")) {
+                    allowedOrigin = appUrl.substring(0, appUrl.length() - 1);
+                } else {
+                    allowedOrigin = appUri.toString().replace(appUri.getPath(), "");
+                }
             }
             WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), Collections.singleton(allowedOrigin));
             injector = null;