@regulaforensics/cordova-plugin-document-reader-api 7.5.649-nightly → 7.5.651-nightly

package/src/android/Utils.kt

@@ -1,5 +1,5 @@
 //
-//  Utils.java
+//  Utils.kt
 //  DocumentReader
 //
 //  Created by Pavel Masiuk on 21.09.2023.
@@ -225,7 +225,12 @@ fun CustomizationFont.setFont(editor: ParamsCustomization.CustomizationEditor, v
 }
 
 internal object Convert {
-    fun byteArrayFromBase64(base64: String?) = base64?.let { Base64.decode(it, Base64.NO_WRAP) }
+    fun byteArrayFromBase64(base64: String?): ByteArray? {
+        var str = base64 ?: return null
+        if (str.startsWith("data")) str = str.substring(str.indexOf(",") + 1)
+        return Base64.decode(str, Base64.NO_WRAP)
+    }
+
     fun generateByteArray(array: ByteArray?) = array?.let { Base64.encodeToString(it, Base64.NO_WRAP) }
 
     fun bitmapFromBase64(base64: String?) = base64?.let {

package/src/android/build.gradle

@@ -1,5 +1,3 @@
-apply plugin: 'kotlin-android'
-
 android {
     compileSdk 34
 
@@ -16,7 +14,7 @@ repositories {
 
 dependencies {
     //noinspection GradleDependency
-	implementation ('com.regula.documentreader:api:7.5.10333'){
+	implementation ('com.regula.documentreader:api:7.5.10343'){
         transitive = true
     }
 }

package/src/ios/RGLWConfig.m

@@ -173,6 +173,7 @@
         processParams.disablePerforationOCR = [options valueForKey:@"disablePerforationOCR"];
     if([options valueForKey:@"respectImageQuality"] != nil)
         processParams.respectImageQuality = [options valueForKey:@"respectImageQuality"];
+    if (options[@"strictImageQuality"]) processParams.strictImageQuality = options[@"strictImageQuality"];
     if([options valueForKey:@"splitNames"] != nil)
         processParams.splitNames = [options valueForKey:@"splitNames"];
     if([options valueForKey:@"doDetectCan"] != nil)
@@ -184,6 +185,9 @@
     if([options valueForKey:@"checkHologram"] != nil)
         processParams.checkHologram = [options valueForKey:@"checkHologram"];
     if (options[@"generateNumericCodes"]) processParams.generateNumericCodes = options[@"generateNumericCodes"];
+    if (options[@"strictBarcodeDigitalSignatureCheck"]) processParams.strictBarcodeDigitalSignatureCheck = options[@"strictBarcodeDigitalSignatureCheck"];
+    if (options[@"selectLongestNames"]) processParams.selectLongestNames = options[@"selectLongestNames"];
+    if (options[@"generateDTCVC"]) processParams.generateDTCVC = options[@"generateDTCVC"];
 
     // Int
     if([options valueForKey:@"measureSystem"] != nil)
@@ -301,12 +305,16 @@
     result[@"shouldReturnPackageForReprocess"] = processParams.shouldReturnPackageForReprocess;
     result[@"disablePerforationOCR"] = processParams.disablePerforationOCR;
     result[@"respectImageQuality"] = processParams.respectImageQuality;
+    result[@"strictImageQuality"] = processParams.strictImageQuality;
     result[@"splitNames"] = processParams.splitNames;
     result[@"doDetectCan"] = processParams.doDetectCan;
     result[@"useFaceApi"] = processParams.useFaceApi;
     result[@"useAuthenticityCheck"] = processParams.useAuthenticityCheck;
     result[@"checkHologram"] = processParams.checkHologram;
     result[@"generateNumericCodes"] = processParams.generateNumericCodes;
+    result[@"strictBarcodeDigitalSignatureCheck"] = processParams.strictBarcodeDigitalSignatureCheck;
+    result[@"selectLongestNames"] = processParams.selectLongestNames;
+    result[@"generateDTCVC"] = processParams.generateDTCVC;
     
     // Int
     result[@"measureSystem"] = [NSNumber numberWithInteger:processParams.measureSystem];
@@ -383,6 +391,8 @@
         customization.cameraFrameShapeType = [[options valueForKey:@"cameraFrameShapeType"] integerValue];
     if([options valueForKey:@"cameraFrameOffsetWidth"] != nil)
         customization.cameraFrameOffsetWidth = [[options valueForKey:@"cameraFrameOffsetWidth"] floatValue];
+    if(options[@"nextPageAnimationStartDelay"]) customization.nextPageAnimationStartDelay = [options[@"nextPageAnimationStartDelay"] floatValue];
+    if(options[@"nextPageAnimationEndDelay"]) customization.nextPageAnimationEndDelay = [options[@"nextPageAnimationEndDelay"] floatValue];
     
     // String
     if([options valueForKey:@"status"] != nil)
@@ -411,6 +421,8 @@
         customization.statusBackgroundColor = [self colorWithInt:[options valueForKey:@"statusBackgroundColor"]];
     if([options valueForKey:@"cameraPreviewBackgroundColor"] != nil)
         customization.cameraPreviewBackgroundColor = [self colorWithInt:[options valueForKey:@"cameraPreviewBackgroundColor"]];
+    if([options valueForKey:@"backgroundMaskColor"] != nil)
+        customization.backgroundMaskColor = [self colorWithInt:[options valueForKey:@"backgroundMaskColor"]];
     
     // Float
     if([options valueForKey:@"statusPositionMultiplier"] != nil)
@@ -509,6 +521,8 @@
     result[@"cameraFrameLineLength"] = [NSNumber numberWithFloat:customization.cameraFrameLineLength];
     result[@"cameraFrameShapeType"] = [NSNumber numberWithFloat:customization.cameraFrameShapeType];
     result[@"cameraFrameOffsetWidth"] = [NSNumber numberWithFloat:customization.cameraFrameOffsetWidth];
+    result[@"nextPageAnimationStartDelay"] = [NSNumber numberWithFloat:customization.nextPageAnimationStartDelay];
+    result[@"nextPageAnimationEndDelay"] = [NSNumber numberWithFloat:customization.nextPageAnimationEndDelay];
     
     // String
     result[@"status"] = customization.status;
@@ -525,6 +539,7 @@
     result[@"activityIndicatorColor"] = [self intWithColor:customization.activityIndicatorColor];
     result[@"statusBackgroundColor"] = [self intWithColor:customization.statusBackgroundColor];
     result[@"cameraPreviewBackgroundColor"] = [self intWithColor:customization.cameraPreviewBackgroundColor];
+    result[@"backgroundMaskColor"] = [self intWithColor:customization.backgroundMaskColor];
     
     // Float
     result[@"statusPositionMultiplier"] = [NSNumber numberWithFloat:customization.statusPositionMultiplier];
@@ -645,6 +660,8 @@
         rfidScenario.autoSettings = [[options valueForKey:@"autoSettings"] boolValue];
     if([options valueForKey:@"proceedReadingAlways"] != nil)
         rfidScenario.proceedReadingAlways = [[options valueForKey:@"proceedReadingAlways"] boolValue];
+    if(options[@"readDTC"]) rfidScenario.readDTC = [options[@"readDTC"] boolValue];
+    if(options[@"mrzStrictCheck"]) rfidScenario.mrzStrictCheck = options[@"mrzStrictCheck"];
     
     // Int
     if([options valueForKey:@"signManagementAction"] != nil)
@@ -679,6 +696,7 @@
         rfidScenario.eSignPINDefault = [options valueForKey:@"eSignPINDefault"];
     if([options valueForKey:@"eSignPINNewValue"] != nil)
         rfidScenario.eSignPINNewValue = [options valueForKey:@"eSignPINNewValue"];
+    if(options[@"cardAccess"]) rfidScenario.cardAccess = options[@"cardAccess"];
     
     // DataGroup
     if([options valueForKey:@"ePassportDataGroups"] != nil)
@@ -687,6 +705,7 @@
         [self setDataGroups :rfidScenario.eIDDataGroups dict:[options valueForKey:@"eIDDataGroups"]];
     if([options valueForKey:@"eDLDataGroups"] != nil)
         [self setDataGroups :rfidScenario.eDLDataGroups dict:[options valueForKey:@"eDLDataGroups"]];
+    if(options[@"dtcDataGroups"]) [self setDataGroups :rfidScenario.DTCDataGroups dict:options[@"dtcDataGroups"]];
 }
 
 +(NSDictionary*)getRfidScenario:(RGLRFIDScenario*)rfidScenario {
@@ -727,6 +746,8 @@
     result[@"applyAmendments"] = [NSNumber numberWithBool:rfidScenario.applyAmendments];
     result[@"autoSettings"] = [NSNumber numberWithBool:rfidScenario.autoSettings];
     result[@"proceedReadingAlways"] = [NSNumber numberWithBool:rfidScenario.proceedReadingAlways];
+    result[@"readDTC"] = [NSNumber numberWithBool:rfidScenario.readDTC];
+    result[@"mrzStrictCheck"] = [NSNumber numberWithBool:rfidScenario.mrzStrictCheck];
     
     // Int
     result[@"signManagementAction"] = [NSNumber numberWithInteger:rfidScenario.signManagementAction];
@@ -746,11 +767,13 @@
     result[@"mrz"] = rfidScenario.mrz;
     result[@"eSignPINDefault"] = rfidScenario.eSignPINDefault;
     result[@"eSignPINNewValue"] = rfidScenario.eSignPINNewValue;
+    result[@"cardAccess"] = rfidScenario.cardAccess;
     
     // DataGroup
     result[@"eDLDataGroups"] = [self getDataGroups:rfidScenario.eDLDataGroups];
     result[@"ePassportDataGroups"] = [self getDataGroups:rfidScenario.ePassportDataGroups];
     result[@"eIDDataGroups"] = [self getDataGroups:rfidScenario.eIDDataGroups];
+    result[@"dtcDataGroups"] = [self getDataGroups:rfidScenario.DTCDataGroups];
     
     return result;
 }
@@ -812,6 +835,17 @@
         if([dict valueForKey:@"DG21"] != nil)
             ((RGLeIDDataGroup*)dataGroup).dG21 = [[dict valueForKey:@"DG21"] boolValue];
     }
+    
+    // DTCDataGroups: 1-18 & 22-24
+    if ([dataGroup class] == [RGLDTCDataGroup class]) {
+        if(dict[@"DG15"]) ((RGLDTCDataGroup*)dataGroup).dG15 = [dict[@"DG15"] boolValue];
+        if(dict[@"DG16"]) ((RGLDTCDataGroup*)dataGroup).dG16 = [dict[@"DG16"] boolValue];
+        if(dict[@"DG17"]) ((RGLDTCDataGroup*)dataGroup).dG17 = [dict[@"DG17"] boolValue];
+        if(dict[@"DG18"]) ((RGLDTCDataGroup*)dataGroup).dG18 = [dict[@"DG18"] boolValue];
+        if(dict[@"DG22"]) ((RGLDTCDataGroup*)dataGroup).dG22 = [dict[@"DG22"] boolValue];
+        if(dict[@"DG23"]) ((RGLDTCDataGroup*)dataGroup).dG23 = [dict[@"DG23"] boolValue];
+        if(dict[@"DG24"]) ((RGLDTCDataGroup*)dataGroup).dG24 = [dict[@"DG24"] boolValue];
+    }
 }
 
 +(NSDictionary *)getDataGroups:(RGLDataGroup*)dataGroup {
@@ -850,6 +884,17 @@
         result[@"DG21"] = [NSNumber numberWithBool:((RGLeIDDataGroup*)dataGroup).dG21];
     }
     
+    // DTCDataGroups: 1-18 & 22-24
+    if ([dataGroup class] == [RGLDTCDataGroup class]) {
+        result[@"DG15"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG15];
+        result[@"DG16"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG16];
+        result[@"DG17"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG17];
+        result[@"DG18"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG18];
+        result[@"DG22"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG22];
+        result[@"DG23"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG23];
+        result[@"DG24"] = [NSNumber numberWithBool:((RGLDTCDataGroup*)dataGroup).dG24];
+    }
+    
     return result;
 }
 

package/src/ios/RGLWDocumentReader.h

@@ -2,6 +2,7 @@
 #import <Foundation/Foundation.h>
 #import "RGLWJSONConstructor.h"
 #import "RGLWConfig.h"
+#import <CoreBluetooth/CoreBluetooth.h>
 #import <DocumentReader/DocumentReader.h>
 
 @class DocReader;
@@ -13,7 +14,9 @@ typedef void (^RGLWRFIDSignatureCallback)(NSData * _Nonnull signature);
 @interface RGLWDocumentReader : CDVPlugin<RGLRecordScanningProcessDelegate,
                                           RGLDocReaderRFIDDelegate,
                                           RGLCustomizationActionDelegate,
-                                          RGLDocReaderDatabaseFetchDelegate>
+                                          RGLDocReaderDatabaseFetchDelegate,
+                                          RGLBluetoothDelegate,
+                                          CBCentralManagerDelegate>
 
 @property (class) CDVInvokedUrlCommand* _Nullable command;
 @property NSNumber* _Nonnull doRequestPACertificates;

package/src/ios/RGLWDocumentReader.m

@@ -39,10 +39,6 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self getDocumentReaderIsReady :successCallback :errorCallback];
     else if([action isEqualToString:@"getDocumentReaderStatus"])
         [self getDocumentReaderStatus :successCallback :errorCallback];
