@regulaforensics/react-native-document-reader-api 7.1.0 → 7.2.0

package/ios/RGLWConfig.m

@@ -53,8 +53,8 @@
         functionality.orientation = [self interfaceOrientationMaskWithNumber:[options valueForKey:@"orientation"]];
     if([options valueForKey:@"captureMode"] != nil)
         functionality.captureMode = [[options valueForKey:@"captureMode"] integerValue];
-    if([options valueForKey:@"cameraPosition"] != nil)
-        functionality.cameraPosition = [self captureDevicePositionWithNumber:[options valueForKey:@"cameraPosition"]];
+    if(options[@"cameraPositionIOS"])
+        functionality.cameraPosition = [options[@"cameraPositionIOS"] integerValue];
     
     // String
     if([options valueForKey:@"cameraFrame"] != nil)
@@ -105,7 +105,7 @@
     result[@"forcePagesCount"] = functionality.forcePagesCount;
     result[@"orientation"] = [self generateInterfaceOrientationMask:functionality.orientation];
     result[@"captureMode"] = [NSNumber numberWithInteger:functionality.captureMode];
-    result[@"cameraPosition"] = [self generateCaptureDevicePosition:functionality.cameraPosition];
+    result[@"cameraPositionIOS"] = @(functionality.cameraPosition);
     
     // String
     result[@"cameraFrame"] = [self generateDocReaderFrame:functionality.cameraFrame];
@@ -641,6 +641,8 @@
         rfidScenario.applyAmendments = [[options valueForKey:@"applyAmendments"] boolValue];
     if([options valueForKey:@"autoSettings"] != nil)
         rfidScenario.autoSettings = [[options valueForKey:@"autoSettings"] boolValue];
+    if([options valueForKey:@"proceedReadingAlways"] != nil)
+        rfidScenario.proceedReadingAlways = [[options valueForKey:@"proceedReadingAlways"] boolValue];
     
     // Int
     if([options valueForKey:@"signManagementAction"] != nil)
@@ -722,6 +724,7 @@
     result[@"authorizedInstallQCert"] = [NSNumber numberWithBool:rfidScenario.authorizedInstallQCert];
     result[@"applyAmendments"] = [NSNumber numberWithBool:rfidScenario.applyAmendments];
     result[@"autoSettings"] = [NSNumber numberWithBool:rfidScenario.autoSettings];
+    result[@"proceedReadingAlways"] = [NSNumber numberWithBool:rfidScenario.proceedReadingAlways];
     
     // Int
     result[@"signManagementAction"] = [NSNumber numberWithInteger:rfidScenario.signManagementAction];
@@ -861,10 +864,9 @@
         result.colornessCheck = [input valueForKey:@"colornessCheck"];
     if([input valueForKey:@"screenCapture"] != nil)
         result.screenCapture = [input valueForKey:@"screenCapture"];
