@regulaforensics/document-reader 9.2.555-nightly → 9.2.556-beta

package/examples/ionic/package.json

@@ -18,7 +18,7 @@
     "@ionic/cordova-builders": "^12.3.0",
     "@awesome-cordova-plugins/camera": "^8.1.0",
     "@awesome-cordova-plugins/file": "^8.1.0",
-    "@regulaforensics/document-reader": "9.2.555-nightly",
+    "@regulaforensics/document-reader": "9.2.556-beta",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.1.1281",
     "@regulaforensics/document-reader-btdevice": "9.1.35",
     "cordova-android": "^14.0.1",

package/examples/react_native/package.json

@@ -8,7 +8,7 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/document-reader": "9.2.555-nightly",
+    "@regulaforensics/document-reader": "9.2.556-beta",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.1.1281",
     "@regulaforensics/document-reader-btdevice": "9.1.35",
     "react-native": "^0.81.4",

package/ios/RGLWJSONConstructor.m

@@ -2408,7 +2408,10 @@ static NSMutableArray* weakReferencesHolder;
 +(RGLNameSpaceMDL*)nameSpaceMDLFromJson:(NSDictionary*)input {
     RGLNameSpaceMDL* result = [[RGLNameSpaceMDL alloc] initWithName:input[@"name"]];
     
-    [result setValue:input[@"map"] forKey:@"jsonDict"];
+    NSDictionary* map = input[@"map"];
+    for (NSString* key in map) {
+        [result addField:key intentToRetain:[map[key] integerValue]];
+    }
 
     return result;
     
@@ -2562,8 +2565,8 @@ static NSMutableArray* weakReferencesHolder;
 +(RGLDataRetrieval*)dataRetrievalFromJson:(NSDictionary*)input {
     RGLDataRetrieval* result = [[RGLDataRetrieval alloc] initWithDeviceRetrieval:[input[@"deviceRetrieval"] integerValue]];
     
-    [result setValue:input[@"docRequestPreset"] forKey:@"docRequestPreset"];
-    [result setValue:input[@"intentToRetain"] forKey:@"intentToRetain"];
+    if (input[@"docRequestPreset"])
+        [result setDocRequestPreset:[input[@"docRequestPreset"] integerValue] intentToRetain:[input[@"intentToRetain"] integerValue]];
     
     NSMutableArray<RGLDocumentRequestMDL*>* requests = [NSMutableArray new];
     for(NSDictionary* item in [input valueForKey:@"requests"]){
@@ -2572,7 +2575,6 @@ static NSMutableArray* weakReferencesHolder;
     result.requests = requests;
     
     return result;
-    
 }
 
 +(NSDictionary*)generateDataRetrieval:(RGLDataRetrieval*)input {

package/ios/RGLWMain.m

@@ -36,7 +36,7 @@
         @"runAutoUpdate": ^{ [self runAutoUpdate :args[0] :callback]; },
         @"cancelDBUpdate": ^{ [self cancelDBUpdate :callback]; },
         @"checkDatabaseUpdate": ^{ [self checkDatabaseUpdate :args[0] :callback]; },
-        @"scan": ^{ [self scan :args[0]]; },
+        @"scan": ^{ [self startScanner :args[0]]; },
         @"startScanner": ^{ [self startScanner :args[0]]; },
         @"recognize": ^{ [self recognize :args[0]]; },
         @"startNewPage": ^{ [self startNewPage]; },
@@ -226,20 +226,8 @@ static NSDictionary* headers;
     }];
 }
 
-+(void)scan:(NSDictionary*)config {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
-        #pragma clang diagnostic pop
-        [RGLDocReader.shared showScannerFromPresenter:RGLWRootViewController() config:[RGLWJSONConstructor scannerConfigFromJson:config] completion:[self completion]];
-    });
-}
-
 +(void)startScanner:(NSDictionary*)config {
     dispatch_async(dispatch_get_main_queue(), ^{
-        #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
-        #pragma clang diagnostic pop
         [RGLDocReader.shared startScannerFromPresenter:RGLWRootViewController() config:[RGLWJSONConstructor scannerConfigFromJson:config] completion:[self completion]];
     });
 }
