card-io · dgoldman-pdx · Feb 17, 2015 · Feb 19, 2015 · Feb 24, 2015 · Feb 24, 2015
diff --git a/Classes/CardIOCardScanner.mm b/Classes/CardIOCardScanner.mm
@@ -24,8 +24,6 @@ @interface CardIOCardScanner ()
 @property(assign, readwrite) ScannerState scannerState;
 @property(strong, readwrite) CardIOReadCardInfo *cardInfoCache;
 @property(assign, readwrite) BOOL cardInfoCacheDirty;
-@property(strong, readwrite) NSArray *xOffsets;
-@property(assign, readwrite) uint16_t yOffset;
 @property(assign, readwrite) BOOL lastFrameWasUsable;
 @property(assign, readwrite) BOOL lastFrameWasUpsideDown;
 @property(assign, readwrite) BOOL scanIsComplete;
@@ -67,7 +65,6 @@ - (void)addFrame:(CardIOIplImage *)y
   }
 
   FrameScanResult result;
-  bool collectCardNumber = (_scannerState.timeOfCardNumberCompletionInMilliseconds == 0);
 
   // A little bit of a hack, but we prepopulate focusScore and brightness information
   result.focus_score = focusScore;
@@ -79,20 +76,8 @@ - (void)addFrame:(CardIOIplImage *)y
   result.flipped = flipped;
   scanner_add_frame_with_expiry(&_scannerState, y.image, scanExpiry, &result);
   self.lastFrameWasUsable = result.usable;
-  if (collectCardNumber) {
-    if(result.usable) {
-      NSMutableArray *x = [NSMutableArray arrayWithCapacity:result.hseg.n_offsets];
-      for(uint8_t i = 0; i < result.hseg.n_offsets; i++) {
-        NSNumber *xOffset = [NSNumber numberWithUnsignedShort:result.hseg.offsets[i]];
-        [x addObject:xOffset];
-      }
-      self.xOffsets = x;
-      self.yOffset = result.vseg.y_offset;
-    } else {
-      self.lastFrameWasUpsideDown = result.upside_down;
-      self.xOffsets = nil;
-      self.yOffset = 0;
-    }
+  if(!result.usable) {
+    self.lastFrameWasUpsideDown = result.upside_down;
   }
   [self markCachesDirty];
 }
@@ -156,9 +141,15 @@ - (CardIOReadCardInfo *)cardInfo {
       }
 #endif
 