-    else if([action isEqualToString:@"isAuthenticatorAvailableForUse"])
-        [self isAuthenticatorAvailableForUse :successCallback :errorCallback];
-    else if([action isEqualToString:@"isBlePermissionsGranted"])
-        [self isBlePermissionsGranted :successCallback :errorCallback];
     else if([action isEqualToString:@"getRfidSessionStatus"])
         [self getRfidSessionStatus :successCallback :errorCallback];
     else if([action isEqualToString:@"setRfidSessionStatus"])
@@ -121,8 +117,8 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self clearPKDCertificates :successCallback :errorCallback];
     else if([action isEqualToString:@"startNewSession"])
         [self startNewSession :successCallback :errorCallback];
-    else if([action isEqualToString:@"startBluetoothService"])
-        [self startBluetoothService :successCallback :errorCallback];
+    else if([action isEqualToString:@"connectBluetoothDevice"])
+        [self connectBluetoothDevice :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setLocalizationDictionary"])
         [self setLocalizationDictionary :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"getLicense"])
@@ -131,6 +127,10 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self getAvailableScenarios :successCallback :errorCallback];
     else if([action isEqualToString:@"getIsRFIDAvailableForUse"])
         [self getIsRFIDAvailableForUse :successCallback :errorCallback];
+    else if([action isEqualToString:@"isAuthenticatorRFIDAvailableForUse"])
+        [self isAuthenticatorRFIDAvailableForUse :successCallback :errorCallback];
+    else if([action isEqualToString:@"isAuthenticatorAvailableForUse"])
+        [self isAuthenticatorAvailableForUse :successCallback :errorCallback];
     else if([action isEqualToString:@"getDocReaderVersion"])
         [self getDocReaderVersion :successCallback :errorCallback];
     else if([action isEqualToString:@"getDocReaderDocumentsDatabase"])