@@ -365,21 +353,27 @@ RGLWCallback savedCallbackForBluetoothResult;
 }
 
 +(void)startReadMDl:(NSNumber*)type :(NSDictionary*)dataRetrieval :(RGLWCallback)callback {
-    [RGLDocReader.shared startReadMDLFromPresenter:RGLWRootViewController() engagementType:[type integerValue] dataRetrieval:[RGLWJSONConstructor dataRetrievalFromJson:dataRetrieval] completion:^(RGLDocReaderAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error) {
-        callback([RGLWJSONConstructor generateCompletion:[RGLWConfig generateDocReaderAction: action] :results :error]);
-    }];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [RGLDocReader.shared startReadMDLFromPresenter:RGLWRootViewController() engagementType:[type integerValue] dataRetrieval:[RGLWJSONConstructor dataRetrievalFromJson:dataRetrieval] completion:^(RGLDocReaderAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error) {
+            callback([RGLWJSONConstructor generateCompletion:[RGLWConfig generateDocReaderAction: action] :results :error]);
+        }];
+    });
 }
 
 +(void)startEngageDevice:(NSNumber*)type :(RGLWCallback)callback {
-    [RGLDocReader.shared startEngageDeviceFromPresenter:RGLWRootViewController() type:[type integerValue] completion:^(RGLDeviceEngagement* deviceEngagement, NSError* error) {
-        callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
-    }];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [RGLDocReader.shared startEngageDeviceFromPresenter:RGLWRootViewController() type:[type integerValue] completion:^(RGLDeviceEngagement* deviceEngagement, NSError* error) {
+            callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
+        }];
+    });
 }
 
 +(void)engageDeviceNFC:(RGLWCallback)callback {
-    [RGLDocReader.shared engageDeviceNFC:RGLWRootViewController() completion:^(RGLDeviceEngagement * _Nullable deviceEngagement, NSError * _Nullable error) {
-        callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
-    }];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [RGLDocReader.shared engageDeviceNFC:RGLWRootViewController() completion:^(RGLDeviceEngagement * _Nullable deviceEngagement, NSError * _Nullable error) {
+            callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
+        }];
+    });
 }
 
 +(void)engageDeviceData:(NSString*)data :(RGLWCallback)callback {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/document-reader",
-  "version": "9.2.555-nightly",
+  "version": "9.2.556-beta",
   "description": "This is an npm module for Regula Document Reader SDK. It allows you to read various kinds of identification documents using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/document-reader" version="9.2.555-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/document-reader" version="9.2.556-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReader</name>
   <description>Cordova plugin for Regula Document Reader SDK</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git" />
       </config>
       <pods>
-        <pod name="DocumentReaderNightly" spec="9.2.5819" />
+        <pod name="DocumentReader" spec="9.1.5702" />
       </pods>
     </podspec>
   </platform>

package/test/json.tsx

@@ -979,8 +979,8 @@ export var documentRequest18013MDL = {
   "signatureUsualMark": 0,
 };
 export var dataRetrieval = {
+  "docRequestPreset": 0,
+  "intentToRetain": 1,
   "deviceRetrieval": 2,
-  "docRequestPreset": 1,
-  "intentToRetain": 0,
   "requests": [documentRequestMDL, documentRequest18013MDL],
 };

package/test/package-lock.json

@@ -13,7 +13,7 @@
     },
     "..": {
       "name": "@regulaforensics/document-reader",
-      "version": "9.2.555-nightly",
+      "version": "9.2.556-beta",
       "dev": true,
       "license": "commercial"
     },

package/www/capacitor/index.js

@@ -134,11 +134,11 @@ import { TAChallenge } from './rfid/TAChallenge';
 import { PKDCertificate, PKDResourceType } from './rfid/PKDCertificate';
 export { PAResourcesIssuer, RFIDErrorCodes, TccParams, RFIDNotification, RFIDNotificationCodes, PAAttribute, TAChallenge, PKDCertificate, PKDResourceType };
 
-import { DataRetrieval, MDLDocRequestPreset, MDLDeviceRetrieval } from './engagement/DataRetrieval';
-import { DeviceEngagement, MDLDeviceEngagement } from './engagement/DeviceEngagement';
-import { NameSpaceMDL, MDLIntentToRetain } from './engagement/NameSpaceMDL';
-import { DocumentRequestMDL, DocumentRequest18013MDL } from './engagement/DocumentRequestMDL';
-import { DeviceRetrievalMethod } from './engagement/DeviceRetrievalMethod';
+import { DataRetrieval, MDLDocRequestPreset, MDLDeviceRetrieval } from './mdl/DataRetrieval';
+import { DeviceEngagement, MDLDeviceEngagement } from './mdl/DeviceEngagement';
+import { NameSpaceMDL, MDLIntentToRetain } from './mdl/NameSpaceMDL';
+import { DocumentRequestMDL, DocumentRequest18013MDL } from './mdl/DocumentRequestMDL';
+import { DeviceRetrievalMethod } from './mdl/DeviceRetrievalMethod';
 export { DataRetrieval, MDLDocRequestPreset, MDLDeviceRetrieval, DeviceEngagement, MDLDeviceEngagement, DeviceRetrievalMethod, DocumentRequest18013MDL, MDLIntentToRetain, NameSpaceMDL, DocumentRequestMDL };
 
 export class DocumentReader {