@capacitor/camera 4.1.5-nightly-20230316T150919.0 → 4.1.5

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.5](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/camera@4.1.4...@capacitor/camera@4.1.5) (2023-04-26)
+
+
+### Bug Fixes
+
+* **camera:** prevent iOS crash with 0 limited images selected ([#1495](https://github.com/ionic-team/capacitor-plugins/issues/1495)) ([#1499](https://github.com/ionic-team/capacitor-plugins/issues/1499)) ([188b933](https://github.com/ionic-team/capacitor-plugins/commit/188b933050dd5660ba7893de6f4b96f95ee763c6))
+
+
+
+
+
 ## [4.1.4](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/camera@4.1.3...@capacitor/camera@4.1.4) (2022-11-16)
 
 **Note:** Version bump only for package @capacitor/camera

package/README.md

@@ -38,8 +38,8 @@ Additionally, because the Camera API launches a separate Activity to handle taki
 
 This plugin will use the following project variables (defined in your app's `variables.gradle` file):
 
-- `$androidxExifInterfaceVersion`: version of `androidx.exifinterface:exifinterface` (default: `1.3.6`)
-- `$androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.8.0`)
+- `$androidxExifInterfaceVersion`: version of `androidx.exifinterface:exifinterface` (default: `1.3.3`)
+- `$androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.6.1`)
 
 ## PWA Notes
 

package/android/build.gradle

@@ -1,11 +1,11 @@
 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'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
-    androidxExifInterfaceVersion = project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.3.6'
+    androidxExifInterfaceVersion = project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.3.3'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.8.0'
+    androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.6.1'
 }
 
 buildscript {
@@ -32,10 +32,10 @@ if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
 }
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

package/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java

@@ -746,11 +746,9 @@ public class CameraPlugin extends Plugin {
             // first, extract the permissions being requested
             JSArray providedPerms = call.getArray("permissions");
             List<String> permsList = null;
-            if (providedPerms != null) {
-                try {
-                    permsList = providedPerms.toList();
-                } catch (JSONException e) {}
-            }
+            try {
+                permsList = providedPerms.toList();
+            } catch (JSONException e) {}
 
             if (permsList != null && permsList.size() == 1 && permsList.contains(CAMERA)) {
                 // the only thing being asked for was the camera so we can just return the current state

package/ios/Plugin/CameraExtensions.swift

@@ -27,8 +27,11 @@ extension PHAuthorizationStatus: CameraAuthorizationState {
             return "denied"
         case .authorized:
             return "granted"
+        #if swift(>=5.3)
+        // poor proxy for Xcode 12/iOS 14, should be removed once building with Xcode 12 is required
         case .limited:
             return "limited"
+        #endif
         case .notDetermined:
             fallthrough
         @unknown default:

package/ios/Plugin/CameraPlugin.swift

@@ -109,19 +109,20 @@ public class CameraPlugin: CAPPlugin {
                         options.deliveryMode = .highQualityFormat
 
                         let group = DispatchGroup()
-
-                        for index in 0...(assets.count - 1) {
-                            let asset = assets.object(at: index)
-                            let fullSize = CGSize(width: asset.pixelWidth, height: asset.pixelHeight)
-
-                            group.enter()
-                            imageManager.requestImage(for: asset, targetSize: fullSize, contentMode: .default, options: options) { image, _ in
-                                guard let image = image else {
+                        if assets.count > 0 {
+                            for index in 0...(assets.count - 1) {
+                                let asset = assets.object(at: index)
+                                let fullSize = CGSize(width: asset.pixelWidth, height: asset.pixelHeight)
+
+                                group.enter()
+                                imageManager.requestImage(for: asset, targetSize: fullSize, contentMode: .default, options: options) { image, _ in
+                                    guard let image = image else {
+                                        group.leave()
+                                        return
+                                    }
+                                    processedImages.append(self.processedImage(from: image, with: asset.imageData))
                                     group.leave()
-                                    return
                                 }
-                                processedImages.append(self.processedImage(from: image, with: asset.imageData))
-                                group.leave()
                             }
                         }
 

package/ios/Plugin/ImageSaver.swift

@@ -4,7 +4,7 @@ class ImageSaver: NSObject {
 
     var onResult: ((Error?) -> Void) = {_ in }
 
-    init(image: UIImage, onResult:@escaping ((Error?) -> Void)) {
+    init(image: UIImage, onResult: @escaping ((Error?) -> Void)) {
         self.onResult = onResult
         super.init()
         UIImageWriteToSavedPhotosAlbum(image, self, #selector(saveResult), nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/camera",
-  "version": "4.1.5-nightly-20230316T150919.0",
+  "version": "4.1.5",
   "description": "The Camera API provides the ability to take a photo with the camera or choose an existing one from the photo album.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2a70219bafbcbe136758c10bb43746f95a9e336"
+  "gitHead": "50d5147d21c0fb915be8894a3a2846ae02389376"
 }