✨ feat: resolve dangling startScan in stopScan (#51)

capacitor-community · Jun 30, 2021 · 874466c · 874466c
1 parent f7cf711
commit 874466c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/android/src/main/java/com/dutchconcepts/capacitor/barcodescanner/BarcodeScanner.java b/android/src/main/java/com/dutchconcepts/capacitor/barcodescanner/BarcodeScanner.java
@@ -329,6 +329,15 @@ public void startScan(PluginCall call) {
 
     @PluginMethod
     public void stopScan(PluginCall call) {
+        if (call.hasOption("resolveScan") && call.getBool("resolveScan") && getSavedCall() != null) {
+            JSObject jsObject = new JSObject();
+            jsObject.put("hasContent", false);
+
+            if (getSavedCall() != null) {
+                getSavedCall().resolve(jsObject);
+            }
+        }
+
         destroy();
         call.resolve();
     }

diff --git a/ios/Plugin/Plugin.swift b/ios/Plugin/Plugin.swift
@@ -373,6 +373,14 @@ public class BarcodeScanner: CAPPlugin, AVCaptureMetadataOutputObjectsDelegate {
     }
 
     @objc func stopScan(_ call: CAPPluginCall) {
+        if (call.hasOption("resolveScan") && call.getBool("resolveScan") && self.savedCall != nil) {
+            var jsObject = PluginResultData()
+            jsObject["hasContent"] = false
+
+            savedCall.resolve(jsObject)
+            savedCall = nil
+        }
+
         self.destroy()
         call.resolve()
     }

diff --git a/src/definitions.ts b/src/definitions.ts
@@ -3,7 +3,7 @@ export interface BarcodeScannerPlugin {
   hideBackground(): Promise<void>;
   showBackground(): Promise<void>;
   startScan(options?: ScanOptions): Promise<ScanResult>;
-  stopScan(): Promise<void>;
+  stopScan(options?: StopScanOptions): Promise<void>;
   checkPermission(
     options?: CheckPermissionOptions,
   ): Promise<CheckPermissionResult>;
@@ -39,6 +39,10 @@ export interface ScanOptions {
   targetedFormats?: SupportedFormat[];
 }
 
+export interface StopScanOptions {
+  resolveScan?: boolean;
+}
+
 export interface ScanResult {
   hasContent: boolean;
   content?: string;

diff --git a/src/web.ts b/src/web.ts
@@ -6,6 +6,7 @@ import type {
   ScanResult,
   CheckPermissionOptions,
   CheckPermissionResult,
+  StopScanOptions,
 } from './definitions';
 
 export class BarcodeScannerWeb
@@ -27,7 +28,7 @@ export class BarcodeScannerWeb
     throw this.unimplemented('Not implemented on web.');
   }
 
-  async stopScan(): Promise<void> {
+  async stopScan(_options?: StopScanOptions): Promise<void> {
     throw this.unimplemented('Not implemented on web.');
   }