@capacitor-plus/android 8.3.11 → 8.5.1

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

@@ -353,7 +353,7 @@ public class BridgeWebChromeClient extends WebChromeClient {
         boolean captureEnabled = fileChooserParams.isCaptureEnabled();
         boolean capturePhoto = captureEnabled && acceptTypes.contains("image/*");
         final boolean captureVideo = captureEnabled && acceptTypes.contains("video/*");
-        if ((capturePhoto || captureVideo)) {
+        if (capturePhoto || captureVideo) {
             if (isMediaCaptureSupported()) {
                 showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo);
             } else {
@@ -411,6 +411,7 @@ public class BridgeWebChromeClient extends WebChromeClient {
             return false;
         }
         takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageFileUri);
+        takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
         // Store in static variables to survive activity recreation
         pendingFilePathCallback = filePathCallback;
@@ -539,7 +540,7 @@ public class BridgeWebChromeClient extends WebChromeClient {
     }
 
     public boolean isValidMsg(String msg) {
-        return !(msg.contains("%cresult %c") || (msg.contains("%cnative %c")) || msg.equalsIgnoreCase("console.groupEnd"));
+        return !(msg.contains("%cresult %c") || msg.contains("%cnative %c") || msg.equalsIgnoreCase("console.groupEnd"));
     }
 
     private Uri createImageFileUri() throws IOException {

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

@@ -218,7 +218,7 @@ public class FileUtils {
         Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
         int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
         cursor.moveToFirst();
-        String name = (cursor.getString(nameIndex));
+        String name = cursor.getString(nameIndex);
         String fileName = sanitizeFilename(name);
         File file = new File(context.getFilesDir(), fileName);
         try {

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

@@ -65,6 +65,17 @@ public class PluginConfig {
         return JSONUtils.getInt(config, configKey, defaultValue);
     }
 
+    /**
+     * Get a double value for a plugin in the Capacitor config.
+     *
+     * @param configKey The key of the value to retrieve
+     * @param defaultValue A default value to return if the key does not exist in the config
+     * @return The value from the config, if key exists. Default value returned if not
+     */
+    public double getDouble(String configKey, double defaultValue) {
+        return JSONUtils.getDouble(config, configKey, defaultValue);
+    }
+
     /**
      * Get a string array value for a plugin in the Capacitor config.
      *

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

@@ -221,7 +221,7 @@ public class WebViewLocalServer {
     }
 
     private boolean isMainUrl(Uri loadingUrl) {
-        return (bridge.getServerUrl() == null && loadingUrl.getHost().equalsIgnoreCase(bridge.getHost()));
+        return bridge.getServerUrl() == null && loadingUrl.getHost().equalsIgnoreCase(bridge.getHost());
     }
 
     private boolean isAllowedUrl(Uri loadingUrl) {
@@ -728,31 +728,31 @@ public class WebViewLocalServer {
         @Override
         public int available() throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.available() : -1;
+            return is != null ? is.available() : -1;
         }
 
         @Override
         public int read() throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.read() : -1;
+            return is != null ? is.read() : -1;
         }
 
         @Override
         public int read(byte[] b) throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.read(b) : -1;
+            return is != null ? is.read(b) : -1;
         }
 
         @Override
         public int read(byte[] b, int off, int len) throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.read(b, off, len) : -1;
+            return is != null ? is.read(b, off, len) : -1;
         }
 
         @Override
         public long skip(long n) throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.skip(n) : 0;
+            return is != null ? is.skip(n) : 0;
         }
     }
 

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

@@ -192,12 +192,12 @@ public class CapacitorCookieManager extends CookieManager {
     @Override
     public void put(URI uri, Map<String, List<String>> responseHeaders) {
         // make sure our args are valid
-        if ((uri == null) || (responseHeaders == null)) return;
+        if (uri == null || responseHeaders == null) return;
 
         // go over the headers
         for (String headerKey : responseHeaders.keySet()) {
             // ignore headers which aren't cookie related
-            if ((headerKey == null) || !(headerKey.equalsIgnoreCase("Set-Cookie2") || headerKey.equalsIgnoreCase("Set-Cookie"))) continue;
+            if (headerKey == null || !(headerKey.equalsIgnoreCase("Set-Cookie2") || headerKey.equalsIgnoreCase("Set-Cookie"))) continue;
 
             // process each of the headers
             for (String headerValue : Objects.requireNonNull(responseHeaders.get(headerKey))) {
@@ -215,7 +215,7 @@ public class CapacitorCookieManager extends CookieManager {
     @Override
     public Map<String, List<String>> get(URI uri, Map<String, List<String>> requestHeaders) {
         // make sure our args are valid
-        if ((uri == null) || (requestHeaders == null)) throw new IllegalArgumentException("Argument is null");
+        if (uri == null || requestHeaders == null) throw new IllegalArgumentException("Argument is null");
 
         // save our url once
         String url = uri.toString();

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

@@ -17,6 +17,7 @@ import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.webkit.WebViewCompat;
+import com.getcapacitor.Logger;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
@@ -33,6 +34,7 @@ public class SystemBars extends Plugin {
     static final String BAR_STATUS_BAR = "StatusBar";
     static final String BAR_GESTURE_BAR = "NavigationBar";
 
+    // TODO: In Cap 9, add an additional option "full"
     static final String INSETS_HANDLING_CSS = "css";
     static final String INSETS_HANDLING_DISABLE = "disable";
 
@@ -54,7 +56,7 @@ public class SystemBars extends Plugin {
         capacitorSystemBarsCheckMetaViewport();
         """;
 
-    private boolean insetHandlingEnabled = true;
+    private String insetsHandling = INSETS_HANDLING_CSS;
     private boolean hasViewportCover = false;
 
     private String currentStatusBarStyle = STYLE_DEFAULT;
@@ -81,7 +83,7 @@ public class SystemBars extends Plugin {
                     super.onPageCommitVisible(view, url);
                     View parentView = (View) getBridge().getWebView().getParent();
                     ViewCompat.requestApplyInsets(parentView);
-                    if (insetHandlingEnabled) {
+                    if (INSETS_HANDLING_CSS.equals(insetsHandling)) {
                         WindowInsetsCompat rootInsets = ViewCompat.getRootWindowInsets(parentView);
                         if (rootInsets != null) {
                             Insets safeArea = calcSafeAreaInsets(rootInsets);
@@ -105,9 +107,15 @@ public class SystemBars extends Plugin {
         String style = getConfig().getString("style", STYLE_DEFAULT).toUpperCase(Locale.US);
         boolean hidden = getConfig().getBoolean("hidden", false);
 
-        String insetsHandling = getConfig().getString("insetsHandling", "css");
-        if (insetsHandling.equals(INSETS_HANDLING_DISABLE)) {
-            insetHandlingEnabled = false;
+        String configuredInsetsHandling = getConfig().getString("insetsHandling", INSETS_HANDLING_CSS);
+        if (INSETS_HANDLING_CSS.equals(configuredInsetsHandling) || INSETS_HANDLING_DISABLE.equals(configuredInsetsHandling)) {
+            insetsHandling = configuredInsetsHandling;
+        } else {
+            Logger.warn(
+                "SystemBars",
+                "Unknown insetsHandling value '" + configuredInsetsHandling + "'. Falling back to '" + INSETS_HANDLING_CSS + "'."
+            );
+            insetsHandling = INSETS_HANDLING_CSS;
         }
 
         initWindowInsetsListener();
@@ -184,12 +192,15 @@ public class SystemBars extends Plugin {
 
     @JavascriptInterface
     public void onDOMReady() {
-        getActivity().runOnUiThread(() -> {
-            this.bridge.getWebView().evaluateJavascript(viewportMetaJSFunction, (res) -> {
-                hasViewportCover = res.equals("true");
-                ViewCompat.requestApplyInsets((View) getBridge().getWebView().getParent());
+        if (INSETS_HANDLING_CSS.equals(insetsHandling)) {
+            getActivity().runOnUiThread(() -> {
+                this.bridge.getWebView().evaluateJavascript(viewportMetaJSFunction, (res) -> {
+                    hasViewportCover = res.equals("true");
+
+                    getBridge().getWebView().requestApplyInsets();
+                });
             });
-        });
+        }
     }
 
     private Insets calcSafeAreaInsets(WindowInsetsCompat insets) {
@@ -224,9 +235,16 @@ public class SystemBars extends Plugin {
     }
 
     private void initSafeAreaCSSVariables() {
-        if (insetHandlingEnabled) {
-            View v = (View) this.getBridge().getWebView().getParent();
-            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(v);
+        if (INSETS_HANDLING_CSS.equals(insetsHandling)) {
+            WindowInsetsCompat insets;
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                View v = (View) this.getBridge().getWebView().getParent();
+                insets = ViewCompat.getRootWindowInsets(v);
+            } else {
+                insets = WindowInsetsCompat.CONSUMED;
+            }
+
             if (insets != null) {
                 Insets safeAreaInsets = calcSafeAreaInsets(insets);
                 injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
@@ -235,6 +253,10 @@ public class SystemBars extends Plugin {
     }
 
     private void initWindowInsetsListener() {
+        if (INSETS_HANDLING_DISABLE.equals(insetsHandling)) {
+            return;
+        }
+
         ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
             // getRootWindowInsets() bypasses AppCompat's intermediate view consuming the bottom inset on API < 30
             WindowInsetsCompat rawInsets = ViewCompat.getRootWindowInsets(v);
@@ -250,10 +272,8 @@ public class SystemBars extends Plugin {
                 // We need to correct for a possible shown IME
                 v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
 
-                if (hasViewportCover && insetHandlingEnabled) {
-                    Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
-                    injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-                }
+                Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
+                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
 
                 return new WindowInsetsCompat.Builder(insets)
                     .setInsets(
@@ -277,10 +297,8 @@ public class SystemBars extends Plugin {
                 .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(), Insets.of(0, 0, 0, 0))
                 .build();
 
-            if (insetHandlingEnabled) {
-                Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
-                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-            }
+            Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
+            injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
 
             return newInsets;
         });
@@ -344,20 +362,24 @@ public class SystemBars extends Plugin {
         WindowInsetsControllerCompat windowInsetsControllerCompat = WindowCompat.getInsetsController(window, window.getDecorView());
 
         if (hide) {
-            if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
+            if (bar.isEmpty()) {
+                windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.systemBars());
+                navBarVisible = false;
+            } else if (bar.equals(BAR_STATUS_BAR)) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.statusBars());
-            }
-            if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
+            } else if (bar.equals(BAR_GESTURE_BAR)) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.navigationBars());
                 navBarVisible = false;
             }
             return;
         }
 
-        if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
+        if (bar.isEmpty()) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.systemBars());
-        }
-        if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
+            navBarVisible = true;
+        } else if (bar.equals(BAR_STATUS_BAR)) {
+            windowInsetsControllerCompat.show(WindowInsetsCompat.Type.statusBars());
+        } else if (bar.equals(BAR_GESTURE_BAR)) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.navigationBars());
             navBarVisible = true;
         }

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

@@ -168,8 +168,8 @@ public class HttpRequestHandler {
                 "://" +
                 uri.getAuthority() +
                 uri.getPath() +
-                ((!urlQuery.equals("")) ? "?" + urlQuery : "") +
-                ((uri.getFragment() != null) ? uri.getFragment() : "");
+                (!urlQuery.equals("") ? "?" + urlQuery : "") +
+                (uri.getFragment() != null ? uri.getFragment() : "");
             this.url = new URL(unEncodedUrlString);
 
             return this;

package/capacitor/src/main/java/com/getcapacitor/util/JSONUtils.java

@@ -75,6 +75,26 @@ public class JSONUtils {
         return defaultValue;
     }
 
+    /**
+     * Get a double value from the given JSON object.
+     *
+     * @param jsonObject A JSON object to search
+     * @param key A key to fetch from the JSON object
+     * @param defaultValue A default value to return if the key cannot be found
+     * @return The value at the given key in the JSON object, or the default value
+     */
+    public static double getDouble(JSONObject jsonObject, String key, double defaultValue) {
+        String k = getDeepestKey(key);
+        try {
+            JSONObject o = getDeepestObject(jsonObject, key);
+            return o.getDouble(k);
+        } catch (JSONException ignore) {
+            // value was not found
+        }
+
+        return defaultValue;
+    }
+
     /**
      * Get a JSON object value from the given JSON object.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/android",
-  "version": "8.3.11",
+  "version": "8.5.1",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",
@@ -23,8 +23,8 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor-plus/core": "^8.3.0",
-    "@capacitor/core": "^8.3.0"
+    "@capacitor-plus/core": "^8.5.0",
+    "@capacitor/core": "^8.5.0"
   },
   "publishConfig": {
     "access": "public"