-    if([input valueForKey:@"expectedPass"] != nil){
-        NSMutableArray<RGLImageQualityCheckType> *expectedPass = [NSMutableArray new];
-        for(NSString* str in [input valueForKey:@"expectedPass"])
-            [expectedPass addObject:str];
+    if (input[@"expectedPass"]) {
+        NSMutableArray<RGLImageQualityCheckType>* expectedPass = @[].mutableCopy;
+        for(NSNumber* item in input[@"expectedPass"]) [expectedPass addObject:[self imageQualityCheckTypeWithNumber:item]];
         result.expectedPass = expectedPass;
     }
     if([input valueForKey:@"documentPositionIndent"] != nil)
@@ -884,7 +886,11 @@
     result[@"glaresCheck"] = input.glaresCheck;
     result[@"colornessCheck"] = input.colornessCheck;
     result[@"screenCapture"] = input.screenCapture;
-    result[@"expectedPass"] = input.expectedPass;
+    if (input.expectedPass) {
+        NSMutableArray<NSNumber*>* expectedPass = @[].mutableCopy;
+        for(RGLImageQualityCheckType item in input.expectedPass) [expectedPass addObject:[self generateImageQualityCheckType:item]];
+        result[@"expectedPass"] = expectedPass;
+    }
     result[@"documentPositionIndent"] = input.documentPositionIndent;
     result[@"glaresCheckParams"] = [RGLWJSONConstructor generateGlaresCheckParams:input.glaresCheckParams];
     result[@"brightnessThreshold"] = input.brightnessThreshold;
@@ -1172,39 +1178,20 @@
 
 +(UIInterfaceOrientationMask)interfaceOrientationMaskWithNumber:(NSNumber*)value {
     int input = [value intValue];
-    if(input == 0) return UIInterfaceOrientationMaskPortrait;
-    if(input == 1) return UIInterfaceOrientationMaskLandscapeLeft;
-    if(input == 2) return UIInterfaceOrientationMaskLandscapeRight;
-    if(input == 3) return UIInterfaceOrientationMaskPortraitUpsideDown;
-    if(input == 4) return UIInterfaceOrientationMaskLandscape;
-    if(input == 5) return UIInterfaceOrientationMaskAll;
-    if(input == 6) return UIInterfaceOrientationMaskAllButUpsideDown;
+    if(input == 0) return UIInterfaceOrientationMaskAll;
+    if(input == 1) return UIInterfaceOrientationMaskPortrait;
+    if(input == 2) return UIInterfaceOrientationMaskLandscape;
+    if(input == 3) return UIInterfaceOrientationMaskLandscapeLeft;
+    if(input == 4) return UIInterfaceOrientationMaskLandscapeRight;
     return UIInterfaceOrientationMaskPortrait;
 }
 
 +(NSNumber*)generateInterfaceOrientationMask:(UIInterfaceOrientationMask)value {
-    if(value == UIInterfaceOrientationMaskPortrait) return @0;
-    if(value == UIInterfaceOrientationMaskLandscapeLeft) return @1;
-    if(value == UIInterfaceOrientationMaskLandscapeRight) return @2;
-    if(value == UIInterfaceOrientationMaskPortraitUpsideDown) return @3;
-    if(value == UIInterfaceOrientationMaskLandscape) return @4;
-    if(value == UIInterfaceOrientationMaskAll) return @5;
-    if(value == UIInterfaceOrientationMaskAllButUpsideDown) return @6;
-    return @0;
-}
-
-+(AVCaptureDevicePosition)captureDevicePositionWithNumber:(NSNumber*)value {
-    int input = [value intValue];
-    if(input == 0) return AVCaptureDevicePositionUnspecified;
-    if(input == 1) return AVCaptureDevicePositionBack;
-    if(input == 2) return AVCaptureDevicePositionFront;
-    return AVCaptureDevicePositionUnspecified;
-}
-
-+(NSNumber*)generateCaptureDevicePosition:(AVCaptureDevicePosition)value {
-    if(value == AVCaptureDevicePositionUnspecified) return @0;
-    if(value == AVCaptureDevicePositionBack) return @1;
-    if(value == AVCaptureDevicePositionFront) return @2;
+    if(value == UIInterfaceOrientationMaskAll) return @0;
+    if(value == UIInterfaceOrientationMaskPortrait) return @1;
+    if(value == UIInterfaceOrientationMaskLandscape) return @2;
+    if(value == UIInterfaceOrientationMaskLandscapeLeft) return @3;
+    if(value == UIInterfaceOrientationMaskLandscapeRight) return @4;
     return @0;
 }
 

package/ios/RGLWJSONConstructor.m

@@ -170,18 +170,17 @@
 }
 
 +(RGLScannerConfig*)scannerConfigFromJson:(NSDictionary*)input {
-    if([input valueForKey:@"scenario"] == nil && [input valueForKey:@"onlineProcessingConfig"] == nil) return nil;
-    RGLScannerConfig *config = [RGLScannerConfig new];
-
-    if([input valueForKey:@"scenario"] != nil)
-        config.scenario = [input valueForKey:@"scenario"];
-    if([input valueForKey:@"onlineProcessingConfig"] != nil)
-        config.onlineProcessingConfig = [self onlineProcessingConfigFromJson:[input valueForKey:@"onlineProcessingConfig"]];
-    if([input valueForKey:@"livePortrait"] != nil)
-        config.livePortrait = [self imageWithBase64:[input valueForKey:@"livePortrait"]];
-    if([input valueForKey:@"extPortrait"] != nil)
-        config.extPortrait = [self imageWithBase64:[input valueForKey:@"extPortrait"]];
-
+    RGLScannerConfig *config = [RGLScannerConfig alloc];
+    if (input[@"scenario"]) config = [config initWithScenario:input[@"scenario"]];
+    else config = [config initWithOnlineProcessingConfig:[self onlineProcessingConfigFromJson:input[@"onlineProcessingConfig"]]];
+    
+    if(input[@"onlineProcessingConfig"])
+        config.onlineProcessingConfig = [self onlineProcessingConfigFromJson:input[@"onlineProcessingConfig"]];
+    if(input[@"livePortrait"])
+        config.livePortrait = [self imageWithBase64:input[@"livePortrait"]];
+    if(input[@"extPortrait"])
+        config.extPortrait = [self imageWithBase64:input[@"extPortrait"]];
+    
     return config;
 }
 
