@capacitor/android 4.7.2 → 4.8.0

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.8.0](https://github.com/ionic-team/capacitor/compare/4.7.3...4.8.0) (2023-04-26)
+
+
+### Bug Fixes
+
+* **android:** launching intents without host  ([#6493](https://github.com/ionic-team/capacitor/issues/6493)) ([6028ff4](https://github.com/ionic-team/capacitor/commit/6028ff482b489c150e348a3b536387c321b39b80))
+* **cookies:** check isEnabled before setting cookieHandler ([24a28cb](https://github.com/ionic-team/capacitor/commit/24a28cb0a391dcd7f305000c4973b4c2c9a79359))
+* **cookies:** init cookie manager after server url is set ([4000b02](https://github.com/ionic-team/capacitor/commit/4000b0259223fcd505bbd5393e2458f0abd3b156))
+* **http:** copy native response url to fetch response ([42d2eb3](https://github.com/ionic-team/capacitor/commit/42d2eb3c3c04e087b88df7252cd2c323b00a3f95))
+
+
+
+
+
+## [4.7.3](https://github.com/ionic-team/capacitor/compare/4.7.2...4.7.3) (2023-03-31)
+
+
+### Bug Fixes
+
+* **android:** remove stored references to bridge that holds it in memory ([#6448](https://github.com/ionic-team/capacitor/issues/6448)) ([#6455](https://github.com/ionic-team/capacitor/issues/6455)) ([8fa2d1c](https://github.com/ionic-team/capacitor/commit/8fa2d1c560321d9eb91edb1c81bf64f802289604))
+
+
+
+
+
 ## [4.7.2](https://github.com/ionic-team/capacitor/compare/4.7.1...4.7.2) (2023-03-31)
 
 

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

@@ -392,6 +392,14 @@ var nativeBridge = (function (exports) {
                                 headers: nativeResponse.headers,
                                 status: nativeResponse.status,
                             });
+                            /*
+                             * copy url to response, `cordova-plugin-ionic` uses this url from the response
+                             * we need `Object.defineProperty` because url is an inherited getter on the Response
+                             * see: https://stackoverflow.com/a/57382543
+                             * */
+                            Object.defineProperty(response, 'url', {
+                                value: nativeResponse.url,
+                            });
                             console.timeEnd(tag);
                             return response;
                         }

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

@@ -371,7 +371,7 @@ public class Bridge {
 
         Uri appUri = Uri.parse(appUrl);
         if (
-            !(url.getHost().equals(appUri.getHost()) && url.getScheme().equals(appUri.getScheme())) &&
+            !(appUri.getHost().equals(url.getHost()) && url.getScheme().equals(appUri.getScheme())) &&
             !appAllowNavigationMask.matches(url.getHost())
         ) {
             try {

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

@@ -17,7 +17,10 @@ import java.util.Objects;
 public class CapacitorCookieManager extends CookieManager {
 
     private final android.webkit.CookieManager webkitCookieManager;
-    private final Bridge bridge;
+
+    private final String localUrl;
+
+    private final String serverUrl;
 
     /**
      * Create a new cookie manager with the default cookie store and policy
@@ -36,18 +39,19 @@ public class CapacitorCookieManager extends CookieManager {
     public CapacitorCookieManager(CookieStore store, CookiePolicy policy, Bridge bridge) {
         super(store, policy);
         webkitCookieManager = android.webkit.CookieManager.getInstance();
-        this.bridge = bridge;
+        this.localUrl = bridge.getLocalUrl();
+        this.serverUrl = bridge.getServerUrl();
     }
 
     public String getSanitizedDomain(String url) {
         if (url == null || url.isEmpty()) {
-            url = this.bridge.getLocalUrl();
+            url = this.localUrl;
         }
 
         try {
             new URI(url);
         } catch (Exception ex) {
-            return this.bridge.getServerUrl();
+            return this.serverUrl;
         }
 
         return url;

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

@@ -20,15 +20,18 @@ public class CapacitorCookies extends Plugin {
     @Override
     public void load() {
         this.bridge.getWebView().addJavascriptInterface(this, "CapacitorCookiesAndroidInterface");
-        this.cookieManager = new CapacitorCookieManager(null, java.net.CookiePolicy.ACCEPT_ALL, this.bridge);
-        CookieHandler.setDefault(cookieManager);
         super.load();
     }
 
     @JavascriptInterface
     public boolean isEnabled() {
         PluginConfig pluginConfig = getBridge().getConfig().getPluginConfiguration("CapacitorCookies");
-        return pluginConfig.getBoolean("enabled", false);
+        boolean isEnabled = pluginConfig.getBoolean("enabled", false);
+        if (isEnabled) {
+            this.cookieManager = new CapacitorCookieManager(null, java.net.CookiePolicy.ACCEPT_ALL, this.bridge);
+            CookieHandler.setDefault(cookieManager);
+        }
+        return isEnabled;
     }
 
     /**

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

@@ -31,8 +31,7 @@ public class CapacitorHttp extends Plugin {
             @Override
             public void run() {
                 try {
-                    HttpRequestHandler.bridge = bridge;
-                    JSObject response = HttpRequestHandler.request(call, httpMethod);
+                    JSObject response = HttpRequestHandler.request(call, httpMethod, getBridge());
                     call.resolve(response);
                 } catch (Exception e) {
                     call.reject(e.getLocalizedMessage(), e.getClass().getSimpleName(), e);

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

@@ -27,8 +27,6 @@ import org.json.JSONObject;
 
 public class HttpRequestHandler {
 
-    public static Bridge bridge = null;
-
     /**
      * An enum specifying conventional HTTP Response Types
      * See https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseType
@@ -367,7 +365,8 @@ public class HttpRequestHandler {
      * @throws URISyntaxException thrown when the URI is malformed
      * @throws JSONException thrown when the incoming JSON is malformed
      */
-    public static JSObject request(PluginCall call, String httpMethod) throws IOException, URISyntaxException, JSONException {
+    public static JSObject request(PluginCall call, String httpMethod, Bridge bridge)
+        throws IOException, URISyntaxException, JSONException {
         String urlString = call.getString("url", "");
         JSObject headers = call.getObject("headers");
         JSObject params = call.getObject("params");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "4.7.2",
+  "version": "4.8.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f17e5827ea115250c17c289c3db5432b67df6907"
+  "gitHead": "b43c69d9d6530fa1a0cc461d6db14859865ed995"
 }