@capacitor/barcode-scanner 2.0.1 → 2.0.2-dev-1

package/CapacitorBarcodeScanner.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
-  s.dependency 'OSBarcodeLib', '~> 1.1.0'
+  s.dependency 'OSBarcodeLib', '~> 1.1.3'
   s.swift_version = '5.1'
 end

package/android/src/main/java/com/capacitorjs/barcodescanner/OSBarcodePlugin.kt

@@ -30,21 +30,18 @@ class CapacitorBarcodeScannerPlugin : Plugin() {
     fun scanBarcode(call: PluginCall) {
         val hint = call.getInt("hint")
         val scanInstructions = call.getString("scanInstructions")
-        val scanButton = call.getBoolean("scanButton", false)
-        val scanText = call.getString("scanText", "")
+        val scanButton = call.getBoolean("scanButton", false) ?: false
+        val scanText = call.getString("scanText", "") ?: ""
         val cameraDirection = call.getInt("cameraDirection")
-
-        val nativeOptions = call.getObject("native")
-
-        val scanOrientation = nativeOptions?.getInteger("scanOrientation")
-        val androidScanningLibrary = nativeOptions?.getJSObject("android")?.getString("scanningLibrary")
+        val scanOrientation = call.getInt("scanOrientation")
+        val androidScanningLibrary = call.getObject("android")?.getString("scanningLibrary")
 
         val parameters = OSBARCScanParameters(
                 scanInstructions = scanInstructions,
                 cameraDirection = cameraDirection,
                 scanOrientation = scanOrientation,
-                scanButton = scanButton!!,
-                scanText = scanText!!,
+                scanButton = scanButton,
+                scanText = scanText,
                 hint = hint,
                 androidScanningLibrary = androidScanningLibrary
         )

package/ios/Plugin/CapacitorBarcodeScannerPlugin.swift

@@ -22,13 +22,13 @@ public class CapacitorBarcodeScannerPlugin: CAPPlugin {
         }
 
         guard let manager = self.manager else {
-            call.reject("Capacitor bridge or viewController is not initialized.")
+            call.sendError(with: OSBarcodeError.bridgeNotInitialized)
             return
         }
 
         guard let argumentsData = try? JSONSerialization.data(withJSONObject: call.jsObjectRepresentation),
               let scanArguments = try? JSONDecoder().decode(OSBarcodeScanArgumentsModel.self, from: argumentsData) else {
-            call.reject("Error decoding scan arguments")
+            call.sendError(with: OSBarcodeError.scanInputArgumentsIssue)
             return
         }
 
@@ -37,12 +37,20 @@ public class CapacitorBarcodeScannerPlugin: CAPPlugin {
                 let scannedBarcode = try await manager.scanBarcode(with: scanArguments.scanInstructions, scanArguments.scanButtonText, scanArguments.cameraDirection, and: scanArguments.scanOrientation)
                 call.resolve(["ScanResult": scannedBarcode])
             } catch OSBARCManagerError.cameraAccessDenied {
-                call.reject("Camera access denied")
+                call.sendError(with: OSBarcodeError.cameraAccessDenied)
             } catch OSBARCManagerError.scanningCancelled {
-                call.reject("Scanning cancelled")
+                call.sendError(with: OSBarcodeError.scanningCancelled)
             } catch {
-                call.reject("An unexpected error occurred: \(error.localizedDescription)")
+                call.sendError(with: OSBarcodeError.scanningError)
             }
         }
     }
 }
+
+extension CAPPluginCall {
+    
+    func sendError(with error: OSBarcodeError) {
+        self.reject(error.errorDescription, error.errorCode)
+    }
+    
+}

package/ios/Plugin/OSBarcodeError.swift

@@ -11,20 +11,20 @@ enum OSBarcodeError: Int, CustomNSError, LocalizedError {
     case scanningCancelled = 6
     case cameraAccessDenied = 7
     case scanInputArgumentsIssue = 8
+    case bridgeNotInitialized = 13
 
-    var errorDescription: String? {
+    var errorDescription: String {
         switch self {
         case .scanningError: return "Error while trying to scan code."
         case .scanningCancelled: return "Couldn’t scan because the process was cancelled."
         case .cameraAccessDenied: return "Couldn’t scan because camera access wasn’t provided. Check your camera permissions and try again."
         case .scanInputArgumentsIssue: return "Scanning parameters are invalid."
+        case .bridgeNotInitialized: return "Capacitor bridge or viewController is not initialized."
         }
     }
-
-    var errorDictionary: [String: String] {
-        [
-            OSBarcodeErrorLabels.code: "\(OSBarcodeErrorLabels.codeFormat)\(String(format: "%04d", self.rawValue))",
-            OSBarcodeErrorLabels.message: self.errorDescription ?? ""
-        ]
+    
+    var errorCode: String {
+        return "\(OSBarcodeErrorLabels.codeFormat)\(String(format: "%04d", self.rawValue))"
     }
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/barcode-scanner",
-  "version": "2.0.1",
+  "version": "2.0.2-dev-1",
   "description": "Capacitor plugin using Outsystems Barcode libs",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",