@capacitor/android 5.0.0-alpha.1 → 5.0.0-beta.0

package/capacitor/build.gradle

@@ -40,6 +40,7 @@ if (System.getenv("CAP_PUBLISH") == "true") {
 }
 
 android {
+    namespace "com.getcapacitor.android"
     compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
@@ -59,6 +60,7 @@ android {
         baseline file("lint-baseline.xml")
         abortOnError true
         warningsAsErrors true
+        lintConfig file('lint.xml')
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11

package/capacitor/lint.xml

@@ -5,4 +5,5 @@
     <issue id="DiscouragedApi">
         <ignore path="src/main/java/com/getcapacitor/plugin/util/AssetUtil.java" />
     </issue>
+    <issue id="ObsoleteSdkInt" severity="informational" />
 </lint>

package/capacitor/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.getcapacitor.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

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

@@ -384,9 +384,13 @@ var nativeBridge = (function (exports) {
                                 data: (options === null || options === void 0 ? void 0 : options.body) ? options.body : undefined,
                                 headers: headers,
                             });
-                            const data = typeof nativeResponse.data === 'string'
+                            let data = !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                 ? nativeResponse.data
                                 : JSON.stringify(nativeResponse.data);
+                            // use null data for 204 No Content HTTP response
+                            if (nativeResponse.status === 204) {
+                                data = null;
+                            }
                             // intercept & parse response before returning
                             const response = new Response(data, {
                                 headers: nativeResponse.headers,
@@ -522,7 +526,7 @@ var nativeBridge = (function (exports) {
                                     this.status = nativeResponse.status;
                                     this.response = nativeResponse.data;
                                     this.responseText =
-                                        typeof nativeResponse.data === 'string'
+                                        !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                             ? nativeResponse.data
                                             : JSON.stringify(nativeResponse.data);
                                     this.responseURL = nativeResponse.url;

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

@@ -88,6 +88,8 @@ public class Bridge {
     public static final String CAPACITOR_CONTENT_START = "/_capacitor_content_";
     public static final int DEFAULT_ANDROID_WEBVIEW_VERSION = 60;
     public static final int MINIMUM_ANDROID_WEBVIEW_VERSION = 55;
+    public static final int DEFAULT_HUAWEI_WEBVIEW_VERSION = 10;
+    public static final int MINIMUM_HUAWEI_WEBVIEW_VERSION = 10;
 
     // Loaded Capacitor config
     private CapConfig config;
@@ -324,6 +326,11 @@ public class Bridge {
         // Check getCurrentWebViewPackage() directly if above Android 8
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             PackageInfo info = WebView.getCurrentWebViewPackage();
+            if (info.packageName.equals("com.huawei.webview")) {
+                String majorVersionStr = info.versionName.split("\\.")[0];
+                int majorVersion = Integer.parseInt(majorVersionStr);
+                return majorVersion >= config.getMinHuaweiWebViewVersion();
+            }
             String majorVersionStr = info.versionName.split("\\.")[0];
             int majorVersion = Integer.parseInt(majorVersionStr);
             return majorVersion >= config.getMinWebViewVersion();
@@ -370,7 +377,15 @@ public class Bridge {
             }
         }
 
-        if (!url.toString().startsWith(appUrl) && !appAllowNavigationMask.matches(url.getHost())) {
+        if (url.getScheme().equals("data")) {
+            return false;
+        }
+
+        Uri appUri = Uri.parse(appUrl);
+        if (
+            !(url.getHost().equals(appUri.getHost()) && url.getScheme().equals(appUri.getScheme())) &&
+            !appAllowNavigationMask.matches(url.getHost())
+        ) {
             try {
                 Intent openIntent = new Intent(Intent.ACTION_VIEW, url);
                 getContext().startActivity(openIntent);

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

@@ -2,7 +2,9 @@ package com.getcapacitor;
 
 import static com.getcapacitor.Bridge.CAPACITOR_HTTP_SCHEME;
 import static com.getcapacitor.Bridge.DEFAULT_ANDROID_WEBVIEW_VERSION;
+import static com.getcapacitor.Bridge.DEFAULT_HUAWEI_WEBVIEW_VERSION;
 import static com.getcapacitor.Bridge.MINIMUM_ANDROID_WEBVIEW_VERSION;
+import static com.getcapacitor.Bridge.MINIMUM_HUAWEI_WEBVIEW_VERSION;
 import static com.getcapacitor.FileUtils.readFileFromAssets;
 
 import android.content.Context;
@@ -48,6 +50,7 @@ public class CapConfig {
     private boolean initialFocus = true;
     private boolean useLegacyBridge = false;
     private int minWebViewVersion = DEFAULT_ANDROID_WEBVIEW_VERSION;
+    private int minHuaweiWebViewVersion = DEFAULT_HUAWEI_WEBVIEW_VERSION;
     private String errorPath;
 
     // Embedded
@@ -172,6 +175,7 @@ public class CapConfig {
         this.initialFocus = builder.initialFocus;
         this.useLegacyBridge = builder.useLegacyBridge;
         this.minWebViewVersion = builder.minWebViewVersion;
+        this.minHuaweiWebViewVersion = builder.minHuaweiWebViewVersion;
         this.errorPath = builder.errorPath;
 
         // Embedded
@@ -263,6 +267,7 @@ public class CapConfig {
                 JSONUtils.getBoolean(configJSON, "allowMixedContent", allowMixedContent)
             );
         minWebViewVersion = JSONUtils.getInt(configJSON, "android.minWebViewVersion", DEFAULT_ANDROID_WEBVIEW_VERSION);
+        minHuaweiWebViewVersion = JSONUtils.getInt(configJSON, "android.minHuaweiWebViewVersion", DEFAULT_HUAWEI_WEBVIEW_VERSION);
         captureInput = JSONUtils.getBoolean(configJSON, "android.captureInput", captureInput);
         useLegacyBridge = JSONUtils.getBoolean(configJSON, "android.useLegacyBridge", useLegacyBridge);
         webContentsDebuggingEnabled = JSONUtils.getBoolean(configJSON, "android.webContentsDebuggingEnabled", isDebug);
@@ -376,6 +381,15 @@ public class CapConfig {
         return minWebViewVersion;
     }
 
+    public int getMinHuaweiWebViewVersion() {
+        if (minHuaweiWebViewVersion < MINIMUM_HUAWEI_WEBVIEW_VERSION) {
+            Logger.warn("Specified minimum Huawei webview version is too low, defaulting to " + MINIMUM_HUAWEI_WEBVIEW_VERSION);
+            return MINIMUM_HUAWEI_WEBVIEW_VERSION;
+        }
+
+        return minHuaweiWebViewVersion;
+    }
+
     public PluginConfig getPluginConfiguration(String pluginId) {
         PluginConfig pluginConfig = pluginsConfiguration.get(pluginId);
         if (pluginConfig == null) {
@@ -535,6 +549,7 @@ public class CapConfig {
         private boolean initialFocus = false;
         private boolean useLegacyBridge = false;
         private int minWebViewVersion = DEFAULT_ANDROID_WEBVIEW_VERSION;
+        private int minHuaweiWebViewVersion = DEFAULT_HUAWEI_WEBVIEW_VERSION;
 
         // Embedded
         private String startPath = null;

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

@@ -82,7 +82,7 @@ public class Plugin {
 
     // Stored results of an event if an event was fired and
     // no listeners were attached yet. Only stores the last value.
-    private final Map<String, JSObject> retainedEventArguments;
+    private final Map<String, List<JSObject>> retainedEventArguments;
 
     public Plugin() {
         eventListeners = new HashMap<>();
@@ -664,7 +664,14 @@ public class Plugin {
         if (listeners == null || listeners.isEmpty()) {
             Logger.debug(getLogTag(), "No listeners found for event " + eventName);
             if (retainUntilConsumed) {
-                retainedEventArguments.put(eventName, data);
+                List<JSObject> argList = retainedEventArguments.get(eventName);
+
+                if (argList == null) {
+                    argList = new ArrayList<JSObject>();
+                }
+
+                argList.add(data);
+                retainedEventArguments.put(eventName, argList);
             }
             return;
         }
@@ -703,13 +710,17 @@ public class Plugin {
      * @param eventName
      */
     private void sendRetainedArgumentsForEvent(String eventName) {
-        JSObject retained = retainedEventArguments.get(eventName);
-        if (retained == null) {
+        // copy retained args and null source to prevent potential race conditions
+        List<JSObject> retainedArgs = retainedEventArguments.get(eventName);
+        if (retainedArgs == null) {
             return;
         }
 
-        notifyListeners(eventName, retained);
         retainedEventArguments.remove(eventName);
+
+        for (JSObject retained : retainedArgs) {
+            notifyListeners(eventName, retained);
+        }
     }
 
     /**

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/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
@@ -308,6 +306,9 @@ public class HttpRequestHandler {
                 return new JSONObject().put("flag", "false");
             } else if (input.trim().length() <= 0) {
                 return "";
+            } else if (input.trim().matches("^\".*\"$")) {
+                // a string enclosed in " " is a json value, return the string without the quotes
+                return input.trim().substring(1, input.trim().length() - 1);
             } else {
                 try {
                     return new JSObject(input);
@@ -367,7 +368,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", new JSObject());
         JSObject params = call.getObject("params", new JSObject());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-beta.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": "^5.0.0-alpha.0"
+    "@capacitor/core": "^5.0.0-alpha.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "76202ca81b8e855df0ef8e5f6a36bd65ed1469a4"
+  "gitHead": "51a548b97129998de8c403b2a8eb0421135af812"
 }