@@ -171,6 +171,8 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self encryptedContainers :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"finalizePackage"])
         [self finalizePackage :successCallback :errorCallback];
+    else if([action isEqualToString:@"endBackendTransaction"])
+        [self endBackendTransaction :successCallback :errorCallback];
     else if([action isEqualToString:@"getTranslation"])
         [self getTranslation :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else
@@ -188,10 +190,6 @@ NSString* RGLWPaCertificateCompletionEvent = @"pa_certificate_completion";
 NSString* RGLWTaCertificateCompletionEvent = @"ta_certificate_completion";
 NSString* RGLWTaSignatureCompletionEvent = @"ta_signature_completion";
 
-NSString* RGLWBleOnServiceConnectedEvent = @"bleOnServiceConnectedEvent";
-NSString* RGLWBleOnServiceDisconnectedEvent = @"bleOnServiceDisconnectedEvent";
-NSString* RGLWBleOnDeviceReadyEvent = @"bleOnDeviceReadyEvent";
-
 NSString* RGLWVideoEncoderCompletionEvent = @"video_encoder_completion";
 NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 
@@ -203,14 +201,6 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     successCallback(RGLDocReader.shared.documentReaderStatus);
 }
 
-- (void) isAuthenticatorAvailableForUse:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
-    successCallback(RGLDocReader.shared.isAuthenticatorAvailableForUse ? @YES : @NO);
-}
-
-- (void) isBlePermissionsGranted:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
-    errorCallback(@"isBlePermissionsGranted() is an android-only method");
-}
-
 - (void) getRfidSessionStatus:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
     successCallback(RGLDocReader.shared.rfidSessionStatus);
 }