@@ -198,37 +197,29 @@
 }
 
 +(RGLRecognizeConfig*)recognizeConfigFromJson:(NSDictionary*)input {
-    if([input valueForKey:@"scenario"] == nil && [input valueForKey:@"onlineProcessingConfig"] == nil) return nil;
-    if([input valueForKey:@"image"] == nil && [input valueForKey:@"data"] == nil && [input valueForKey:@"images"] == nil && [input valueForKey:@"imageInputs"] == nil) return nil;
     RGLRecognizeConfig *config = [RGLRecognizeConfig alloc];
+    if (input[@"scenario"]) config = [config initWithScenario:input[@"scenario"]];
+    else config = [config initWithOnlineProcessingConfig:[self onlineProcessingConfigFromJson:input[@"onlineProcessingConfig"]]];
 
-    if([input valueForKey:@"image"] != nil)
-        config = [config initWithImage:[RGLWJSONConstructor imageWithBase64:[input valueForKey:@"image"]]];
-    if([input valueForKey:@"data"] != nil)
-        config = [config initWithImageData:[RGLWJSONConstructor base64Decode:[input valueForKey:@"data"]]];
-    if([input valueForKey:@"images"] != nil) {
+    if (input[@"image"]) config.image = [RGLWJSONConstructor imageWithBase64:input[@"image"]];
+    if (input[@"data"]) config.imageData = [RGLWJSONConstructor base64Decode:input[@"data"]];
+    if (input[@"images"]) {
         NSMutableArray<UIImage*>* images = [NSMutableArray new];
-        for(NSString* base64 in [input valueForKey:@"images"])
+        for(NSString* base64 in input[@"images"])
             [images addObject:[RGLWJSONConstructor imageWithBase64:base64]];
-        config = [config initWithImages:images];
-    }
-    if([input valueForKey:@"imageInputData"] != nil) {
-        NSMutableArray<RGLImageInput*>* images = [NSMutableArray new];
-        for(NSDictionary* image in [input valueForKey:@"imageInputData"])
-            [images addObject:[RGLWJSONConstructor imageInputFromJson: image]];
-        config = [config initWithImageInputs:images];
-    }
-
-    if([input valueForKey:@"scenario"] != nil)
-        config.scenario = [input valueForKey:@"scenario"];
-    if([input valueForKey:@"onlineProcessingConfig"] != nil)
-        config.onlineProcessingConfig = [self onlineProcessingConfigFromJson:[input valueForKey:@"onlineProcessingConfig"]];
-    if([input valueForKey:@"livePortrait"] != nil)
-        config.livePortrait = [self imageWithBase64:[input valueForKey:@"livePortrait"]];
-    if([input valueForKey:@"extPortrait"] != nil)
-        config.extPortrait = [self imageWithBase64:[input valueForKey:@"extPortrait"]];
-    if([input valueForKey:@"oneShotIdentification"] != nil)
-        config.oneShotIdentification = [input valueForKey:@"oneShotIdentification"];
+        config.images = images;
+    }
+    if(input[@"imageInputData"]) {
+        NSMutableArray<RGLImageInput*>* imageInputs = [NSMutableArray new];
+        for(NSDictionary* imageInput in input[@"imageInputData"])
+            [imageInputs addObject:[RGLWJSONConstructor imageInputFromJson: imageInput]];
+        config.imageInputs = imageInputs;
+    }
+
+    if (input[@"scenario"]) config.scenario = input[@"scenario"];
+    if (input[@"livePortrait"]) config.livePortrait = [self imageWithBase64:input[@"livePortrait"]];
+    if (input[@"extPortrait"]) config.extPortrait = [self imageWithBase64:input[@"extPortrait"]];
+    if (input[@"oneShotIdentification"])  config.oneShotIdentification = input[@"oneShotIdentification"];
 
     return config;
 }

