@regulaforensics/cordova-plugin-document-reader-api 6.4.0 → 6.6.0

package/src/android/RegulaConfig.java

@@ -6,11 +6,14 @@ import org.json.JSONException;
 
 import com.regula.documentreader.api.DocumentReader;
 import com.regula.documentreader.api.params.ImageQA;
+import com.regula.documentreader.api.params.OnlineProcessingConfig;
 import com.regula.documentreader.api.params.ParamsCustomization;
 import com.regula.documentreader.api.params.Functionality;
 import com.regula.documentreader.api.params.ProcessParam;
+import com.regula.documentreader.api.params.rfid.ReprocParams;
 import com.regula.documentreader.api.params.rfid.dg.DataGroups;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Paint;
 import android.text.SpannableString;
@@ -41,6 +44,7 @@ class RegulaConfig {
         return object;
     }
 
+    @SuppressLint("MissingPermission")
     private static void setFunctionality(Functionality functionality, JSONObject opts) throws JSONException {
         Functionality.FunctionalityEditor editor = functionality.edit();
         if (opts.has("pictureOnBoundsReady"))
@@ -59,8 +63,6 @@ class RegulaConfig {
             editor.setShowCaptureButtonDelayFromDetect(opts.getInt("showCaptureButtonDelayFromDetect"));
         if (opts.has("showCaptureButtonDelayFromStart"))
             editor.setShowCaptureButtonDelayFromStart(opts.getInt("showCaptureButtonDelayFromStart"));
-        if (opts.has("isOnlineMode"))
-            editor.setOnlineMode(opts.getBoolean("isOnlineMode"));
         if (opts.has("databaseAutoupdate"))
             editor.setDatabaseAutoupdate(opts.getBoolean("databaseAutoupdate"));
         if (opts.has("showSkipNextPageButton"))
@@ -73,8 +75,6 @@ class RegulaConfig {
             editor.setShowCameraSwitchButton(opts.getBoolean("showCameraSwitchButton"));
         if (opts.has("cameraFrame"))
             editor.setCameraFrame(opts.getString("cameraFrame"));
-        if (opts.has("serviceURL"))
-            editor.setServiceURL(opts.getString("serviceURL"));
         if (opts.has("btDeviceName"))
             editor.setBtDeviceName(opts.getString("btDeviceName"));
         if (opts.has("orientation"))
@@ -105,6 +105,8 @@ class RegulaConfig {
             editor.setExposure(BigDecimal.valueOf(opts.getDouble("exposure")).floatValue());
         if (opts.has("rfidTimeout"))
             editor.setRfidTimeout(opts.getInt("rfidTimeout"));
+        if (opts.has("onlineProcessingConfiguration"))
+            editor.setOnlineProcessingConfiguration(OnlineProcessingConfigFromJSON(opts.getJSONObject("onlineProcessingConfiguration")));
 
         editor.apply();
     }
@@ -213,6 +215,18 @@ class RegulaConfig {
             processParams.parseBarcodes = opts.getBoolean("parseBarcodes");
         if (opts.has("shouldReturnPackageForReprocess"))
             processParams.shouldReturnPackageForReprocess = opts.getBoolean("shouldReturnPackageForReprocess");
+        if (opts.has("imageOutputMaxHeight"))
+            processParams.imageOutputMaxHeight = opts.getInt("imageOutputMaxHeight");
+        if (opts.has("imageOutputMaxWidth"))
+            processParams.imageOutputMaxWidth = opts.getInt("imageOutputMaxWidth");
+        if (opts.has("disablePerforationOCR"))
+            processParams.disablePerforationOCR = opts.getBoolean("disablePerforationOCR");
+        if (opts.has("documentGroupFilter"))
+            processParams.documentGroupFilter = intArrayFromJson(opts.getJSONArray("documentGroupFilter"));
+        if (opts.has("respectImageQuality"))
+            processParams.respectImageQuality = opts.getBoolean("respectImageQuality");
+        if (opts.has("splitNames"))
+            processParams.splitNames = opts.getBoolean("splitNames");
     }
 
     private static void setCustomization(ParamsCustomization customization, JSONObject opts, Context context) throws JSONException {
@@ -349,14 +363,12 @@ class RegulaConfig {
         object.put("showChangeFrameButton", functionality.isShowChangeFrameButton());
         object.put("showCaptureButtonDelayFromDetect", functionality.getShowCaptureButtonDelayFromDetect());
         object.put("showCaptureButtonDelayFromStart", functionality.getShowCaptureButtonDelayFromStart());
-        object.put("isOnlineMode", functionality.isOnlineMode());
         object.put("databaseAutoupdate", functionality.isDatabaseAutoupdate());
         object.put("showSkipNextPageButton", functionality.isShowSkipNextPageButton());
         object.put("useAuthenticator", functionality.isUseAuthenticator());
         object.put("skipFocusingFrames", functionality.isSkipFocusingFrames());
         object.put("showCameraSwitchButton", functionality.isShowCameraSwitchButton());
         object.put("cameraFrame", functionality.getCameraFrame());
-        object.put("serviceURL", functionality.getServiceURL());
         object.put("btDeviceName", functionality.getBtDeviceName());
         object.put("orientation", functionality.getOrientation());
         object.put("BTDeviceApiPresent", functionality.isBTDeviceApiPresent());
@@ -487,7 +499,7 @@ class RegulaConfig {
         object.put("matchTextFieldMask", processParams.matchTextFieldMask);
         object.put("fastDocDetect", processParams.fastDocDetect);
         object.put("updateOCRValidityByGlare", processParams.updateOCRValidityByGlare);
-        object.put("imageQA", processParams.imageQA != null ? processParams.imageQA.toJsonObject() : null);
+        object.put("imageQA", processParams.imageQA.toJsonObject());
         object.put("forceDocFormat", processParams.forceDocFormat);
         object.put("noGraphics", processParams.noGraphics);
         object.put("documentAreaMin", processParams.documentAreaMin);
@@ -498,6 +510,12 @@ class RegulaConfig {
         object.put("forceReadMrzBeforeLocate", processParams.forceReadMrzBeforeLocate);
         object.put("parseBarcodes", processParams.parseBarcodes);
         object.put("shouldReturnPackageForReprocess", processParams.shouldReturnPackageForReprocess);
+        object.put("imageOutputMaxHeight", processParams.imageOutputMaxHeight);
+        object.put("imageOutputMaxWidth", processParams.imageOutputMaxWidth);
+        object.put("disablePerforationOCR", processParams.disablePerforationOCR);
+        object.put("documentGroupFilter", generateIntArray(processParams.documentGroupFilter));
+        object.put("respectImageQuality", processParams.respectImageQuality);
+        object.put("splitNames", processParams.splitNames);
 
         return object;
     }
@@ -603,6 +621,10 @@ class RegulaConfig {
             setDataGroups(DocumentReader.Instance().rfidScenario().eIDDataGroups(), opts.getJSONObject("eIDDataGroups"));
         if (opts.has("eDLDataGroups"))
             setDataGroups(DocumentReader.Instance().rfidScenario().eDLDataGroups(), opts.getJSONObject("eDLDataGroups"));
+        if (opts.has("reprocessParams"))
+            DocumentReader.Instance().rfidScenario().setReprocessParams(ReprocParamsFromJSON(opts.getJSONObject("reprocessParams")));
+        if (opts.has("defaultReadingBufferSize"))
+            DocumentReader.Instance().rfidScenario().setDefaultReadingBufferSize(opts.getInt("defaultReadingBufferSize"));
     }
 
     private static void setDataGroups(DataGroups dataGroup, JSONObject opts) throws JSONException {
@@ -649,4 +671,43 @@ class RegulaConfig {
         if (opts.has("DG21"))
             dataGroup.setDG14(opts.getBoolean("DG21"));
     }
+
+    private static ReprocParams ReprocParamsFromJSON(JSONObject input) {
+        try {
+            ReprocParams result;
+            if (input.has("serviceUrl"))
+                result = new ReprocParams(input.getString("serviceUrl"));
+            else return null;
+            if (input.has("failIfNoService"))
+                result.setFailIfNoService(input.getBoolean("failIfNoService"));
+            return result;
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static OnlineProcessingConfig OnlineProcessingConfigFromJSON(JSONObject input) {
+        try {
+            OnlineProcessingConfig.Builder builder;
+            if (input.has("mode"))
+                builder = new OnlineProcessingConfig.Builder(input.getInt("mode"));
+            else return null;
+            if (input.has("imageFormat"))
+                builder.setImageFormat(input.getInt("imageFormat"));
+            if (input.has("url"))
+                builder.setUrl(input.getString("url"));
+            if (input.has("imageCompressionQuality"))
+                builder.setImageCompressionQuality((float) input.getDouble("imageCompressionQuality"));
+            if (input.has("processParams")) {
+                ProcessParam params = new ProcessParam();
+                setProcessParams(params, input.getJSONObject("processParams"));
+                builder.setProcessParams(params);
+            }
+            return builder.build();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

package/src/android/build.gradle

@@ -1,18 +1,12 @@
 repositories {
-	jcenter()
-	maven{
-		url "https://maven.google.com"
-	}
-	maven{
-		url "https://maven.regulaforensics.com/RegulaDocumentReader"
-	}
-	maven {
-		url "https://maven.regulaforensics.com/RegulaDocumentReader/Beta"
-	}
+    maven {
+        url "https://maven.regulaforensics.com/RegulaDocumentReader"
+    }
 }
 
 dependencies {
-	implementation ('com.regula.documentreader:api:6.4.7224'){
+    //noinspection GradleDependency
+	implementation ('com.regula.documentreader:api:6.6.8072'){
         transitive = true
     }
 }

package/src/ios/RGLDocumentReader.m

@@ -138,6 +138,14 @@ typedef void (^Callback)(NSString* response);
 
     if([action isEqualToString:@"initializeReaderAutomatically"])
         [self initializeReaderAutomatically :successCallback :errorCallback];
+    else if([action isEqualToString:@"isBlePermissionsGranted"])
+        [self isBlePermissionsGranted :successCallback :errorCallback];
+    else if([action isEqualToString:@"startBluetoothService"])
+        [self startBluetoothService :successCallback :errorCallback];
+    else if([action isEqualToString:@"initializeReaderBleDeviceConfig"])
+        [self initializeReaderBleDeviceConfig :successCallback :errorCallback];
+    else if([action isEqualToString:@"getTag"])
+        [self getTag :successCallback :errorCallback];
     else if([action isEqualToString:@"getAPIVersion"])
         [self getAPIVersion :successCallback :errorCallback];
     else if([action isEqualToString:@"getAvailableScenarios"])
@@ -218,6 +226,10 @@ typedef void (^Callback)(NSString* response);
         [self addPKDCertificates :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setCameraSessionIsPaused"])
         [self setCameraSessionIsPaused :[args objectAtIndex:0] :successCallback :errorCallback];
+    else if([action isEqualToString:@"setTag"])
+        [self setTag :[args objectAtIndex:0] :successCallback :errorCallback];
+    else if([action isEqualToString:@"checkDatabaseUpdate"])
+        [self checkDatabaseUpdate :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"getScenario"])
         [self getScenario :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImages"])
@@ -236,6 +248,8 @@ typedef void (^Callback)(NSString* response);
         [self prepareDatabase :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImage"])
         [self recognizeImage :[args objectAtIndex:0] :successCallback :errorCallback];
+    else if([action isEqualToString:@"recognizeData"])
+        [self recognizeData :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setRfidSessionStatus"])
         [self setRfidSessionStatus :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"providePACertificates"])
@@ -248,8 +262,6 @@ typedef void (^Callback)(NSString* response);
         [self parseCoreResults :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setTCCParams"])
         [self setTCCParams :[args objectAtIndex:0] :successCallback :errorCallback];
-    else if([action isEqualToString:@"initializeReaderWithDatabase"])
-        [self initializeReaderWithDatabase :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImageWithOpts"])
         [self recognizeImageWithOpts :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeVideoFrame"])
@@ -270,6 +282,18 @@ typedef void (^Callback)(NSString* response);
     [RGLDocReader.shared initializeReaderWithConfig:[RGLConfig configWithLicenseData:licenseData] completion:[self getInitCompletion :successCallback :errorCallback]];
 }
 
+- (void) isBlePermissionsGranted:(Callback)successCallback :(Callback)errorCallback{
+    [self result:@"isBlePermissionsGranted() is an android-only method" :errorCallback];
+}
+
+- (void) startBluetoothService:(Callback)successCallback :(Callback)errorCallback{
+    [self result:@"startBluetoothService() is an android-only method" :errorCallback];
+}
+
+- (void) initializeReaderBleDeviceConfig:(Callback)successCallback :(Callback)errorCallback{
+    [self result:@"initializeReaderBleDeviceConfig() is an android-only method" :errorCallback];
+}
+
 - (void) resetConfiguration:(Callback)successCallback :(Callback)errorCallback{
     [self result:@"resetConfiguration() is an android-only method" :errorCallback];
 }
@@ -304,12 +328,8 @@ typedef void (^Callback)(NSString* response);
     [self result:@"getLicenseMessage() is an android-only method" :successCallback];
 }
 
-- (void) initializeReaderWithDatabase:(NSString*)licenseString :(NSString*)databaseString :(Callback)successCallback :(Callback)errorCallback{
-    [self result:@"initializeReaderWithDatabase() is an android-only method" :successCallback];
-}
-
-- (void) initializeReader:(NSString*)licenseString :(Callback)successCallback :(Callback)errorCallback{
-    [RGLDocReader.shared initializeReaderWithConfig:[RGLConfig configWithLicenseData:[[NSData alloc] initWithBase64EncodedString:licenseString options:0]] completion:[self getInitCompletion :successCallback :errorCallback]];
+- (void) initializeReader:(NSDictionary*)config :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared initializeReaderWithConfig:[RGLWJSONConstructor RGLConfigFromJson:config] completion:[self getInitCompletion :successCallback :errorCallback]];
 }
 
 - (void) parseCoreResults:(NSString*)json :(Callback)successCallback :(Callback)errorCallback{
@@ -345,33 +365,38 @@ typedef void (^Callback)(NSString* response);
 }
 
 - (void) showScanner:(Callback)successCallback :(Callback)errorCallback{
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
-            UIViewController *currentViewController = [[[UIApplication sharedApplication] keyWindow] rootViewController];
-            [RGLDocReader.shared showScanner:currentViewController completion:[self getCompletion]];
-        });
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
+        UIViewController *currentViewController = [[[UIApplication sharedApplication] keyWindow] rootViewController];
+        [RGLDocReader.shared showScanner:currentViewController completion:[self getCompletion]];
+    });
 }
 
 - (void) recognizeImage:(NSMutableString*)base64 :(Callback)successCallback :(Callback)errorCallback{
     [self recognizeImageWith :base64 :false :successCallback :errorCallback];
 }
 
+- (void) recognizeData:(NSString*)data :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared recognizeData :[[NSData alloc] initWithBase64EncodedString:data options:0] completion:[self getCompletion]];
+}
+
 - (void) recognizeImages:(NSArray*)input :(Callback)successCallback :(Callback)errorCallback{
-        NSMutableArray<UIImage*>* images = [[NSMutableArray alloc] init];
-        for(__strong NSMutableString* base64 in input)
-            [images addObject:[UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:base64 options:NSDataBase64DecodingIgnoreUnknownCharacters]]];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [RGLDocReader.shared recognizeImages:images completion:[self getCompletion]];
-        });
+    NSMutableArray<UIImage*>* images = [[NSMutableArray alloc] init];
+    for(__strong NSMutableString* base64 in input)
+        [images addObject:[UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:base64 options:NSDataBase64DecodingIgnoreUnknownCharacters]]];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [RGLDocReader.shared recognizeImages:images completion:[self getCompletion]];
+    });
+
 }
 
 - (void) recognizeImagesWithImageInputs:(NSArray*)input :(Callback)successCallback :(Callback)errorCallback{
-        NSMutableArray<RGLImageInput*>* images = [[NSMutableArray alloc] init];
-        for(__strong NSDictionary* image in input)
-            [images addObject:[RGLWJSONConstructor RGLImageInputFromJson: image]];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [RGLDocReader.shared recognizeImagesWithImageInputs:images completion:[self getCompletion]];
-        });
+    NSMutableArray<RGLImageInput*>* images = [[NSMutableArray alloc] init];
+    for(__strong NSDictionary* image in input)
+        [images addObject:[RGLWJSONConstructor RGLImageInputFromJson: image]];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [RGLDocReader.shared recognizeImagesWithImageInputs:images completion:[self getCompletion]];
+    });
 }
 
 - (void) recognizeImageWithCameraMode:(NSMutableString*)base64 :(BOOL)cameraMode :(Callback)successCallback :(Callback)errorCallback{
@@ -379,31 +404,44 @@ typedef void (^Callback)(NSString* response);
 }
 
 - (void) recognizeImageWith:(NSMutableString*)base64 :(BOOL)cameraMode :(Callback)successCallback :(Callback)errorCallback{
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [RGLDocReader.shared recognizeImage:[UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:base64 options:NSDataBase64DecodingIgnoreUnknownCharacters]] cameraMode:cameraMode completion:[self getCompletion]];
-        });
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [RGLDocReader.shared recognizeImage:[UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:base64 options:NSDataBase64DecodingIgnoreUnknownCharacters]] cameraMode:cameraMode completion:[self getCompletion]];
+    });
 }
 
 - (void) setConfig:(NSDictionary*)config :(Callback)successCallback :(Callback)errorCallback{
-        [RegulaConfig setConfig:config :RGLDocReader.shared];
-        [self result:@"" :successCallback];
+    [RegulaConfig setConfig:config :RGLDocReader.shared];
+    [self result:@"" :successCallback];
 }
 
 - (void) getConfig:(Callback)successCallback :(Callback)errorCallback{
     [self result:[[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:[RegulaConfig getConfig:RGLDocReader.shared] options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding] :successCallback];
 }
 
+- (void) checkDatabaseUpdate:(NSString*)databaseId :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared checkDatabaseUpdate:databaseId completion:[self getCheckDatabaseUpdateCompletion: successCallback: errorCallback]];
+}
+
+- (void) getTag:(Callback)successCallback :(Callback)errorCallback{
+    [self result:[RGLDocReader.shared tag] :successCallback];
+}
+
+- (void) setTag:(NSString*)tag :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared setTag:tag];
+    [self result:@"" :successCallback];
+}
+
 - (void) setRfidScenario:(NSDictionary*)rfidScenario :(Callback)successCallback :(Callback)errorCallback{
-        [RegulaConfig setRfidScenario:rfidScenario  :RGLDocReader.shared.rfidScenario];
-        [self result:@"" :successCallback];
+    [RegulaConfig setRfidScenario:rfidScenario  :RGLDocReader.shared.rfidScenario];
+    [self result:@"" :successCallback];
 }
 
 - (void) getRfidScenario:(Callback)successCallback :(Callback)errorCallback{
-        [self result:[[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:RGLDocReader.shared.rfidScenario.rfidScenarioDictionary options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding] :successCallback];
+    [self result:[[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:RGLDocReader.shared.rfidScenario.rfidScenarioDictionary options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding] :successCallback];
 }
 
 - (void) readRFID:(Callback)successCallback :(Callback)errorCallback{
-        [RGLDocReader.shared readRFID:[self getRFIDNotificationCallback] completion:[self getRFIDCompletion]];
+    [RGLDocReader.shared readRFID:[self getRFIDNotificationCallback] completion:[self getRFIDCompletion]];
 }
 
 - (void) stopRFIDReader:(Callback)successCallback :(Callback)errorCallback{
@@ -652,4 +690,10 @@ typedef void (^Callback)(NSString* response);
     };
 }
 
+-(RGLDocumentReaderCheckUpdateCompletion)getCheckDatabaseUpdateCompletion:(Callback)successCallback :(Callback)errorCallback{
+    return  ^(RGLDocReaderDocumentsDatabase* database) {
+        [self result:[RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRGLDocReaderDocumentsDatabase:database]] :successCallback];
+    };
+}
+
 @end

