@capacitor/camera 8.1.0-test.20260330 → 8.1.0-test.20260331

package/CapacitorCamera.podspec

@@ -9,10 +9,10 @@ Pod::Spec.new do |s|
   s.license = package['license']
   s.homepage = 'https://capacitorjs.com'
   s.author = package['author']
-  s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
-  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}', 'camera/ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source = { :git => 'https://github.com/ionic-team/capacitor-camera.git', :tag => "v#{s.version}" }
+  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}',
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
-  s.dependency 'IONCameraLib', spec='~> 1.0.0'
+  s.dependency 'IONCameraLib', spec='~> 0.1.0'
   s.swift_version = '5.1'
 end

package/android/build.gradle

@@ -89,5 +89,5 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'io.ionic.libs:ioncamera-android:0.1.0'
+    implementation 'io.ionic.libs:ioncamera-android:0.1.0@aar'
 }

package/android/src/main/java/com/capacitorjs/plugins/camera/IonCameraFlow.kt

@@ -731,18 +731,17 @@ class IonCameraFlow(
         ret.put("webPath", FileUtils.getPortablePath(context, bridge.localUrl, uri))
         ret.put("saved", mediaResult.saved)
 
-        val metadata = JSObject()
         mediaResult.metadata?.let {
+            val metadata = JSObject()
             metadata.put("duration", it.duration)
             metadata.put("size", it.size)
             metadata.put("format", it.format)
             metadata.put("resolution", it.resolution)
             metadata.put("creationDate", it.creationDate)
             metadata.put("exif", exif.toJson())
+            ret.put("metadata", metadata)
         }
 
-        ret.put("metadata", metadata)
-
         currentCall?.resolve(ret)
         currentCall = null
         lastEditUri = null
@@ -759,17 +758,16 @@ class IonCameraFlow(
         ret.put("webPath", FileUtils.getPortablePath(context, bridge.localUrl, uri))
         ret.put("saved", mediaResult.saved)
 
-        val metadata = JSObject()
         mediaResult.metadata?.let {
+            val metadata = JSObject()
             metadata.put("duration", it.duration)
             metadata.put("size", it.size)
             metadata.put("format", it.format)
             metadata.put("resolution", it.resolution)
             metadata.put("creationDate", it.creationDate)
+            ret.put("metadata", metadata)
         }
 
-        ret.put("metadata", metadata)
-
         currentCall?.resolve(ret)
         currentCall = null
     }
@@ -790,27 +788,27 @@ class IonCameraFlow(
                 FileUtils.getPortablePath(context, bridge.localUrl, uri)
             )
 
-            val metadata = JSObject()
             mediaResult.metadata?.let {
+                val metadata = JSObject()
                 metadata.put("duration", it.duration)
                 metadata.put("size", it.size)
                 metadata.put("format", it.format)
                 metadata.put("resolution", it.resolution)
                 metadata.put("creationDate", it.creationDate)
-            }
 
-            if (mediaResult.type == IONCAMRMediaType.PICTURE.type) {
-                val bitmap = BitmapFactory.decodeFile(mediaResult.uri)
-                if (bitmap == null) {
-                    sendError(IONCAMRError.PROCESS_IMAGE_ERROR)
-                    return
+                if (mediaResult.type == IONCAMRMediaType.PICTURE.type) {
+                    val bitmap = BitmapFactory.decodeFile(mediaResult.uri)
+                    if (bitmap == null) {
+                        sendError(IONCAMRError.PROCESS_IMAGE_ERROR)
+                        return
+                    }
+
+                    val exif = ImageUtils.getExifData(context, bitmap, uri)
+                    metadata.put("exif", exif.toJson())
                 }
 
-                val exif = ImageUtils.getExifData(context, bitmap, uri)
-                metadata.put("exif", exif.toJson())
+                ret.put("metadata", metadata)
             }
-
-            ret.put("metadata", metadata)
             photos.put(ret)
         }
 

package/ios/Sources/CameraPlugin/CameraPlugin.swift

@@ -3,6 +3,7 @@ import IONCameraLib
 import Capacitor
 import Photos
 import PhotosUI
+import ImageIO
 
 @objc(CAPCameraPlugin)
 public class CameraPlugin: CAPPlugin, CAPBridgedPlugin {
@@ -27,14 +28,14 @@ public class CameraPlugin: CAPPlugin, CAPBridgedPlugin {
     private let defaultSource = CameraSource.prompt
     private let defaultDirection = CameraDirection.rear
     private var multiple = false
-    
+
     private lazy var cameraManager = IONCAMRFactory.createCameraManagerWrapper(withDelegate: self, and: self.bridge?.viewController ?? UIViewController())
     private lazy var galleryManager = IONCAMRFactory.createGalleryManagerWrapper(withDelegate: self, and: self.bridge?.viewController ?? UIViewController())
     private lazy var editManager = IONCAMRFactory.createEditManagerWrapper(withDelegate: self, and: self.bridge?.viewController ?? UIViewController())
     private lazy var videoManager = IONCAMRFactory.createVideoManagerWrapper(withDelegate: self, and: self.bridge?.viewController ?? UIViewController())
 
     private var imageCounter = 0
-    
+
     private func decodeParameters<T: Decodable>(from call: CAPPluginCall) -> T? {
         guard let dict = call.options as? [String: Any],
               let data = try? JSONSerialization.data(withJSONObject: dict)
@@ -64,31 +65,31 @@ public class CameraPlugin: CAPPlugin, CAPBridgedPlugin {
             self.cameraManager.takePhoto(with: options)
         }
     }
-    
+
     @objc func chooseFromGallery(_ call: CAPPluginCall) {
         handleCall(call, error: .chooseMultimediaIssue) { (options: IONCAMRGalleryOptions) in
             self.galleryManager.chooseFromGallery(with: options)
         }
     }
-    
+
     @objc func editURIPhoto(_ call: CAPPluginCall) {
         handleCall(call, error: .editPictureIssue) { (options: IONCAMRPhotoEditOptions) in
             self.editManager.editPhoto(with: options)
         }
     }
-    
+
     @objc func editPhoto(_ call: CAPPluginCall) {
         handleCall(call, error: .editPictureIssue) { (options: IONCAMRPhotoEditOptions) in
             self.editManager.editPhoto(with: options)
         }
     }
-    
+
     @objc func recordVideo(_ call: CAPPluginCall) {
         handleCall(call, error: .captureVideoIssue) { (options: IONCAMRRecordVideoOptions) in
             self.cameraManager.recordVideo(with: options)
         }
     }
-    
+
     @objc func playVideo(_ call: CAPPluginCall) {
         handleCall(call, error: .playVideoIssue) { (options: IONCAMRPlayVideoOptions) in
             Task {
@@ -104,7 +105,6 @@ public class CameraPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-
     @objc override public func checkPermissions(_ call: CAPPluginCall) {
         var result: [String: Any] = [:]
         for permission in CameraPermissionType.allCases {
@@ -637,45 +637,32 @@ private extension CameraPlugin {
 }
 
 extension CameraPlugin: IONCAMRCallbackDelegate {
-    
+
     public func callback(error: IONCAMRError) {
         sendError(error)
     }
-    
+
     public func callback(result: IONCAMRMediaResult) {
         resolve(result)
     }
-    
+
     public func callback(result: [IONCAMRMediaResult]) {
         resolve(["results": result])
     }
-    
+
     private func resolve<T: Encodable>(_ value: T) {
         do {
-            let data = try JSONEncoder().encode(value)
+            let encoder = JSONEncoder()
+            encoder.dateEncodingStrategy = .iso8601
+            let data = try encoder.encode(value)
             var json = try JSONSerialization.jsonObject(with: data)
 
-            // Add webPath to results
             if var dict = json as? [String: Any] {
-                // Handle single result
-                if let uri = dict["uri"] as? String,
-                   let webPath = resolveWebPath(from: uri) {
-                    dict["webPath"] = webPath
+                if dict["uri"] != nil {
+                    dict = resolveMediaResult(dict)
+                } else if let results = dict["results"] as? [[String: Any]] {
+                    dict["results"] = results.map(resolveMediaResult)
                 }
-
-                // Handle array of results
-                if var results = dict["results"] as? [[String: Any]] {
-                    results = results.map { item in
-                        var newItem = item
-                        if let uri = item["uri"] as? String,
-                           let webPath = resolveWebPath(from: uri) {
-                            newItem["webPath"] = webPath
-                        }
-                        return newItem
-                    }
-                    dict["results"] = results
-                }
-
                 json = dict
             }
 
@@ -687,6 +674,17 @@ extension CameraPlugin: IONCAMRCallbackDelegate {
         }
     }
 
+    private func resolveMediaResult(_ item: [String: Any]) -> [String: Any] {
+        guard let uri = item["uri"] as? String else { return item }
+        var result = item
+        result["webPath"] = resolveWebPath(from: uri)
+        if var metadata = result["metadata"] as? [String: Any] {
+            metadata["exif"] = resolveExif(from: uri)
+            result["metadata"] = metadata
+        }
+        return result
+    }
+
     private func resolveWebPath(from uri: String) -> String? {
         guard !uri.isEmpty,
               let fileURL = URL(string: uri),
@@ -695,4 +693,17 @@ extension CameraPlugin: IONCAMRCallbackDelegate {
         }
         return webURL.absoluteString
     }
+
+    private func resolveExif(from uri: String) -> [String: Any]? {
+        guard !uri.isEmpty,
+              let fileURL = URL(string: uri),
+              let imageSource = CGImageSourceCreateWithURL(fileURL as CFURL, nil),
+              let properties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) as? [String: Any] else {
+            return nil
+        }
+        var exif = properties[kCGImagePropertyExifDictionary as String] as? [String: Any] ?? [:]
+        exif["Orientation"] = properties[kCGImagePropertyOrientation as String]
+        exif["GPS"] = properties[kCGImagePropertyGPSDictionary as String]
+        return exif.isEmpty ? nil : exif
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/camera",
-  "version": "8.1.0-test.20260330",
+  "version": "8.1.0-test.20260331",
   "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",
@@ -19,10 +19,10 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ionic-team/capacitor-plugins.git"
+    "url": "git+https://github.com/ionic-team/capacitor-camera.git"
   },
   "bugs": {
-    "url": "https://github.com/ionic-team/capacitor-plugins/issues"
+    "url": "https://github.com/ionic-team/capacitor-camera/issues"
   },
   "keywords": [
     "capacitor",