package/ios/RNRegulaDocumentReader.h

@@ -9,11 +9,11 @@ typedef void (^RGLWEventSender)(NSString* _Nonnull event, id _Nullable data);
 typedef void (^RGLWRFIDSignatureCallback)(NSData * _Nonnull signature);
 
 @interface RNRegulaDocumentReader : RCTEventEmitter <RCTBridgeModule,
-                                                        RGLRecordScanningProcessDelegate,
-                                                        RGLDocReaderRFIDDelegate,
-                                                        RGLCustomizationActionDelegate>
+                                                     RGLRecordScanningProcessDelegate,
+                                                     RGLDocReaderRFIDDelegate,
+                                                     RGLCustomizationActionDelegate,
+                                                     RGLDocReaderDatabaseFetchDelegate>
 
-@property (class) NSNumber* _Nullable databasePercentageDownloaded;
 @property NSNumber* _Nonnull doRequestPACertificates;
 @property NSNumber* _Nonnull doRequestTACertificates;
 @property NSNumber* _Nonnull doRequestTASignature;

package/ios/RNRegulaDocumentReader.m

@@ -77,8 +77,6 @@ RCT_EXPORT_METHOD(exec:(NSString*)moduleName:(NSString*)action:(NSArray*)args:(R
         [self resetConfiguration :successCallback :errorCallback];
     else if([action isEqualToString:@"initializeReader"])
         [self initializeReader :[args objectAtIndex:0] :successCallback :errorCallback];
-    else if([action isEqualToString:@"initializeReaderAutomatically"])
-        [self initializeReaderAutomatically :successCallback :errorCallback];
     else if([action isEqualToString:@"initializeReaderWithBleDeviceConfig"])
         [self initializeReaderWithBleDeviceConfig :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"deinitializeReader"])
@@ -169,18 +167,14 @@ RCT_EXPORT_METHOD(exec:(NSString*)moduleName:(NSString*)action:(NSArray*)args:(R
         [self containers :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"encryptedContainers"])
         [self encryptedContainers :[args objectAtIndex:0] :successCallback :errorCallback];
-    else if([action isEqualToString:@"getTranslation"])
-        [self getTranslation :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"finalizePackage"])
         [self finalizePackage :successCallback :errorCallback];
+    else if([action isEqualToString:@"getTranslation"])
+        [self getTranslation :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else
         errorCallback([NSString stringWithFormat:@"%@/%@", @"method not implemented: ", action]);
 }
 
-static NSNumber * _databasePercentageDownloaded;
-+ (NSNumber*)databasePercentageDownloaded{ return _databasePercentageDownloaded; }
-+ (void)setDatabasePercentageDownloaded:(NSNumber *)value { _databasePercentageDownloaded = value; }
-
 NSString* RGLWCompletionEvent = @"completion";
 NSString* RGLWDatabaseProgressEvent = @"database_progress";
 
@@ -271,20 +265,12 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     RGLDocReader.shared.processParams = [RGLProcessParams new];
     RGLDocReader.shared.customization = [RGLCustomization new];
     RGLDocReader.shared.rfidScenario = [RGLRFIDScenario new];
-    RGLDocReader.shared.functionality.recordScanningProcessDelegate = self;
-    RGLDocReader.shared.customization.actionDelegate = self;
 }
 
 - (void) initializeReader:(NSDictionary*)config :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
     [RGLDocReader.shared initializeReaderWithConfig:[RGLWJSONConstructor configFromJson:config] completion:[self getInitCompletion :successCallback :errorCallback]];
 }
 