+      NSMutableArray *xOffsets = [NSMutableArray arrayWithCapacity:result.hseg.n_offsets];
+      for(uint8_t i = 0; i < result.hseg.n_offsets; i++) {
+        NSNumber *xOffset = [NSNumber numberWithUnsignedShort:result.hseg.offsets[i]];
+        [xOffsets addObject:xOffset];
+      }
+
       self.cardInfoCache = [CardIOReadCardInfo cardInfoWithNumber:cardNumber
-                                                         xOffsets:self.xOffsets
-                                                          yOffset:self.yOffset
+                                                         xOffsets:xOffsets
+                                                          yOffset:result.vseg.y_offset
                                                       expiryMonth:result.expiry_month
                                                        expiryYear:result.expiry_year
 #if CARDIO_DEBUG

diff --git a/Classes/CardIOCreditCardExpiryFormatter.m b/Classes/CardIOCreditCardExpiryFormatter.m
@@ -5,6 +5,7 @@
 
 #import "CardIOCreditCardExpiryFormatter.h"
 #import "CardIOCreditCardInfo.h"
+#import "CardIOCreditCardNumber.h"
 
 @implementation CardIOCreditCardExpiryFormatter
 
@@ -16,12 +17,12 @@ - (BOOL)getObjectValue:(id __autoreleasing *)obj forString:(NSString *)string er
   NSInteger year = 0;
 
   if (values.count > 0) {
-    month = [[values[0] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] integerValue];
+    month = [[CardIOCreditCardNumber stringByRemovingNonNumbers:values[0]] integerValue];
   }
   if (values.count > 1) {
-    year = [[values[1] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] integerValue];
+    year = [[CardIOCreditCardNumber stringByRemovingNonNumbers:values[1]] integerValue];
     if (year < 2000) {
-      year += 2000;
+      year = 2000 + (year % 100);
     }
   }
 

diff --git a/Classes/CardIOExpiryTextFieldDelegate.m b/Classes/CardIOExpiryTextFieldDelegate.m
@@ -94,7 +94,8 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
 
   NSString *numericNewText = [CardIOCreditCardNumber stringByRemovingNonNumbers:newText];
   NSString *updatedText = [textField.text stringByReplacingCharactersInRange:range withString:numericNewText];
-  if(updatedText.length > 9) {
+  if(updatedText.length > 7) {
+    // 7 characters: "MM_/_YY"
     [CardIOConfigurableTextFieldDelegate vibrate];
     return NO;
   }
@@ -104,7 +105,7 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
   NSString *monthStr = [updatedNumberText substringToIndex:MIN(2, updatedNumberText.length)];
   if(monthStr.length > 0) {
     NSInteger month = [monthStr integerValue];
-    if(month < 0 || 12 < month) {
+    if(month < 0 || month > 12) {
       [CardIOConfigurableTextFieldDelegate vibrate];
       return NO;
     }

diff --git a/Classes/CardIOIplImage.mm b/Classes/CardIOIplImage.mm
@@ -110,12 +110,13 @@ - (UIImage *)UIImage {
   } else if(self.image->nChannels == 3) {
     colorSpace = CGColorSpaceCreateDeviceRGB();
   }
+  int depth = self.image->depth & ~IPL_DEPTH_SIGN;
 	NSData *data = [NSData dataWithBytes:self.image->imageData length:self.image->imageSize];
 	CGDataProviderRef provider = CGDataProviderCreateWithCFData((__bridge CFDataRef)data);
 	CGImageRef imageRef = CGImageCreate(self.image->width,
                                       self.image->height,
-                                      self.image->depth,
-                                      self.image->depth * self.image->nChannels,
+                                      depth,
+                                      depth * self.image->nChannels,
                                       self.image->widthStep,
                                       colorSpace,
                                       kCGImageAlphaNone | kCGBitmapByteOrderDefault,

diff --git a/Classes/CardIOUtilities.m b/Classes/CardIOUtilities.m
@@ -8,8 +8,11 @@
 #import "CardIOGPUGaussianBlurFilter.h"
 #import "CardIOIccVersion.h"
 #import "CardIOLocalizer.h"
+#import "CardIOMacros.h"
 #import "CardIOView.h"
 
+#import <AVFoundation/AVFoundation.h>
+
 @implementation CardIOUtilities
 
 #pragma mark - Library version, for bug reporting etc.
@@ -70,6 +73,30 @@ + (BOOL)canReadCardWithCamera {
       cachedScanAvailabilityStatus = ScanAvailabilityNever;
       return NO;
     }
+
+    if (iOS_7_PLUS) {
+      // Check for video permission.
+      // But don't set cachedScanAvailabilityStatus here, as the user can change this permission at any time.
+      // (Actually, should the user go to Settings and change this permission for this app, apparently the system
+      // will immediately SIGKILL (force restart) this app. But let's not depend on this semi-documented behavior.)
+      AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+      if (authStatus == AVAuthorizationStatusDenied || authStatus == AVAuthorizationStatusRestricted){
+        return NO;
+      }
+      else {
+        // Either the user has already granted permission, or else the user has not yet been asked.
+        //
+        // For the latter case, while we could ask now, unfortunately the necessary
+        // [AVCaptureDevice requestAccessForMediaType:completionHandler:] method returns the user's choice
+        // to us asynchronously, which doesn't mix well with canReadCardWithCamera being synchronous.
+        //
+        // Rather than making a backward-incompatible change to canReadCardWithCamera, let's simply allow things
+        // to proceed. When the camera view is finally presented, then the user will be prompted to authorize
+        // or deny the video permission. If they choose "deny", then they'll probably understand why they're
+        // looking at a black screen.
+        return YES;
+      }
+    }
 #endif
 
     cachedScanAvailabilityStatus = ScanAvailabilityAlways;

diff --git a/Classes/CardIOVideoStream.mm b/Classes/CardIOVideoStream.mm
@@ -496,6 +496,21 @@ - (void)startSession {
 
 - (void)stopSession {
   if (self.running) {
+#if USE_CAMERA
+    [self changeCameraConfiguration:^{
+      // restore default focus range
+      if ([self.camera respondsToSelector:@selector(isAutoFocusRangeRestrictionSupported)]) {
+        if(self.camera.autoFocusRangeRestrictionSupported) {
+          self.camera.autoFocusRangeRestriction = AVCaptureAutoFocusRangeRestrictionNone;
+        }
+      }
+    }
+ #if CARDIO_DEBUG
+                   withErrorMessage:@"CardIO couldn't lock for configuration within stopSession"
+ #endif
+     ];
+#endif
+
     dispatch_semaphore_wait(self.cameraConfigurationSemaphore, DISPATCH_TIME_FOREVER);
 
 #if USE_CAMERA

diff --git a/Classes/CardIOViewController.mm b/Classes/CardIOViewController.mm
@@ -457,6 +457,10 @@ - (void)manualEntry:(id)sender {
 
 - (void)cancel:(id)sender {
   [self.context.scanReport reportEventWithLabel:@"scan_cancel" withScanner:self.cardIOView.scanner];
+
+  // Hiding the CardIOView causes it to call its stopSession method, thus eliminating a visible stutter.
+  // See https://github.com/card-io/card.io-iOS-SDK/issues/97
+  self.cardIOView.hidden = YES;
 
   [self.navigationController setNavigationBarHidden:NO animated:YES]; // to restore the color of the status bar!
 

diff --git a/Release/CardIO.podspec b/Release/CardIO.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = 'CardIO'
-  spec.version          = '5.0.1'
+  spec.version          = '5.0.4'
   spec.license          = { type: 'MIT', file: 'LICENSE.md' }
   spec.homepage         = 'https://www.card.io'
   spec.authors          = { 'CardIO' => '[email protected]' }

diff --git a/Release/SampleApp-Swift/SampleApp-Swift/Base.lproj/Main.storyboard b/Release/SampleApp-Swift/SampleApp-Swift/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1077" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -23,11 +23,11 @@
                                     <constraint firstAttribute="width" constant="300" id="saB-lV-1Ja"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6wu-dt-vfp">
-                                <rect key="frame" x="264" y="50" width="73" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6wu-dt-vfp">
+                                <rect key="frame" x="264" y="75" width="73" height="25"/>
                                 <state key="normal" title="Scan Card">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
@@ -39,10 +39,18 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="centerX" secondItem="RN3-ZX-uyW" secondAttribute="centerX" id="9NV-Wg-jNb"/>
+                            <constraint firstItem="RN3-ZX-uyW" firstAttribute="top" secondItem="6wu-dt-vfp" secondAttribute="bottom" constant="8" symbolic="YES" id="Gc5-Cp-AzK"/>
                             <constraint firstAttribute="centerY" secondItem="RN3-ZX-uyW" secondAttribute="centerY" constant="74" id="IpO-6t-Ids"/>
-                            <constraint firstAttribute="centerX" secondItem="6wu-dt-vfp" secondAttribute="centerX" id="Vpq-hA-5Ve"/>
-                            <constraint firstItem="RN3-ZX-uyW" firstAttribute="top" secondItem="6wu-dt-vfp" secondAttribute="bottom" constant="8" id="opr-g8-aEN"/>
+                            <constraint firstAttribute="centerX" secondItem="6wu-dt-vfp" secondAttribute="centerX" id="QG3-P9-yf4"/>
+                            <constraint firstItem="6wu-dt-vfp" firstAttribute="centerX" secondItem="RN3-ZX-uyW" secondAttribute="centerX" id="Uh4-u3-RjP"/>
+                            <constraint firstItem="6wu-dt-vfp" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" constant="75" id="u8l-Wq-ERk"/>
                         </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="Gc5-Cp-AzK"/>
+                                <exclude reference="Uh4-u3-RjP"/>
+                            </mask>
+                        </variation>
                     </view>
                     <connections>
                         <outlet property="resultLabel" destination="RN3-ZX-uyW" id="jVY-aE-csY"/>

diff --git a/Release/release_notes.txt b/Release/release_notes.txt
@@ -1,6 +1,30 @@
 card.io iOS SDK release notes
 =============================
 
+5.0.4 (Tue 4/14/2015)
+
+* Check existing video permissions before presenting camera view.
+    (https://github.com/card-io/card.io-iOS-SDK/issues/99)
+* Restrict expiry year manual input to 2 digits in all cases.
+    (https://github.com/card-io/card.io-iOS-SDK/issues/104)
+
+--
+
+5.0.3 (Tue 3/17/2015)
+
+* On scan cancelation, eliminate a visual stutter.
+    (https://github.com/card-io/card.io-iOS-SDK/issues/97)
+* On scan completion, reset camera focus range to nonrestricted.
+    (https://github.com/card-io/card.io-iOS-source/issues/17)
+
+--
+
+5.0.2 (Mon 2/23/2015)
+
+* Re-enable expiry-scanning for 32-bit devices (e.g., iPhone 4S).
+
+--
+
 5.0.1 (Tue 2/10/2015)
 
 * Simplify expiry-scanning code to improve accuracy and also decrease library size a bit.

diff --git a/dmz b/dmz