Release 1.8.1.

Ingenico-ePayments · Jul 20, 2021 · c76f9b4 · c76f9b4
1 parent 9e4dd29
commit c76f9b4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/IngenicoConnectExample/ICAppConstants.h b/IngenicoConnectExample/ICAppConstants.h
@@ -23,5 +23,5 @@
 #define kICBoletoBancarioId     @"1503"
 #define kICBancontactId         @"3012"
 #define kICArvatoIds            [NSSet setWithArray:@[@"9000", @"9001"]]
-#define kICApplicationIdentifier @"iOS Example Application/v1.8.0"
+#define kICApplicationIdentifier @"iOS Example Application/v1.8.1"
 #endif
diff --git a/IngenicoConnectExample/ICBoletoProductViewController.m b/IngenicoConnectExample/ICBoletoProductViewController.m
@@ -55,9 +55,9 @@ -(ICValidatorBoletoBancarioRequiredness *)firstBoletoBancarioRequirednessValidat
         return [validator isKindOfClass:[ICValidatorBoletoBancarioRequiredness class]];
     }]].firstObject;
 }
--(void)formatAndUpdateCharactersFromTextField:(UITextField *)textField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath
+-(void)formatAndUpdateCharactersFromTextField:(UITextField *)textField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath trimSet:(NSMutableCharacterSet *)trimSet
 {
-    [super formatAndUpdateCharactersFromTextField:textField cursorPosition:position indexPath:indexPath];
+    [super formatAndUpdateCharactersFromTextField:textField cursorPosition:position indexPath:indexPath trimSet:[NSMutableCharacterSet characterSetWithCharactersInString:@" /-_"]];
     ICFormRow *row = [self.formRows objectAtIndex:indexPath.row];
     if ([row isKindOfClass:[ICFormRowTextField class]]) {
         ICFormRowTextField *textRow = (ICFormRowTextField *)row;

diff --git a/IngenicoConnectExample/ICCardProductViewController.m b/IngenicoConnectExample/ICCardProductViewController.m
@@ -116,9 +116,15 @@ - (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     }
 }
 
--(void)formatAndUpdateCharactersFromTextField:(UITextField *)texField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath {
-    [super formatAndUpdateCharactersFromTextField:texField cursorPosition:position indexPath:indexPath];
+-(void)formatAndUpdateCharactersFromTextField:(UITextField *)texField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath trimSet:(NSMutableCharacterSet *)trimSet  {
     ICFormRowTextField *row = [self.formRows objectAtIndex:indexPath.row];
+
+    if ([row.paymentProductField.identifier isEqualToString:@"cardholderName"]) {
+        [super formatAndUpdateCharactersFromTextField:texField cursorPosition:position indexPath:indexPath trimSet:[NSMutableCharacterSet characterSetWithCharactersInString:@"?`~!@#$%^&*()_+=[]{}|\\;:\"<>£¥•,€"]];
+    } else {
+        [super formatAndUpdateCharactersFromTextField:texField cursorPosition:position indexPath:indexPath trimSet:[NSMutableCharacterSet characterSetWithCharactersInString:@" /-_"]];
+    }
+
     if ([row.paymentProductField.identifier isEqualToString:@"cardNumber"]) {
         NSString *unmasked = [self.inputData unmaskedValueForField:row.paymentProductField.identifier];
         if (unmasked.length >= 6 && [self oneOfFirst8DigitsChangedInText:unmasked]) {

diff --git a/IngenicoConnectExample/ICPaymentProductViewController.h b/IngenicoConnectExample/ICPaymentProductViewController.h
@@ -42,7 +42,7 @@
 - (ICTableViewCell *)formRowCellForRow:(ICFormRow *)row atIndexPath:(NSIndexPath *)indexPath;
 -(void)switchToPaymentProduct:(NSString *)paymentProductId;
 -(void)updateFormRows;
--(void)formatAndUpdateCharactersFromTextField:(UITextField *)texField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath;
+-(void)formatAndUpdateCharactersFromTextField:(UITextField *)texField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath trimSet:(NSMutableCharacterSet *)trimSet;
 - (void)initializeFormRows;
 -(void)validateExceptFields:(NSSet *)fields;
 - (void)pickerView:(ICPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component;

diff --git a/IngenicoConnectExample/ICPaymentProductViewController.m b/IngenicoConnectExample/ICPaymentProductViewController.m
@@ -686,9 +686,9 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
 
     return result;
 }
--(void)formatAndUpdateCharactersFromTextField:(UITextField *)textField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath {
+-(void)formatAndUpdateCharactersFromTextField:(UITextField *)textField cursorPosition:(NSInteger *)position indexPath:(NSIndexPath *)indexPath trimSet:(NSMutableCharacterSet *)trimSet {
     ICFormRowTextField *row = (ICFormRowTextField *)self.formRows[indexPath.row];
-    NSMutableCharacterSet *trimSet = [NSMutableCharacterSet characterSetWithCharactersInString:@" /-_"];
+
     NSString *formattedString = [[self.inputData maskedValueForField:row.paymentProductField.identifier cursorPosition:position] stringByTrimmingCharactersInSet: trimSet];
     row.field.text = formattedString;
     textField.text = formattedString;
@@ -711,7 +711,7 @@ - (BOOL)standardTextField:(ICTextField *)textField shouldChangeCharactersInRange
     [self.inputData setValue:newString forField:row.paymentProductField.identifier];
     row.field.text = [self.inputData maskedValueForField:row.paymentProductField.identifier];
     NSInteger cursorPosition = range.location + string.length;
-    [self formatAndUpdateCharactersFromTextField:textField cursorPosition:&cursorPosition indexPath:indexPath];
+    [self formatAndUpdateCharactersFromTextField:textField cursorPosition:&cursorPosition indexPath:indexPath trimSet: [NSMutableCharacterSet characterSetWithCharactersInString:@" /-_"]];
     return NO;
 }
 

diff --git a/IngenicoConnectExample/ICStartViewController.m b/IngenicoConnectExample/ICStartViewController.m
@@ -229,7 +229,7 @@ - (void)viewDidLoad
     self.currencyCodePicker.delegate = self;
     NSInteger currency = [[NSUserDefaults standardUserDefaults] integerForKey:kICCurrency];
     if (currency == 0) {
-        [self.currencyCodePicker selectRow:42 inComponent:0 animated:NO];
+        [self.currencyCodePicker selectRow:43 inComponent:0 animated:NO];
     }
     else {
         [self.currencyCodePicker selectRow:currency inComponent:0 animated:NO];