Move CVV setting to property instead of function parameter

arskinner · Apr 28, 2017 · cab03fa · cab03fa
1 parent 4885f33
commit cab03fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/iphone/Classes/ComLikelysoftCardioModule.h b/iphone/Classes/ComLikelysoftCardioModule.h
@@ -13,6 +13,7 @@
     KrollCallback * _callback;
     BOOL paypalLogo;
     BOOL cardIOLogo;
+    BOOL collectCVV;
     NSString* locale;
     UIColor *guideColor;
 }

diff --git a/iphone/Classes/ComLikelysoftCardioModule.m b/iphone/Classes/ComLikelysoftCardioModule.m
@@ -39,6 +39,7 @@ -(void)startup
 
     paypalLogo = YES;
     cardIOLogo = NO;
+    collectCVV = YES;
     locale = @"en";
 
 	NSLog(@"[INFO] %@ loaded",self);
@@ -112,6 +113,11 @@ -(void)setCardIOLogo:(id)value {
     cardIOLogo = [numValue boolValue];
 }
 
+-(void)setCollectCVV:(id)value {
+    NSNumber * numValue = [value retain];
+    cardIOLogo = [numValue boolValue];
+}
+
 -(id)guideColor {
     return [[[TiColor alloc] initWithColor:guideColor name:@"#fff"] autorelease];
 }
@@ -147,20 +153,12 @@ - (void)scanCard:(id)args {
     scanViewController.hideCardIOLogo = !paypalLogo;
     scanViewController.useCardIOLogo = cardIOLogo;
     scanViewController.languageOrLocale = locale;
+    scanViewController.collectCVV = collectCVV;
 
     if (guideColor) {
         scanViewController.guideColor = guideColor;
     }
-
-	if([args length]> 1)
-	{
-        	NSString* isCVVtoShow =[args objectAtIndex:1];
-	        if([isCVVtoShow isEqualToString:@"N"])
-        	    scanViewController.collectCVV= NO;
-	        else if([isCVVtoShow isEqualToString:@"Y"])
-        	    scanViewController.collectCVV= YES;
-	}	
-
+
     [[TiApp app] showModalController:scanViewController animated:YES];
 }
 

diff --git a/iphone/manifest b/iphone/manifest
@@ -2,13 +2,13 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.1
+version: 2.0.2
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: Appcelerator wrapper for the Card.io credit card scanning library. Use the phone's camera to read credit card numbers and expiration dates.
 author: Likely Solutions
 license: Free
-copyright: Copyright (c) 2015 by Likely Solutions
+copyright: Copyright (c) 2017 by Likely Solutions
 
 # these should not be edited
 name: Card.io

diff --git a/iphone/titanium.xcconfig b/iphone/titanium.xcconfig
@@ -4,13 +4,13 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 5.0.2.GA
+TITANIUM_SDK_VERSION = 6.0.3.GA
 
 
 //
 // THESE SHOULD BE OK GENERALLY AS-IS
 //
-TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/5.0.2.GA
+TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/6.0.3.GA
 TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include"
 TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore"
 TITANIUM_BASE_SDK3 = "$(TITANIUM_SDK)/iphone/include/JavaScriptCore"