#13 Cordova-iOS 4 support

phonegap · Sep 7, 2015 · de5700c · de5700c
1 parent 009175b
commit de5700c
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/ios/CDVBarcodeScanner.mm b/src/ios/CDVBarcodeScanner.mm
@@ -183,23 +183,17 @@ - (void)returnSuccess:(NSString*)scannedText format:(NSString*)format cancelled:
                                resultWithStatus: CDVCommandStatus_OK
                                messageAsDictionary: resultDict
                                ];
-
-    NSString* js = [result toSuccessCallbackString:callback];
-    if (!flipped) {
-        [self writeJavascript:js];
-    }
+    [self.commandDelegate sendPluginResult:result callbackId:callback];
 }
 
 //--------------------------------------------------------------------------
 - (void)returnError:(NSString*)message callback:(NSString*)callback {
     CDVPluginResult* result = [CDVPluginResult
-                               resultWithStatus: CDVCommandStatus_OK
+                               resultWithStatus: CDVCommandStatus_ERROR
                                messageAsString: message
                                ];
 
-    NSString* js = [result toErrorCallbackString:callback];
-
-    [self writeJavascript:js];
+    [self.commandDelegate sendPluginResult:result callbackId:callback];
 }
 
 @end
@@ -277,16 +271,16 @@ - (void)scanBarcode {
 //--------------------------------------------------------------------------
 - (void)openDialog {
     [self.parentViewController
-     presentModalViewController:self.viewController
-     animated:YES
+     presentViewController:self.viewController
+     animated:YES completion:nil
      ];
 }
 
 //--------------------------------------------------------------------------
 - (void)barcodeScanDone {
     self.capturing = NO;
     [self.captureSession stopRunning];
-    [self.parentViewController dismissModalViewControllerAnimated: YES];
+    [self.parentViewController dismissViewControllerAnimated: YES completion:nil];
 
     // viewcontroller holding onto a reference to us, release them so they
     // will release us