fix(android): live reload not working when using adb reverse

Co-authored-by: jcesarmobile <jcesarmobile@gmail.com>
ionic-team · Mar 4, 2021 · 362f221 · 362f221
1 parent 502a2d1
commit 362f221
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java b/android/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java
@@ -171,11 +171,7 @@ public WebResourceResponse shouldInterceptRequest(WebResourceRequest request) {
             return null;
         }
 
-        if (
-            isLocalFile(loadingUrl) ||
-            loadingUrl.getHost().equalsIgnoreCase(bridge.getHost()) ||
-            (bridge.getServerUrl() == null && !bridge.getAppAllowNavigationMask().matches(loadingUrl.getHost()))
-        ) {
+        if (isLocalFile(loadingUrl) || isMainUrl(loadingUrl) || !isAllowedUrl(loadingUrl)) {
             Logger.debug("Handling local request: " + request.getUrl().toString());
             return handleLocalRequest(request, handler);
         } else {
@@ -188,6 +184,14 @@ private boolean isLocalFile(Uri uri) {
         return path.startsWith(capacitorContentStart) || path.startsWith(capacitorFileStart);
     }
 
+    private boolean isMainUrl(Uri loadingUrl) {
+        return (bridge.getServerUrl() == null && loadingUrl.getHost().equalsIgnoreCase(bridge.getHost()));
+    }
+
+    private boolean isAllowedUrl(Uri loadingUrl) {
+        return !(bridge.getServerUrl() == null && !bridge.getAppAllowNavigationMask().matches(loadingUrl.getHost()));
+    }
+
     private WebResourceResponse handleLocalRequest(WebResourceRequest request, PathHandler handler) {
         String path = request.getUrl().getPath();