@@ -290,7 +280,7 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 }
 
 - (void) initializeReaderWithBleDeviceConfig:(NSDictionary*)config :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
-    errorCallback(@"initializeReaderWithBleDeviceConfig() is an android-only method");
+    [RGLDocReader.shared initializeReaderWithConfig:[RGLWJSONConstructor bleDeviceConfigFromJson:config :bluetooth] completion:[self getInitCompletion :successCallback :errorCallback]];
 }
 
 - (void) deinitializeReader:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
@@ -434,8 +424,55 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     successCallback(@"");
 }
 
-- (void) startBluetoothService:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
-    errorCallback(@"startBluetoothService() is an android-only method");
+RGLBluetooth* bluetooth;
+CBCentralManager* centralManager;
+RGLWCallback savedCallbackForBluetoothResult;
+
+- (void) connectBluetoothDevice:(NSString*)deviceName :(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
+    // register callback for user's answer to bluetooth permission
+    centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
+
+    // return if already connected
+    if (bluetooth && bluetooth.state == RGLBluetoothConnectionStateConnected) return;
+
+    // start searching devices
+    if (!bluetooth) {
+        bluetooth = [RGLBluetooth new];
+        bluetooth.delegate = self;
+    }
+    savedCallbackForBluetoothResult = successCallback;
+    [bluetooth connectWithDeviceName:deviceName];
+}
+
+// CBCentralManagerDelegate
+- (void)centralManagerDidUpdateState:(CBCentralManager *)central {
+    if (central.state != CBManagerStatePoweredOn && savedCallbackForBluetoothResult)
+        [self bluetoothDeviceConnectionFailed];
+}
+
+// RGLBluetoothDelegate
+- (void)didChangeConnectionState:(RGLBluetooth *)bluetooth state:(RGLBluetoothConnectionState)state {
+    if (state == RGLBluetoothConnectionStateNone && savedCallbackForBluetoothResult)
+        [self bluetoothDeviceConnectionFailed];
+
+    // set searching timeout
+    if (state == RGLBluetoothConnectionStateSearching)
+        [self performSelector:NSSelectorFromString(@"bluetoothDeviceConnectionFailed") withObject:nil afterDelay:7.0];
+
+    if (state == RGLBluetoothConnectionStateConnected) {
+        savedCallbackForBluetoothResult(@YES);
+        savedCallbackForBluetoothResult = nil;
+        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:NSSelectorFromString(@"bluetoothDeviceConnectionFailed") object:nil];
+    }
+}
+
+- (void) bluetoothDeviceConnectionFailed {
+    if (savedCallbackForBluetoothResult) {
+        savedCallbackForBluetoothResult(@NO);
+        savedCallbackForBluetoothResult = nil;
+    }
+    [bluetooth stopSearchDevices];
+    [bluetooth disconnect];
 }
 
 - (void) setLocalizationDictionary:(NSDictionary*)dictionary :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
