qrdnicapacitor 1.0.12 → 1.0.13

package/android/src/main/java/com/cqesolutions/qrdnicapacitor/QrCodeScanner.java

@@ -89,7 +89,7 @@ public class QrCodeScanner extends AppCompatActivity {
         if (returnString) {
             handled = true;
             Intent intent = new Intent();
-            intent.putExtra(Constantes.KEY_QR_CODE, normalizeText(rawResult.getText()));
+            intent.putExtra(KEY_QR_CODE, normalizeText(rawResult.getText()));
             setResult(RESULT_OK, intent);
             finish();
         } else {
@@ -103,7 +103,7 @@ public class QrCodeScanner extends AppCompatActivity {
                 Log.d("QrCodeScanner", "Bytes leídos: " + rawBytes.length);
 
                 Intent intent = new Intent();
-                intent.putExtra(Constantes.KEY_QR_CODE, base64Result);
+                intent.putExtra(KEY_QR_CODE, base64Result);
                 setResult(RESULT_OK, intent);
                 finish();
             } else {

package/ios/Sources/qrdniPlugin/qrdniPlugin.swift

@@ -14,6 +14,13 @@ public class qrdniPlugin: CAPPlugin, CAPBridgedPlugin {
     
     // PROPIEDAD PARA GUARDAR LA LLAMADA (Plan B)
     private var scanCall: CAPPluginCall?
+    private var scannerVC: ScannerViewController?
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        // Si se cierra sin haber emitido resultado, notificar cancelación
+        NotificationCenter.default.post(name: NSNotification.Name("lecturaQRCancelada"), object: nil)
+    }
 
     @objc func configure(_ call: CAPPluginCall) {
         let license = call.getString("license") ?? ""
@@ -56,49 +63,56 @@ public class qrdniPlugin: CAPPlugin, CAPBridgedPlugin {
             let scannerVC = ScannerViewController()
             scannerVC.modalPresentationStyle = .fullScreen
             scannerVC.inicializa(returnString: false)
-            
+            self.scannerVC = scannerVC 
+
             NotificationCenter.default.addObserver(self, selector: #selector(self.handleScannerResult(_:)), name: NSNotification.Name("lecturaQR"), object: nil)
             
             self.bridge?.viewController?.present(scannerVC, animated: true)
         }
     }
+@objc func handleScannerResult(_ notification: Notification) {
+    NotificationCenter.default.removeObserver(self, name: NSNotification.Name("lecturaQR"), object: nil)
 
-    @objc func handleScannerResult(_ notification: Notification) {
-        NotificationCenter.default.removeObserver(self, name: NSNotification.Name("lecturaQR"), object: nil)
-        
-        // 3. RECUPERAMOS LA LLAMADA DESDE NUESTRA VARIABLE
-        guard let call = self.scanCall else {
-            print("ERROR: La referencia local a la llamada es nil")
-            return
-        }
+    // Cerrar el scanner
+    DispatchQueue.main.async { [weak self] in
+        self?.scannerVC?.dismiss(animated: true)
+        self?.scannerVC = nil
+    }
 
-        guard let userInfo = notification.userInfo,
-              let qrBase64 = userInfo["qrcode"] as? String else {
-            call.reject("Error al obtener datos")
-            self.scanCall = nil // Limpiamos
-            return
+    guard let call = self.scanCall else {
+        print("ERROR: La referencia local a la llamada es nil")
+        return
+    }
+
+    // El scanner publica "qrcodeData" (Data) en modo DNI,
+    // o "qrcode" (String) en modo texto. Aceptamos ambos.
+    var qrData: Data? = nil
+    if let userInfo = notification.userInfo {
+        if let d = userInfo["qrcodeData"] as? Data {
+            qrData = d
+        } else if let s = userInfo["qrcode"] as? String {
+            qrData = Data(base64Encoded: s)
         }
+    }
 
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-            guard let self = self else { return }
-            
-            if let qrData = Data(base64Encoded: qrBase64) {
-                if let resultadoJson = self.implementation.validaMiDNIQR(datosQR: qrData) {
-                    DispatchQueue.main.async {
-                        call.resolve(resultadoJson)
-                        self.scanCall = nil // Limpieza final
-                    }
-                } else {
-                    DispatchQueue.main.async {
-                        call.reject("Fallo en validación")
-                        self.scanCall = nil
-                    }
-                }
-            } else {
-                DispatchQueue.main.async {
-                    call.reject("Base64 corrupto")
-                    self.scanCall = nil
-                }
+    guard let datos = qrData else {
+        call.reject("Error al obtener datos")
+        self.scanCall = nil
+        return
+    }
+
+    DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+        guard let self = self else { return }
+
+        if let resultadoJson = self.implementation.validaMiDNIQR(datosQR: datos) {
+            DispatchQueue.main.async {
+                call.resolve(resultadoJson)
+                self.scanCall = nil
+            }
+        } else {
+            DispatchQueue.main.async {
+                call.reject("Fallo en validación")
+                self.scanCall = nil
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qrdnicapacitor",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Lectura y validación de códigos QR generados por la app MiDNI",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",