-- (void) initializeReaderAutomatically:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
-    NSString *dataPath = [[NSBundle mainBundle] pathForResource:@"regula.license" ofType:nil];
-    NSData *licenseData = [NSData dataWithContentsOfFile:dataPath];
-    [RGLDocReader.shared initializeReaderWithConfig:[RGLConfig configWithLicenseData:licenseData] completion:[self getInitCompletion :successCallback :errorCallback]];
-}
-
 - (void) initializeReaderWithBleDeviceConfig:(NSDictionary*)config :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
     errorCallback(@"initializeReaderWithBleDeviceConfig() is an android-only method");
 }
@@ -295,7 +281,7 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 }
 
 - (void) prepareDatabase:(NSString*)databaseID :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
-    [RGLDocReader.shared prepareDatabase:databaseID progressHandler:[self getProgressHandler] completion:[self getPrepareCompletion :successCallback :errorCallback]];
+    [RGLDocReader.shared prepareDatabase:databaseID progressHandler:nil completion:[self getPrepareCompletion :successCallback :errorCallback]];
 }
 
 - (void) removeDatabase:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
@@ -305,7 +291,7 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 }
 
 -(void) runAutoUpdate:(NSString*)databaseID :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
-    [RGLDocReader.shared runAutoUpdate:databaseID progressHandler:[self getProgressHandler] completion:[self getPrepareCompletion :successCallback :errorCallback]];
+    [RGLDocReader.shared runAutoUpdate:databaseID progressHandler:nil completion:[self getPrepareCompletion :successCallback :errorCallback]];
 }
 
 - (void) cancelDBUpdate:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
@@ -599,20 +585,12 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 }
 
 -(RGLDocumentReaderPrepareCompletion _Nonnull)getPrepareCompletion:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
+    RGLDocReader.shared.databaseFetchDelegate = self;
     return ^(BOOL success, NSError * _Nullable error) {
         successCallback([RGLWJSONConstructor generateSuccessCompletion:success :error]);
     };
 }
 
--(void (^_Nullable)(NSProgress * _Nonnull progress))getProgressHandler {
-    return ^(NSProgress * _Nonnull progress) {
-        if(RNRegulaDocumentReader.databasePercentageDownloaded != [NSNumber numberWithDouble:progress.fractionCompleted * 100]){
-            sendEvent(RGLWDatabaseProgressEvent, [NSNumber numberWithInt:(int)(progress.fractionCompleted * 100)]);
-            [RNRegulaDocumentReader setDatabasePercentageDownloaded:[NSNumber numberWithDouble:progress.fractionCompleted * 100]];
-        }
-    };
-}
-
 -(RGLDocumentReaderInitializationCompletion)getInitCompletion:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
     return ^(BOOL success, NSError * _Nullable error ) {
         if (success) {
@@ -624,9 +602,24 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     };
 }
 
+// RGLDocReaderDatabaseFetchDelegate
+- (void)onProgressChanged:(NSNumber *)downloadedBytes totalBytes:(NSNumber *)totalBytes {
+    int progress = 0;
+    if (downloadedBytes > 0 && totalBytes > 0) {
+        double percent = [downloadedBytes doubleValue] / [totalBytes doubleValue];
+        progress = (int) (percent * 100);
+    }
+    NSDictionary* result = @{
+        @"downloadedBytes":downloadedBytes,
+        @"totalBytes":totalBytes,
+        @"progress":@(progress)
+    };
+    sendEvent(RGLWDatabaseProgressEvent, [RGLWJSONConstructor dictToString: result]);
+}
+
 // RGLCustomizationActionDelegate
 - (void)onCustomButtonTappedWithTag:(NSInteger)tag {
-    sendEvent(RGLWOnCustomButtonTappedEvent, [NSNumber numberWithInteger:tag]);
+    sendEvent(RGLWOnCustomButtonTappedEvent, @(tag));
 }
 
 // RGLRecordScanningProcessDelegate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/react-native-document-reader-api",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "React Native module for reading and validation of identification documents (API framework)",
   "main": "index.js",
   "scripts": {