package/src/ios/RGLWJSONConstructor.h

@@ -12,6 +12,7 @@
 +(NSMutableDictionary* _Nonnull)generateNSDictionary:(NSDictionary<NSNumber*, NSNumber*>* _Nullable)input;
 +(RGLPKDCertificate* _Nullable)RGLPKDCertificateFromJson:(NSDictionary* _Nullable) dict;
 +(RGLTCCParams* _Nonnull)RGLTCCParamsFromJson:(NSDictionary* _Nonnull)input;
++(RGLConfig* _Nullable)RGLConfigFromJson:(NSDictionary* _Nonnull)input;
 +(RGLImageInput* _Nonnull)RGLImageInputFromJson:(NSDictionary* _Nonnull)input;
 +(NSInteger)generateDocReaderAction:(RGLDocReaderAction)action;
 +(NSInteger)generateRFIDCompleteAction:(RGLRFIDCompleteAction)action;
@@ -64,6 +65,12 @@
 +(NSMutableDictionary* _Nonnull)generateRGLBytesData:(RGLBytesData* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLRFIDNotify:(RGLRFIDNotify* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLUVFiberElement:(RGLUVFiberElement* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDocReaderDocumentsDatabase:(RGLDocReaderDocumentsDatabase* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderComparison:(RGLDocumentReaderComparison* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderValidity:(RGLDocumentReaderValidity* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderSymbol:(RGLDocumentReaderSymbol* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderTextSource:(RGLDocumentReaderTextSource* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderRfidOrigin:(RGLDocumentReaderRfidOrigin* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLElementRect:(RGLElementRect* _Nullable)input;
 
 @end

package/src/ios/RGLWJSONConstructor.m

@@ -35,6 +35,28 @@
     return [[RGLTCCParams alloc] initWithServiceTAURLString:serviceTAURLString servicePAURLString:servicePAURLString pfxCertURLString:pfxCertURLString pfxCertData: pfxCertData pfxPassPhrase:pfxPassPhrase];
 }
 
++(RGLConfig*)RGLConfigFromJson:(NSDictionary*)input {
+    NSData* license;
+    if([input valueForKey:@"license"] != nil)
+        license = [[NSData alloc] initWithBase64EncodedString:[input valueForKey:@"license"] options:0];
+    else return nil;
+
+    RGLConfig *config = [[RGLConfig alloc] initWithLicenseData:license];
+
+    if([input valueForKey:@"databasePath"] != nil){
+        config.databasePath = [[input valueForKey:@"databasePath"] stringValue];
+    }
+    if([input valueForKey:@"licenseUpdate"] != nil){
+        config.licenseUpdateCheck = [[input valueForKey:@"licenseUpdate"] boolValue];
+    }
+    if([input valueForKey:@"delayedNNLoad"] != nil){
+        config.delayedNNLoadEnabled = [[input valueForKey:@"delayedNNLoad"] boolValue];
+    }
+
+    return config;
+}
+
+
 +(RGLImageInput*)RGLImageInputFromJson:(NSDictionary*)input {
     NSInteger pageIndex = 0;
     if([input valueForKey:@"pageIndex"] != nil)
@@ -294,11 +316,9 @@
                 [array addObject:[self generateRGLImageQualityGroup:item]];
         result[@"imageQuality"] = array;
     }
-    result[@"overallResult"] = @(input.overallResult);
     result[@"authenticityResult"] = [self generateRGLDocumentReaderAuthenticityResult:input.authenticityResults];
     result[@"rfidSessionData"] = [self generateRGLRFIDSessionData:input.rfidSessionData];
     result[@"chipPage"] = @(input.chipPage);
-    result[@"resolutionType"] = @(input.resolutionType);
     result[@"barcodeResult"] = [self generateRGLDocumentReaderBarcodeResult:input.barcodeResult];
     result[@"processingFinishedStatus"] = @(input.processingFinishedStatus);
     result[@"morePagesAvailable"] = @(input.morePagesAvailable);
@@ -494,6 +514,15 @@
         result[@"fields"] = array;
     }
     result[@"status"] = @(input.status);
+    result[@"comparisonStatus"] = @(input.comparisonStatus);
+    result[@"validityStatus"] = @(input.validityStatus);
+    if(input.availableSourceList != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLDocumentReaderTextSource* item in input.availableSourceList)
+            if(item != nil)
+                [array addObject:[self generateRGLDocumentReaderTextSource:item]];
+        result[@"availableSourceList"] = array;
+    }
 
     return result;
 }
@@ -514,7 +543,22 @@
         result[@"values"] = array;
     }
     result[@"status"] = @(input.status);
-    result[@"value"] = [self generateRGLDocumentReaderValue:[input getValue]];
+    result[@"value"] = input.value;
+    result[@"getValue"] = [self generateRGLDocumentReaderValue:[input getValue]];
+    if(input.comparisonList != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLDocumentReaderComparison* item in input.comparisonList)
+            if(item != nil)
+                [array addObject:[self generateRGLDocumentReaderComparison:item]];
+        result[@"comparisonList"] = array;
+    }
+    if(input.validityList != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLDocumentReaderValidity* item in input.validityList)
+            if(item != nil)
+                [array addObject:[self generateRGLDocumentReaderValidity:item]];
+        result[@"validityList"] = array;
+    }
 
     return result;
 }
@@ -531,6 +575,14 @@
     result[@"comparison"] = [self generateNSDictionary:input.comparison];
     result[@"pageIndex"] = @(input.pageIndex);
     result[@"probability"] = @(input.probability);
+    if(input.originalSymbols != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLDocumentReaderSymbol* item in input.originalSymbols)
+            if(item != nil)
+                [array addObject:[self generateRGLDocumentReaderSymbol:item]];
+        result[@"originalSymbols"] = array;
+    }
+    result[@"rfidOrigin"] = [self generateRGLDocumentReaderRfidOrigin:input.rfidOrigin];
 
     return result;
 }
