@capacitor/android 4.4.0 → 4.4.1-dev-20221114T215445.0

package/capacitor/build.gradle

@@ -16,9 +16,16 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.1'
+
+        if (System.getenv("CAP_PUBLISH") == "true") {
+            classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
+        }
     }
 }
 
@@ -26,6 +33,12 @@ tasks.withType(Javadoc).all { enabled = false }
 
 apply plugin: 'com.android.library'
 
+if (System.getenv("CAP_PUBLISH") == "true") {
+    apply plugin: 'io.github.gradle-nexus.publish-plugin'
+    apply from: file('../scripts/publish-root.gradle')
+    apply from: file('../scripts/publish-module.gradle')
+}
+
 android {
     compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
     defaultConfig {

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

@@ -310,25 +310,25 @@ const nativeBridge = (function (exports) {
                             }
                         },
                         set: function (val) {
-                            const cookiePairs = val.split(';');
-                            for (const cookiePair of cookiePairs) {
-                                const cookieKey = cookiePair.split('=')[0];
-                                const cookieValue = cookiePair.split('=')[1];
-                                if (null == cookieValue) {
-                                    continue;
-                                }
-                                if (platform === 'ios') {
-                                    // Use prompt to synchronously set cookies.
-                                    // https://stackoverflow.com/questions/29249132/wkwebview-complex-communication-between-javascript-native-code/49474323#49474323
-                                    const payload = {
-                                        type: 'CapacitorCookies.set',
-                                        key: cookieKey,
-                                        value: cookieValue,
-                                    };
-                                    prompt(JSON.stringify(payload));
+                            if (platform === 'ios') {
+                                // Use prompt to synchronously set cookies.
+                                // https://stackoverflow.com/questions/29249132/wkwebview-complex-communication-between-javascript-native-code/49474323#49474323
+                                const payload = {
+                                    type: 'CapacitorCookies.set',
+                                    action: val
+                                };
+                                prompt(JSON.stringify(payload));
+                            }
+                            else if (typeof win.CapacitorCookiesAndroidInterface !== 'undefined') {
+                                const cookiePairs = val.split(';');
+                                const domainSection = val.toLowerCase().split('domain=')[1];
+                                // if key is not domain
+                                if (cookiePairs.length > 1 && domainSection != null && domainSection.length > 0) {
+                                    const domain = domainSection.split(';')[0].trim();
+                                    win.CapacitorCookiesAndroidInterface.setCookies(domain, val);
                                 }
-                                else if (typeof win.CapacitorCookiesAndroidInterface !== 'undefined') {
-                                    win.CapacitorCookiesAndroidInterface.setCookie(cookieKey, cookieValue);
+                                else {
+                                    win.CapacitorCookiesAndroidInterface.setCookie(val);
                                 }
                             }
                         },
@@ -426,7 +426,8 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch abort
                     window.XMLHttpRequest.prototype.abort = function () {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.abort.call(this);
                         }
                         this.readyState = 0;
@@ -480,14 +481,16 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch set request header
                     window.XMLHttpRequest.prototype.setRequestHeader = function (header, value) {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.setRequestHeader.call(this, header, value);
                         }
                         this._headers[header] = value;
                     };
                     // XHR patch send
                     window.XMLHttpRequest.prototype.send = function (body) {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.send.call(this, body);
                         }
                         try {
@@ -543,7 +546,8 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch getAllResponseHeaders
                     window.XMLHttpRequest.prototype.getAllResponseHeaders = function () {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.getAllResponseHeaders.call(this);
                         }
                         let returnString = '';
@@ -556,7 +560,8 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch getResponseHeader
                     window.XMLHttpRequest.prototype.getResponseHeader = function (name) {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                         }
                         return this._headers[name];

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

@@ -318,6 +318,10 @@ public class PluginCall {
     }
 
     public JSObject getObject(String name) {
+        Logger.warn(
+            Logger.tags("Plugin"),
+            "getObject calls without a default value will return null in Capacitor 5 instead of an empty object to match iOS behavior"
+        );
         return this.getObject(name, new JSObject());
     }
 
@@ -339,6 +343,10 @@ public class PluginCall {
     }
 
     public JSArray getArray(String name) {
+        Logger.warn(
+            Logger.tags("Plugin"),
+            "getArray calls without a default value will return null in Capacitor 5 instead of an empty array to match iOS behavior"
+        );
         return this.getArray(name, new JSArray());
     }
 

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

@@ -109,6 +109,11 @@ public class CapacitorCookieManager extends CookieManager {
         setCookie(url, cookieValue);
     }
 
+    public void setCookie(String url, String key, String value, String expires, String path) {
+        String cookieValue = key + "=" + value + "; expires=" + expires + "; path=" + path;
+        setCookie(url, cookieValue);
+    }
+
     /**
      * Removes all cookies. This method is asynchronous.
      */

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

@@ -2,6 +2,7 @@ package com.getcapacitor.plugin;
 
 import android.webkit.JavascriptInterface;
 import androidx.annotation.Nullable;
+import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginConfig;
@@ -55,6 +56,19 @@ public class CapacitorCookies extends Plugin {
         return url;
     }
 
+    private String getSanitizedDomain(String url) {
+        if (url == null || url.isEmpty()) {
+            url = this.bridge.getLocalUrl();
+        }
+
+        URI uri = getUri(url);
+        if (uri == null) {
+            return getServerUrl(null);
+        }
+
+        return url;
+    }
+
     /**
      * Try to parse a url string and if it can't be parsed, return null
      * @param url the url string to try to parse
@@ -83,11 +97,33 @@ public class CapacitorCookies extends Plugin {
     }
 
     @JavascriptInterface
-    public void setCookie(String key, String value) {
+    public void setCookie(String action) {
         String url = getServerUrl(null);
 
         if (!url.isEmpty()) {
-            cookieManager.setCookie(url, key, value);
+            cookieManager.setCookie(url, action);
+        }
+    }
+
+    @JavascriptInterface
+    public void setCookie(String domain, String action) {
+        String url = getSanitizedDomain(domain);
+
+        if (!url.isEmpty()) {
+            cookieManager.setCookie(url, action);
+        }
+    }
+
+    @PluginMethod
+    public void getCookies(PluginCall call) {
+        String url = getServerUrl(call);
+        if (!url.isEmpty()) {
+            JSObject cookiesMap = new JSObject();
+            HttpCookie[] cookies = cookieManager.getCookies(url);
+            for (HttpCookie cookie : cookies) {
+                cookiesMap.put(cookie.getName(), cookie.getValue());
+            }
+            call.resolve(cookiesMap);
         }
     }
 
@@ -96,9 +132,11 @@ public class CapacitorCookies extends Plugin {
         String key = call.getString("key");
         String value = call.getString("value");
         String url = getServerUrl(call);
+        String expires = call.getString("expires", "");
+        String path = call.getString("path", "/");
 
         if (!url.isEmpty()) {
-            cookieManager.setCookie(url, key, value);
+            cookieManager.setCookie(url, key, value, expires, path);
             call.resolve();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "4.4.0",
+  "version": "4.4.1-dev-20221114T215445.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,10 +23,10 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.3.0"
+    "@capacitor/core": "^4.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9ec5a3059e109dbf2bd656f895243487eebeba5"
+  "gitHead": "ecbf81ebb1b01de0b544c3f171fe3b042253088d"
 }