Merge branch 'main' into keyboard/show-hide-events

ionic-team · Jan 3, 2024 · 9499275 · 9499275
2 parents 9f19a11 + 2050a48
commit 9499275
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java b/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java
@@ -51,7 +51,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -104,6 +103,7 @@ public class CameraPlugin extends Plugin {
     private static final String UNABLE_TO_PROCESS_IMAGE = "Unable to process image";
     private static final String IMAGE_EDIT_ERROR = "Unable to edit image";
     private static final String IMAGE_GALLERY_SAVE_ERROR = "Unable to save the image in the gallery";
+    private static final String USER_CANCELLED = "User cancelled photos app";
 
     private String imageFileSavePath;
     private String imageEditedFileSavePath;
@@ -180,7 +180,7 @@ private void showPrompt(final PluginCall call) {
                     openCamera(call);
                 }
             },
-            () -> call.reject("User cancelled photos app")
+            () -> call.reject(USER_CANCELLED)
         );
         fragment.show(getActivity().getSupportFragmentManager(), "capacitorModalsActionSheet");
     }
@@ -376,7 +376,7 @@ private void openPhotos(final PluginCall call, boolean multiple) {
                                     }
                                 );
                             } else {
-                                call.reject("No images picked");
+                                call.reject(USER_CANCELLED);
                             }
                             pickMultipleMedia.unregister();
                         }
@@ -393,7 +393,7 @@ private void openPhotos(final PluginCall call, boolean multiple) {
                                 imagePickedContentUri = uri;
                                 processPickedImage(uri, call);
                             } else {
-                                call.reject("No image picked");
+                                call.reject(USER_CANCELLED);
                             }
                             pickMedia.unregister();
                         }
@@ -421,7 +421,7 @@ public void processCameraImage(PluginCall call, ActivityResult result) {
         Bitmap bitmap = BitmapFactory.decodeFile(imageFileSavePath, bmOptions);
 
         if (bitmap == null) {
-            call.reject("User cancelled photos app");
+            call.reject(USER_CANCELLED);
             return;
         }
 
@@ -432,7 +432,7 @@ public void processPickedImage(PluginCall call, ActivityResult result) {
         settings = getSettings(call);
         Intent data = result.getData();
         if (data == null) {
-            call.reject("No image picked");
+            call.reject(USER_CANCELLED);
             return;
         }
 

diff --git a/share/android/build.gradle b/share/android/build.gradle
@@ -2,7 +2,7 @@ ext {
     capacitorVersion = System.getenv('CAPACITOR_VERSION')
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
-    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.10.1'
+    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.12.0'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
 }

diff --git a/status-bar/android/build.gradle b/status-bar/android/build.gradle
@@ -1,7 +1,7 @@
 ext {
     capacitorVersion = System.getenv('CAPACITOR_VERSION')
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.10.1'
+    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.12.0'
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'