@@ -466,6 +503,14 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     successCallback([RGLWJSONConstructor generateDocReaderVersion:RGLDocReader.shared.version]);
 }
 
+- (void) isAuthenticatorRFIDAvailableForUse:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
+    successCallback(RGLDocReader.shared.isAuthenticatorRFIDAvailableForUse ? @YES : @NO);
+}
+
+- (void) isAuthenticatorAvailableForUse:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
+    successCallback(RGLDocReader.shared.isAuthenticatorAvailableForUse ? @YES : @NO);
+}
+
 - (void) getDocReaderDocumentsDatabase:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
     if(RGLDocReader.shared.version != nil)
         successCallback([RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateDocReaderDocumentsDatabase:RGLDocReader.shared.version.database]]);
@@ -579,6 +624,11 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     }];
 }
 
+- (void) endBackendTransaction:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
+    [RGLDocReader.shared endBackendTransaction];
+    successCallback(@"");
+}
+
 - (void) getTranslation:(NSString*)className :(NSNumber*)value :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
     if([className isEqualToString:@"RFIDErrorCodes"])
         successCallback(RGLRFIDErrorCodesGetStringValue([value intValue]));

package/src/ios/RGLWJSONConstructor.h

@@ -30,6 +30,7 @@
 
 +(RGLConfig* _Nullable)configFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateConfig:(RGLConfig* _Nullable)input;
