@capacitor/android 3.2.2 → 3.3.0

package/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.3.0](https://github.com/ionic-team/capacitor/compare/3.2.5...3.3.0) (2021-11-03)
+
+
+### Bug Fixes
+
+* **core:** avoid crash on logging circular objects ([#5186](https://github.com/ionic-team/capacitor/issues/5186)) ([1451ec8](https://github.com/ionic-team/capacitor/commit/1451ec850a9ef73267a032638e73f1fc440647b9))
+
+
+### Features
+
+* **android:** ability to reload the webview ([#5184](https://github.com/ionic-team/capacitor/issues/5184)) ([c495bed](https://github.com/ionic-team/capacitor/commit/c495bed216ddf05450f185d2d3f09b4052b281a8))
+
+
+
+
+
+## [3.2.5](https://github.com/ionic-team/capacitor/compare/3.2.4...3.2.5) (2021-10-13)
+
+
+### Bug Fixes
+
+* **android:** Avoid ConcurrentModificationException on notifyListeners ([#5125](https://github.com/ionic-team/capacitor/issues/5125)) ([b82bfe0](https://github.com/ionic-team/capacitor/commit/b82bfe0db2e38fa286eb18391b1d5e2f86a1b35c))
+* **android:** Support cordova-android 10 ([#5103](https://github.com/ionic-team/capacitor/issues/5103)) ([e238233](https://github.com/ionic-team/capacitor/commit/e238233dcf34a183af4861176789d1feb1eb51fa))
+
+
+
+
+
+## [3.2.4](https://github.com/ionic-team/capacitor/compare/3.2.3...3.2.4) (2021-09-27)
+
+
+### Bug Fixes
+
+* **ios:** show correct line number on console logs ([#5073](https://github.com/ionic-team/capacitor/issues/5073)) ([ec41e74](https://github.com/ionic-team/capacitor/commit/ec41e743aa4ba81e791ad446fac461b7f43b46ed))
+
+
+
+
+
+## [3.2.3](https://github.com/ionic-team/capacitor/compare/3.2.2...3.2.3) (2021-09-15)
+
+
+### Bug Fixes
+
+* **android:** proguard rules ([#5048](https://github.com/ionic-team/capacitor/issues/5048)) ([cf15c0f](https://github.com/ionic-team/capacitor/commit/cf15c0fb3bd67315011865fedb4157d5076965fd))
+* **android:** save activity result launcher calls ([#5004](https://github.com/ionic-team/capacitor/issues/5004)) ([2c1eb60](https://github.com/ionic-team/capacitor/commit/2c1eb603c79b94f6fcc74f0cbef523590b656a1e))
+
+
+
+
+
 ## [3.2.2](https://github.com/ionic-team/capacitor/compare/3.2.1...3.2.2) (2021-09-02)
 
 **Note:** Version bump only for package @capacitor/android

package/capacitor/build.gradle

@@ -32,6 +32,7 @@ android {
         targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
         versionCode 1
         versionName "1.0"
+        consumerProguardFiles 'proguard-rules.pro'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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

@@ -167,21 +167,6 @@ const nativeBridge = (function (exports) {
             win.Capacitor = cap;
             win.Ionic.WebView = IonicWebView;
         };
-        const safeStringify = (value) => {
-            const seen = new Set();
-            return JSON.stringify(value, (_k, v) => {
-                if (seen.has(v)) {
-                    if (v === null)
-                        return null;
-                    else
-                        return '...';
-                }
-                if (typeof v === 'object') {
-                    seen.add(v);
-                }
-                return v;
-            });
-        };
         const initLogger = (win, cap) => {
             const BRIDGED_CONSOLE_METHODS = [
                 'debug',
@@ -248,7 +233,7 @@ const nativeBridge = (function (exports) {
             const serializeConsoleMessage = (msg) => {
                 if (typeof msg === 'object') {
                     try {
-                        msg = safeStringify(msg);
+                        msg = JSON.stringify(msg);
                     }
                     catch (e) {
                         // ignore
@@ -258,24 +243,21 @@ const nativeBridge = (function (exports) {
             };
             // patch window.console on iOS and store original console fns
             const isIos = getPlatformId(win) === 'ios';
-            const originalConsole = Object.assign({}, win.console);
             if (win.console && isIos) {
-                for (const logfn of BRIDGED_CONSOLE_METHODS) {
-                    win.console[logfn] = (...args) => {
-                        const msgs = [...args];
-                        originalConsole[logfn](...msgs);
-                        try {
+                Object.defineProperties(win.console, BRIDGED_CONSOLE_METHODS.reduce((props, method) => {
+                    const consoleMethod = win.console[method].bind(win.console);
+                    props[method] = {
+                        value: (...args) => {
+                            const msgs = [...args];
                             cap.toNative('Console', 'log', {
-                                level: logfn,
+                                level: method,
                                 message: msgs.map(serializeConsoleMessage).join(' '),
                             });
-                        }
-                        catch (e) {
-                            // error converting/posting console messages
-                            originalConsole.error(e);
-                        }
+                            return consoleMethod(...args);
+                        },
                     };
-                }
+                    return props;
+                }, {}));
             }
             cap.logJs = (msg, level) => {
                 switch (level) {
@@ -320,7 +302,7 @@ const nativeBridge = (function (exports) {
                 postToNative = data => {
                     var _a;
                     try {
-                        win.androidBridge.postMessage(safeStringify(data));
+                        win.androidBridge.postMessage(JSON.stringify(data));
                     }
                     catch (e) {
                         (_a = win === null || win === void 0 ? void 0 : win.console) === null || _a === void 0 ? void 0 : _a.error(e);
@@ -351,7 +333,7 @@ const nativeBridge = (function (exports) {
                             url: url,
                             line: lineNo,
                             col: columnNo,
-                            errorObject: safeStringify(err),
+                            errorObject: JSON.stringify(err),
                         },
                     };
                     if (err !== null) {
@@ -501,4 +483,4 @@ const nativeBridge = (function (exports) {
 
     return exports;
 
-}({}));
+})({});

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

@@ -690,6 +690,10 @@ public class Bridge {
         return pluginCallForLastActivity;
     }
 
+    void setPluginCallForLastActivity(PluginCall pluginCallForLastActivity) {
+        this.pluginCallForLastActivity = pluginCallForLastActivity;
+    }
+
     /**
      * Release a retained call
      * @param call a call to release
@@ -1144,6 +1148,13 @@ public class Bridge {
         webView.post(() -> webView.loadUrl(appUrl));
     }
 
+    /**
+     * Reload the WebView
+     */
+    public void reload() {
+        webView.post(() -> webView.loadUrl(appUrl));
+    }
+
     public String getLocalUrl() {
         return localUrl;
     }

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

@@ -146,7 +146,7 @@ public class FileUtils {
      */
     static String readFile(AssetManager assetManager, String fileName) throws IOException {
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(assetManager.open(fileName)))) {
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             String line;
             while ((line = reader.readLine()) != null) {
                 buffer.append(line + "\n");

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

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
 import org.json.JSONException;
 
 /**
@@ -175,7 +176,7 @@ public class Plugin {
             // return when null since call was rejected in getLauncherOrReject
             return;
         }
-
+        bridge.setPluginCallForLastActivity(call);
         lastPluginCallId = call.getCallbackId();
         bridge.saveCall(call);
         activityResultLauncher.launch(intent);
@@ -668,7 +669,8 @@ public class Plugin {
             return;
         }
 
-        for (PluginCall call : listeners) {
+        CopyOnWriteArrayList<PluginCall> listenersCopy = new CopyOnWriteArrayList(listeners);
+        for (PluginCall call : listenersCopy) {
             call.resolve(data);
         }
     }
@@ -894,7 +896,7 @@ public class Plugin {
      * @return a new {@link Bundle} with fields set from the options of the last saved {@link PluginCall}
      */
     protected Bundle saveInstanceState() {
-        PluginCall savedCall = getSavedCall();
+        PluginCall savedCall = bridge.getSavedCall(lastPluginCallId);
 
         if (savedCall == null) {
             return null;

package/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaInterfaceImpl.java

@@ -1,7 +1,7 @@
 package com.getcapacitor.cordova;
 
-import android.app.Activity;
 import android.util.Pair;
+import androidx.appcompat.app.AppCompatActivity;
 import java.util.concurrent.Executors;
 import org.apache.cordova.CordovaInterfaceImpl;
 import org.apache.cordova.CordovaPlugin;
@@ -9,7 +9,7 @@ import org.json.JSONException;
 
 public class MockCordovaInterfaceImpl extends CordovaInterfaceImpl {
 
-    public MockCordovaInterfaceImpl(Activity activity) {
+    public MockCordovaInterfaceImpl(AppCompatActivity activity) {
         super(activity, Executors.newCachedThreadPool());
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -22,10 +22,10 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.2.0"
+    "@capacitor/core": "^3.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a02716096b1492b4337f41369ebe951cae331694"
+  "gitHead": "cb7eacd3c69512cf85c03cb06ef9ebf44d32e425"
 }