@@ -614,7 +666,6 @@
     result[@"status"] = @(input.status);
     result[@"extLeSupport"] = @(input.extLeSupport);
     result[@"processTime"] = @(input.processTime);
-    result[@"sessionDataStatus"] = [self generateRGLRFIDSessionDataStatus:input.sessionDataStatus];
 
     return result;
 }
@@ -1110,6 +1161,75 @@
     return result;
 }
 
++(NSMutableDictionary* _Nonnull)generateRGLDocReaderDocumentsDatabase:(RGLDocReaderDocumentsDatabase* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"databaseID"] = input.databaseID;
+    result[@"version"] = input.version;
+    result[@"date"] = input.date;
+    result[@"databaseDescription"] = input.databaseDescription;
+    result[@"countriesNumber"] = @(input.countriesNumber);
+    result[@"documentsNumber"] = @(input.documentsNumber);
+
+    return result;
+}
+
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderComparison:(RGLDocumentReaderComparison* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"sourceTypeLeft"] = @(input.sourceTypeLeft);
+    result[@"sourceTypeRight"] = @(input.sourceTypeRight);
+    result[@"status"] = @(input.status);
+
+    return result;
+}
+
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderValidity:(RGLDocumentReaderValidity* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"sourceType"] = @(input.sourceType);
+    result[@"status"] = @(input.status);
+
+    return result;
+}
+
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderSymbol:(RGLDocumentReaderSymbol* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"code"] = @(input.code);
+    result[@"rect"] = [self generateCGRect:input.rect];
+    result[@"probability"] = @(input.probability);
+
+    return result;
+}
+
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderTextSource:(RGLDocumentReaderTextSource* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"sourceType"] = @(input.sourceType);
+    result[@"source"] = input.source;
+    result[@"validityStatus"] = @(input.validityStatus);
+
+    return result;
+}
+
++(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderRfidOrigin:(RGLDocumentReaderRfidOrigin* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"dg"] = @(input.dg);
+    result[@"dgTag"] = @(input.dgTag);
+    result[@"entryView"] = @(input.entryView);
+    result[@"tagEntry"] = @(input.tagEntry);
+
+    return result;
+}
+
 +(NSMutableDictionary* _Nonnull)generateRGLElementRect:(RGLElementRect* _Nullable)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;