Merge pull request #134 from brandon8863/master

Fix dart future not returning on cancel
mintware-de · Jul 30, 2019 · 39ecc57 · 39ecc57 · Lalrinfela · Oct 5, 2019
2 parents 4271490 + 73c7a7e
commit 39ecc57
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/ios/Classes/BarcodeScanPlugin.h b/ios/Classes/BarcodeScanPlugin.h
@@ -9,6 +9,6 @@
 
 @interface BarcodeScanPlugin : NSObject<FlutterPlugin, BarcodeScannerViewControllerDelegate>
 
-@property(nonatomic, retain) FlutterResult result;
+@property(nonatomic, copy) FlutterResult result;
 @property (nonatomic, assign) UIViewController *hostViewController;
 @end
diff --git a/ios/Classes/BarcodeScannerViewController.m b/ios/Classes/BarcodeScannerViewController.m
@@ -82,6 +82,7 @@ - (void)startScan {
 }
 
 - (void)cancel {
+    [self.delegate barcodeScannerViewController:self didFailWithErrorCode:@"USER_CANCELED"];
     [self dismissViewControllerAnimated:true completion:nil];
 }
 

diff --git a/lib/barcode_scan.dart b/lib/barcode_scan.dart
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 
 class BarcodeScanner {
   static const CameraAccessDenied = 'PERMISSION_NOT_GRANTED';
+  static const UserCanceled = 'USER_CANCELED';
   static const MethodChannel _channel =
       const MethodChannel('com.apptreesoftware.barcode_scan');
   static Future<String> scan() async => await _channel.invokeMethod('scan');
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,6 +82,7 @@ - (void)startScan { @@
     }
     - (void)cancel {
+        [self.delegate barcodeScannerViewController:self didFailWithErrorCode:@"USER_CANCELED"];
         [self dismissViewControllerAnimated:true completion:nil];
     }
@@ Expand Down @@