Fix plugin for iOS on Cordova 3.0 by disabling ARC and using newer pl…

…ugin signature.
phonegap · Sep 5, 2013 · 14d63e3 · 14d63e3
1 parent 7094cc6
commit 14d63e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -28,7 +28,7 @@
 
         <header-file src="src/ios/zxing-all-in-one.h" />
 
-        <source-file src="src/ios/CDVBarcodeScanner.mm"  />
+        <source-file src="src/ios/CDVBarcodeScanner.mm" compiler-flags="-fno-objc-arc" />
         <source-file src="src/ios/zxing-all-in-one.cpp" />
 
         <framework src="libiconv.dylib" />

diff --git a/src/ios/CDVBarcodeScanner.mm b/src/ios/CDVBarcodeScanner.mm
@@ -46,8 +46,8 @@ - (BOOL)shouldAutorotate;
 //------------------------------------------------------------------------------
 @interface CDVBarcodeScanner : CDVPlugin {}
 - (NSString*)isScanNotPossible;
-- (void)scan:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-- (void)encode:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
+- (void)scan:(CDVInvokedUrlCommand*)command;
+- (void)encode:(CDVInvokedUrlCommand*)command;
 - (void)returnSuccess:(NSString*)scannedText format:(NSString*)format cancelled:(BOOL)cancelled callback:(NSString*)callback;
 - (void)returnError:(NSString*)message callback:(NSString*)callback;
 @end
@@ -120,18 +120,18 @@ - (NSString*)isScanNotPossible {
 }
 
 //--------------------------------------------------------------------------
-- (void)scan:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options {
+- (void)scan:(CDVInvokedUrlCommand*)command {
     CDVbcsProcessor* processor;
     NSString*       callback;
     NSString*       capabilityError;
 
-    callback = [arguments objectAtIndex:0];
+    callback = command.callbackId;
 
     // We allow the user to define an alternate xib file for loading the overlay. 
     NSString *overlayXib = nil;
-    if ( [arguments count] == 2 )
+    if ( [command.arguments count] >= 1 )
     {
-        overlayXib = [arguments objectAtIndex:1];
+        overlayXib = [command.arguments objectAtIndex:0];
     }
 
     capabilityError = [self isScanNotPossible];
@@ -152,8 +152,8 @@ - (void)scan:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options {
 }
 
 //--------------------------------------------------------------------------
-- (void)encode:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options {
-    [self returnError:@"encode function not supported" callback:[arguments objectAtIndex:0]];
+- (void)encode:(CDVInvokedUrlCommand*)command {
+    [self returnError:@"encode function not supported" callback:command.callbackId];
 }
 
 //--------------------------------------------------------------------------
@@ -855,4 +855,4 @@ - (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)orien
     [super willAnimateRotationToInterfaceOrientation:orientation duration:duration];
 }
 
-@end
+@end