++(RGLBleConfig* _Nullable)bleDeviceConfigFromJson:(NSDictionary* _Nullable)input :(RGLBluetooth* _Nonnull)bluetooth;
 +(RGLOnlineProcessingConfig* _Nullable)onlineProcessingConfigFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateOnlineProcessingConfig:(RGLOnlineProcessingConfig* _Nullable)input;
 +(RGLImageInput* _Nullable)imageInputFromJson:(NSDictionary* _Nullable)input;
@@ -62,6 +63,8 @@
 +(NSDictionary* _Nullable)generateEPassportDataGroups:(RGLePassportDataGroup* _Nullable)input;
 +(RGLeIDDataGroup* _Nullable)eIDDataGroupsFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateEIDDataGroups:(RGLeIDDataGroup* _Nullable)input;
++(RGLeIDDataGroup* _Nullable)dtcDataGroupsFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateRGLDTCDataGroups:(RGLeIDDataGroup* _Nullable)input;
 +(RGLRFIDScenario* _Nullable)rfidScenarioFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateRFIDScenario:(RGLRFIDScenario* _Nullable)input;
 +(RGLCustomization* _Nullable)customizationFromJson:(NSDictionary* _Nullable)input;

package/src/ios/RGLWJSONConstructor.m

@@ -23,6 +23,7 @@
 
 +(NSData*)base64Decode:(NSString*)input {
     if(input == nil) return nil;
+    if ([input hasPrefix:@"data"]) input = [input substringFromIndex:[input rangeOfString:@","].location + 1];
     return [[NSData alloc] initWithBase64EncodedString:input options:0];
 }
 
@@ -166,6 +167,17 @@
     return result;
 }
 
++(RGLBleConfig*)bleDeviceConfigFromJson:(NSDictionary*)input :(RGLBluetooth*)bluetooth {
+    if (!input) return nil;
+    RGLBleConfig *config = [[RGLBleConfig alloc] initWithBluetooth:bluetooth];
+
+    if (input[@"databasePath"]) config.databasePath = [[NSBundle mainBundle] pathForResource:input[@"databasePath"] ofType:nil];
+    if (input[@"licenseUpdate"]) config.licenseUpdateCheck = [input[@"licenseUpdate"] boolValue];
+    if (input[@"delayedNNLoad"]) config.delayedNNLoadEnabled = [input[@"delayedNNLoad"] boolValue];
+
+    return config;
+}
+
 +(RGLScannerConfig*)scannerConfigFromJson:(NSDictionary*)input {
     RGLScannerConfig *config = [RGLScannerConfig alloc];
     if (input[@"scenario"]) config = [config initWithScenario:input[@"scenario"]];
@@ -216,7 +228,8 @@
     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"];
+    if (input[@"oneShotIdentification"]) config.oneShotIdentification = input[@"oneShotIdentification"];
+    if (input[@"dtc"]) config.dtc = [RGLWJSONConstructor base64Decode:input[@"dtc"]];
 
     return config;
 }
