@capacitor-plus/android 8.3.4 → 8.3.5

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

@@ -48,14 +48,14 @@ var nativeBridge = (function (exports) {
         const newFormData = [];
         for (const pair of formData.entries()) {
             const [key, value] = pair;
-            if (value instanceof File) {
+            if (value instanceof Blob) {
                 const base64File = await readFileAsBase64(value);
                 newFormData.push({
                     key,
                     value: base64File,
                     type: 'base64File',
                     contentType: value.type,
-                    fileName: value.name,
+                    fileName: value.name || 'blob',
                 });
             }
             else {
@@ -128,7 +128,7 @@ var nativeBridge = (function (exports) {
                 type: 'formData',
             };
         }
-        else if (body instanceof File) {
+        else if (body instanceof Blob) {
             const fileData = await readFileAsBase64(body);
             return {
                 data: fileData,

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

@@ -1214,42 +1214,44 @@ public class Bridge {
     protected Map<String, PermissionState> getPermissionStates(Plugin plugin) {
         Map<String, PermissionState> permissionsResults = new HashMap<>();
         CapacitorPlugin annotation = plugin.getPluginHandle().getPluginAnnotation();
-        for (Permission perm : annotation.permissions()) {
-            // If a permission is defined with no permission constants, return GRANTED for it.
-            // Otherwise, get its true state.
-            if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
-                String key = perm.alias();
-                if (!key.isEmpty()) {
-                    PermissionState existingResult = permissionsResults.get(key);
-
-                    // auto set permission state to GRANTED if the alias is empty.
-                    if (existingResult == null) {
-                        permissionsResults.put(key, PermissionState.GRANTED);
-                    }
-                }
-            } else {
-                for (String permString : perm.strings()) {
-                    String key = perm.alias().isEmpty() ? permString : perm.alias();
-                    PermissionState permissionStatus;
-                    if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
-                        permissionStatus = PermissionState.GRANTED;
-                    } else {
-                        permissionStatus = PermissionState.PROMPT;
-
-                        // Check if there is a cached permission state for the "Never ask again" state
-                        SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
-                        String state = prefs.getString(permString, null);
-
-                        if (state != null) {
-                            permissionStatus = PermissionState.byState(state);
+        if (annotation != null) {
+            for (Permission perm : annotation.permissions()) {
+                // If a permission is defined with no permission constants, return GRANTED for it.
+                // Otherwise, get its true state.
+                if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
+                    String key = perm.alias();
+                    if (!key.isEmpty()) {
+                        PermissionState existingResult = permissionsResults.get(key);
+
+                        // auto set permission state to GRANTED if the alias is empty.
+                        if (existingResult == null) {
+                            permissionsResults.put(key, PermissionState.GRANTED);
                         }
                     }
+                } else {
+                    for (String permString : perm.strings()) {
+                        String key = perm.alias().isEmpty() ? permString : perm.alias();
+                        PermissionState permissionStatus;
+                        if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
+                            permissionStatus = PermissionState.GRANTED;
+                        } else {
+                            permissionStatus = PermissionState.PROMPT;
+
+                            // Check if there is a cached permission state for the "Never ask again" state
+                            SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
+                            String state = prefs.getString(permString, null);
+
+                            if (state != null) {
+                                permissionStatus = PermissionState.byState(state);
+                            }
+                        }
 
-                    PermissionState existingResult = permissionsResults.get(key);
+                        PermissionState existingResult = permissionsResults.get(key);
 
-                    // multiple permissions with the same alias must all be true, otherwise all false.
-                    if (existingResult == null || existingResult == PermissionState.GRANTED) {
-                        permissionsResults.put(key, permissionStatus);
+                        // multiple permissions with the same alias must all be true, otherwise all false.
+                        if (existingResult == null || existingResult == PermissionState.GRANTED) {
+                            permissionsResults.put(key, permissionStatus);
+                        }
                     }
                 }
             }

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

@@ -46,6 +46,17 @@ public class BridgeWebChromeClient extends WebChromeClient {
         void onActivityResult(ActivityResult result);
     }
 
+    // Static variables to store pending file chooser state to survive activity recreation
+    private static ValueCallback<Uri[]> pendingFilePathCallback;
+    private static Uri pendingImageFileUri;
+    private static FileChooserType pendingFileChooserType;
+
+    private enum FileChooserType {
+        IMAGE_CAPTURE,
+        VIDEO_CAPTURE,
+        FILE_PICKER
+    }
+
     private ActivityResultLauncher permissionLauncher;
     private ActivityResultLauncher activityLauncher;
     private PermissionListener permissionListener;
@@ -70,10 +81,70 @@ public class BridgeWebChromeClient extends WebChromeClient {
         activityLauncher = bridge.registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), (result) -> {
             if (activityListener != null) {
                 activityListener.onActivityResult(result);
+            } else if (pendingFilePathCallback != null) {
+                // Handle case where activity was recreated and instance callback is null
+                // Use the static callback instead
+                handlePendingFileChooserResult(result);
             }
         });
     }
 
+    /**
+     * Handle file chooser result when the activity was recreated and instance callbacks were lost.
+     * This uses the static pending callback to deliver the result.
+     */
+    private void handlePendingFileChooserResult(ActivityResult result) {
+        if (pendingFilePathCallback == null) {
+            return;
+        }
+
+        try {
+            Uri[] uriResult = null;
+            if (result.getResultCode() == Activity.RESULT_OK) {
+                switch (pendingFileChooserType) {
+                    case IMAGE_CAPTURE:
+                        if (pendingImageFileUri != null) {
+                            uriResult = new Uri[] { pendingImageFileUri };
+                        }
+                        break;
+                    case VIDEO_CAPTURE:
+                        Intent videoData = result.getData();
+                        if (videoData != null && videoData.getData() != null) {
+                            uriResult = new Uri[] { videoData.getData() };
+                        }
+                        break;
+                    case FILE_PICKER:
+                        Intent fileData = result.getData();
+                        if (fileData != null) {
+                            if (fileData.getClipData() != null) {
+                                final int numFiles = fileData.getClipData().getItemCount();
+                                uriResult = new Uri[numFiles];
+                                for (int i = 0; i < numFiles; i++) {
+                                    uriResult[i] = fileData.getClipData().getItemAt(i).getUri();
+                                }
+                            } else {
+                                uriResult = WebChromeClient.FileChooserParams.parseResult(result.getResultCode(), fileData);
+                            }
+                        }
+                        break;
+                }
+            }
+            pendingFilePathCallback.onReceiveValue(uriResult);
+        } finally {
+            // Clear the static state after handling
+            clearPendingFileChooserState();
+        }
+    }
+
+    /**
+     * Clear the static pending file chooser state.
+     */
+    private static void clearPendingFileChooserState() {
+        pendingFilePathCallback = null;
+        pendingImageFileUri = null;
+        pendingFileChooserType = null;
+    }
+
     /**
      * Render web content in `view`.
      *
@@ -340,12 +411,19 @@ public class BridgeWebChromeClient extends WebChromeClient {
             return false;
         }
         takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageFileUri);
+
+        // Store in static variables to survive activity recreation
+        pendingFilePathCallback = filePathCallback;
+        pendingImageFileUri = imageFileUri;
+        pendingFileChooserType = FileChooserType.IMAGE_CAPTURE;
+
         activityListener = (activityResult) -> {
             Uri[] result = null;
             if (activityResult.getResultCode() == Activity.RESULT_OK) {
                 result = new Uri[] { imageFileUri };
             }
             filePathCallback.onReceiveValue(result);
+            clearPendingFileChooserState();
         };
         activityLauncher.launch(takePictureIntent);
 
@@ -359,12 +437,18 @@ public class BridgeWebChromeClient extends WebChromeClient {
             return false;
         }
 
+        // Store in static variables to survive activity recreation
+        pendingFilePathCallback = filePathCallback;
+        pendingImageFileUri = null;
+        pendingFileChooserType = FileChooserType.VIDEO_CAPTURE;
+
         activityListener = (activityResult) -> {
             Uri[] result = null;
             if (activityResult.getResultCode() == Activity.RESULT_OK) {
                 result = new Uri[] { activityResult.getData().getData() };
             }
             filePathCallback.onReceiveValue(result);
+            clearPendingFileChooserState();
         };
         activityLauncher.launch(takeVideoIntent);
 
@@ -383,6 +467,12 @@ public class BridgeWebChromeClient extends WebChromeClient {
                 intent.setType(validTypes[0]);
             }
         }
+
+        // Store in static variables to survive activity recreation
+        pendingFilePathCallback = filePathCallback;
+        pendingImageFileUri = null;
+        pendingFileChooserType = FileChooserType.FILE_PICKER;
+
         try {
             activityListener = (activityResult) -> {
                 Uri[] result;
@@ -397,10 +487,12 @@ public class BridgeWebChromeClient extends WebChromeClient {
                     result = WebChromeClient.FileChooserParams.parseResult(activityResult.getResultCode(), resultIntent);
                 }
                 filePathCallback.onReceiveValue(result);
+                clearPendingFileChooserState();
             };
             activityLauncher.launch(intent);
         } catch (ActivityNotFoundException e) {
             filePathCallback.onReceiveValue(null);
+            clearPendingFileChooserState();
         }
     }
 

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

@@ -2,6 +2,7 @@ package com.getcapacitor;
 
 import android.content.Context;
 import android.os.Build;
+import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.KeyEvent;
@@ -17,6 +18,7 @@ public class CapacitorWebView extends WebView {
 
     private BaseInputConnection capInputConnection;
     private Bridge bridge;
+    private boolean autosuggestionEnabled = true;
 
     public CapacitorWebView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -26,6 +28,10 @@ public class CapacitorWebView extends WebView {
         this.bridge = bridge;
     }
 
+    public void setAutosuggestionEnabled(boolean enabled) {
+        autosuggestionEnabled = enabled;
+    }
+
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         CapConfig config;
@@ -36,13 +42,23 @@ public class CapacitorWebView extends WebView {
         }
 
         boolean captureInput = config.isInputCaptured();
+        InputConnection inputConnection;
         if (captureInput) {
             if (capInputConnection == null) {
                 capInputConnection = new BaseInputConnection(this, false);
             }
-            return capInputConnection;
+            inputConnection = capInputConnection;
+        } else {
+            inputConnection = super.onCreateInputConnection(outAttrs);
         }
-        return super.onCreateInputConnection(outAttrs);
+
+        if (!autosuggestionEnabled) {
+            // See https://stackoverflow.com/a/28009054/640584
+            outAttrs.inputType &= ~EditorInfo.TYPE_MASK_VARIATION;
+            outAttrs.inputType |= InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD;
+        }
+
+        return inputConnection;
     }
 
     @Override

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

@@ -164,13 +164,18 @@ public class SystemBars extends Plugin {
     }
 
     private void initSafeAreaCSSVariables() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && insetHandlingEnabled) {
+        WindowInsetsCompat insets;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
             View v = (View) this.getBridge().getWebView().getParent();
-            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(v);
-            if (insets != null) {
-                Insets safeAreaInsets = calcSafeAreaInsets(insets);
-                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-            }
+            insets = ViewCompat.getRootWindowInsets(v);
+        } else {
+            insets = WindowInsetsCompat.CONSUMED;
+        }
+
+        if (insets != null) {
+            Insets safeAreaInsets = calcSafeAreaInsets(insets);
+            injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
         }
     }
 
@@ -186,10 +191,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 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
-                    Insets safeAreaInsets = calcSafeAreaInsets(insets);
-                    injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-                }
+                Insets safeAreaInsets = calcSafeAreaInsets(insets);
+                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
 
                 return new WindowInsetsCompat.Builder(insets)
                     .setInsets(
@@ -221,10 +224,8 @@ public class SystemBars extends Plugin {
                 .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(), Insets.of(0, 0, 0, 0))
                 .build();
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
-                Insets safeAreaInsets = calcSafeAreaInsets(newInsets);
-                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-            }
+            Insets safeAreaInsets = calcSafeAreaInsets(newInsets);
+            injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
 
             return newInsets;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/android",
-  "version": "8.3.4",
+  "version": "8.3.5",
   "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)",