@@ -230,6 +243,7 @@
     result[@"livePortrait"] = [self base64WithImage: input.livePortrait];
     result[@"extPortrait"] = [self base64WithImage: input.extPortrait];
     result[@"oneShotIdentification"] = @(input.oneShotIdentification);
+    result[@"dtc"] = [self base64Encode: input.dtc];
     result[@"image"] = [self base64WithImage: input.image];
     result[@"data"] = [self base64Encode: input.imageData];
     if(input.images != nil) {
@@ -258,6 +272,7 @@
         result.httpHeaders = [input valueForKey:@"httpHeaders"];
     if([input valueForKey:@"rfidServerSideChipVerification"] != nil)
         result.rfidServerSideChipVerification = [input valueForKey:@"rfidServerSideChipVerification"];
+    if (input[@"timeoutConnection"]) result.timeoutConnection = input[@"timeoutConnection"];
     
     return result;
 }
@@ -269,6 +284,7 @@
     result[@"url"] = input.url;
     result[@"httpHeaders"] = input.httpHeaders;
     result[@"rfidServerSideChipVerification"] = input.rfidServerSideChipVerification;
+    result[@"timeoutConnection"] = input.timeoutConnection;
     
     return result;
 }
@@ -333,6 +349,16 @@
     return [RGLWConfig getDataGroups:input];
 }
 
++(RGLDTCDataGroup*)dtcDataGroupsFromJson:(NSDictionary*)input {
+    RGLDTCDataGroup *result = [RGLDTCDataGroup new];
+    [RGLWConfig setDataGroups :result dict:input];
+    return result;
+}
+
++(NSDictionary*)generateRGLDTCDataGroups:(RGLDTCDataGroup*)input {
+    return [RGLWConfig getDataGroups:input];
+}
+
 +(RGLRFIDScenario*)rfidScenarioFromJson:(NSDictionary*)input {
     RGLRFIDScenario *result = [RGLRFIDScenario new];
     [RGLWConfig setRfidScenario:input :result];
@@ -2220,7 +2246,7 @@
         [imageQuality addObject:[self imageQualityGroupFromJson:item]];
     }
     
-    return [[RGLDocumentReaderResults alloc]
+    RGLDocumentReaderResults* result = [[RGLDocumentReaderResults alloc]
             initWithDocumentTypes:documentType
             textResult:[self documentReaderTextResultFromJson: [input valueForKey:@"textResult"]]
             graphicResult:[self documentReaderGraphicResultFromJson: [input valueForKey:@"graphicResult"]]
@@ -2240,6 +2266,10 @@
             elapsedTime:[[input valueForKey:@"elapsedTime"] integerValue]
             elapsedTimeRFID:[[input valueForKey:@"elapsedTimeRFID"] integerValue]
             transactionInfo:[self transactionInfoFromJson:[input valueForKey:@"transactionInfo"]]];
+    
+    [result setValue:[RGLWJSONConstructor base64Decode:input[@"dtcData"]] forKey:@"dtcData"];
+    
+    return result;
 }
 
 +(NSDictionary*)generateDocumentReaderResults:(RGLDocumentReaderResults*)input {
@@ -2289,6 +2319,7 @@
     result[@"rawResult"] = input.rawResult;
     result[@"status"] = [self generateDocumentReaderResultsStatus:input.status];
     result[@"vdsncData"] = [self generateVDSNCData:input.vdsncData];
+    result[@"dtcData"] = [self base64Encode: input.dtcData];
     result[@"transactionInfo"] = [self generateTransactionInfo:input.transactionInfo];
     
     return result;