@regulaforensics/cordova-plugin-document-reader-api 6.3.0 → 6.5.0

package/src/android/JSONConstructor.java

@@ -15,7 +15,9 @@ import com.regula.documentreader.api.enums.eGraphicFieldType;
 import com.regula.documentreader.api.enums.eRPRM_Lights;
 import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreDetailedScenario;
-import com.regula.documentreader.api.params.FaceMetaData;
+import com.regula.documentreader.api.params.DocReaderConfig;
+import com.regula.documentreader.api.internal.params.FaceMetaData;
+import com.regula.documentreader.api.params.ImageInputData;
 import com.regula.documentreader.api.params.rfid.TccParams;
 import com.regula.documentreader.api.params.rfid.authorization.PAAttribute;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
@@ -55,7 +57,6 @@ import com.regula.documentreader.api.results.rfid.Extension;
 import com.regula.documentreader.api.results.rfid.File;
 import com.regula.documentreader.api.results.rfid.FileData;
 import com.regula.documentreader.api.results.rfid.RFIDSessionData;
-import com.regula.documentreader.api.results.rfid.RFIDSessionDataStatus;
 import com.regula.documentreader.api.results.rfid.SecurityObject;
 import com.regula.documentreader.api.results.rfid.SecurityObjectCertificates;
 import com.regula.documentreader.api.results.rfid.SignerInfo;
@@ -360,6 +361,64 @@ class JSONConstructor {
         return result;
     }
 
+    static DocReaderConfig DocReaderConfigFromJSON(JSONObject input) {
+        DocReaderConfig result = new DocReaderConfig(null);
+        byte[] license;
+        try {
+            if (input.has("license")) {
+                license = Base64.decode(input.getString("license"), Base64.DEFAULT);
+                result = new DocReaderConfig(license);
+            } else return result;
+            if (input.has("customDb"))
+                result = new DocReaderConfig(license, Base64.decode(input.getString("customDb"), Base64.DEFAULT));
+            if (input.has("licenseUpdate"))
+                result.setLicenseUpdate(input.getBoolean("licenseUpdate"));
+            if (input.has("delayedNNLoad"))
+                result.setDelayedNNLoad(input.getBoolean("delayedNNLoad"));
+            if (input.has("blackList"))
+                result.setBlackList(input.getJSONObject("blackList"));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    static ImageInputData ImageInputDataFromJSON(JSONObject input) {
+        ImageInputData result = new ImageInputData(null);
+        int pageIndex = 0;
+        int light = 6;
+        int type = 254;
+        int width = 0;
+        int height = 0;
+        Bitmap bitmap;
+        byte[] imgBytes;
+
+        try {
+            if(input.has("pageIndex"))
+                pageIndex = input.optInt("pageIndex");
+            if(input.has("light"))
+                pageIndex = input.optInt("light");
+            if(input.has("type"))
+                pageIndex = input.optInt("type");
+            if (input.has("bitmap")) {
+                bitmap = Helpers.bitmapFromBase64(input.getString("bitmap"));
+                result = new ImageInputData(bitmap, light, pageIndex);
+            }
+            if (input.has("imgBytes")) {
+                JSONArray jsonArray_data = input.getJSONArray("data");
+                byte[] data = new byte[jsonArray_data.length()];
+                for (int i = 0; i < jsonArray_data.length(); i++)
+                    data[i] = (byte) jsonArray_data.get(i);
+                imgBytes = data;
+                result = new ImageInputData(imgBytes, width, height, light, pageIndex);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
     static Throwable ThrowableFromJSON(JSONObject jsonObject) {
         return new Throwable();
     }
@@ -883,7 +942,6 @@ class JSONConstructor {
             result.put("extLeSupport", input.extLeSupport);
             result.put("processTime", input.processTime);
             result.put("cardProperties", generateCardProperties(input.cardProperties));
-            result.put("sessionDataStatus", generateRFIDSessionDataStatus(input.sessionDataStatus));
             result.put("accessControls", generateList(input.accessControls, JSONConstructor::generateAccessControlProcedureType));
             result.put("applications", generateList(input.applications, JSONConstructor::generateApplication));
             result.put("securityObjects", generateList(input.securityObjects, JSONConstructor::generateSecurityObject));
@@ -921,23 +979,6 @@ class JSONConstructor {
         return result;
     }
 
-    static JSONObject generateRFIDSessionDataStatus(RFIDSessionDataStatus input) {
-        JSONObject result = new JSONObject();
-        if (input == null) return result;
-        try {
-            result.put("AA", input.AA);
-            result.put("BAC", input.BAC);
-            result.put("CA", input.CA);
-            result.put("PA", input.PA);
-            result.put("PACE", input.PACE);
-            result.put("TA", input.TA);
-            result.put("overallStatus", input.overallStatus);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return result;
-    }
-
     static JSONObject generateDocumentReaderBarcodeResult(DocumentReaderBarcodeResult input) {
         JSONObject result = new JSONObject();
         if (input == null) return result;
@@ -1184,12 +1225,28 @@ class JSONConstructor {
         return result;
     }
 
+    static JSONObject generateImageInputData(ImageInputData input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("pageIndex", input.getPageIndex());
+            result.put("light", input.getLight());
+            result.put("type", input.getType());
+            result.put("width", input.getWidth());
+            result.put("height", input.getHeight());
+            result.put("bitmap", generateBitmap(input.getBitmap()));
+            result.put("imgBytes", generateByteArray(input.getImgBytes()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
     static JSONObject generateDocumentReaderResults(DocumentReaderResults input, Context context) {
         JSONObject result = new JSONObject();
         if (input == null) return result;
         try {
             result.put("chipPage", input.chipPage);
-            result.put("overallResult", input.getOverallResult());
             result.put("processingFinishedStatus", input.processingFinishedStatus);
             result.put("elapsedTime", input.elapsedTime);
             result.put("elapsedTimeRFID", input.elapsedTimeRFID);
@@ -1984,8 +2041,6 @@ class JSONConstructor {
                 result.processTime = input.getInt("processTime");
             if (input.has("cardProperties"))
                 result.cardProperties = CardPropertiesFromJSON(input.getJSONObject("cardProperties"));
-            if (input.has("sessionDataStatus"))
-                result.sessionDataStatus = RFIDSessionDataStatusFromJSON(input.getJSONObject("sessionDataStatus"));
             if (input.has("accessControls")){
                 JSONArray jsonArray_accessControls = input.getJSONArray("accessControls");
                 List<AccessControlProcedureType> accessControls = new ArrayList<>();
@@ -2051,30 +2106,6 @@ class JSONConstructor {
         return null;
     }
 
-    static RFIDSessionDataStatus RFIDSessionDataStatusFromJSON(JSONObject input) {
-        try {
-            RFIDSessionDataStatus result = new RFIDSessionDataStatus();
-            if (input.has("AA"))
-                result.AA = input.getInt("AA");
-            if (input.has("BAC"))
-                result.BAC = input.getInt("BAC");
-            if (input.has("CA"))
-                result.CA = input.getInt("CA");
-            if (input.has("PA"))
-                result.PA = input.getInt("PA");
-            if (input.has("PACE"))
-                result.PACE = input.getInt("PACE");
-            if (input.has("TA"))
-                result.TA = input.getInt("TA");
-            if (input.has("overallStatus"))
-                result.overallStatus = input.getInt("overallStatus");
-            return result;
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
     static DocumentReaderBarcodeResult DocumentReaderBarcodeResultFromJSON(JSONObject input) {
         try {
             DocumentReaderBarcodeResult result = new DocumentReaderBarcodeResult();

package/src/android/RegulaConfig.java

@@ -6,9 +6,11 @@ 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.content.Context;
@@ -59,8 +61,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 +73,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"))
@@ -103,6 +101,10 @@ class RegulaConfig {
             editor.setManualMultipageMode(opts.getBoolean("manualMultipageMode"));
         if (opts.has("exposure"))
             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();
     }
@@ -331,6 +333,8 @@ class RegulaConfig {
             editor.setHologramAnimationImageMatrix(matrixFromFloatArray(floatArrayFromJson(opts.getJSONArray("hologramAnimationImageMatrix"))));
         if (opts.has("hologramAnimationImageScaleType"))
             editor.setHologramAnimationImageScaleType(ScaleType.valueOf(opts.getString("hologramAnimationImageScaleType")));
+        if (opts.has("uiCustomizationLayer"))
+            editor.setUiCustomizationLayer(opts.getJSONObject("uiCustomizationLayer"));
 
         editor.applyImmediately(context);
     }
@@ -345,14 +349,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());
@@ -371,6 +373,7 @@ class RegulaConfig {
         object.put("recordScanningProcess", functionality.doRecordProcessingVideo());
         object.put("manualMultipageMode", functionality.isManualMultipageMode());
         object.put("exposure", functionality.getExposure());
+        object.put("rfidTimeout", functionality.getRfidTimeout());
 
         return object;
     }
@@ -435,6 +438,7 @@ class RegulaConfig {
         object.put("hologramAnimationPositionMultiplier", customization.getHologramAnimationPositionMultiplier());
         object.put("hologramAnimationImageMatrix", customization.getHologramAnimationImageMatrix());
         object.put("hologramAnimationImageScaleType", customization.getHologramAnimationImageScaleType());
+        object.put("uiCustomizationLayer", customization.getUiCustomizationLayer());
 
         return object;
     }
@@ -597,6 +601,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 {
@@ -643,4 +651,42 @@ 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);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

package/src/android/build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-	implementation ('com.regula.documentreader:api:6.3.6939'){
+	implementation ('com.regula.documentreader:api:6.5.7488'){
         transitive = true
     }
 }

package/src/ios/RGLDocumentReader.m

@@ -178,6 +178,8 @@ typedef void (^Callback)(NSString* response);
         [self startRFIDReader :successCallback :errorCallback];
     else if([action isEqualToString:@"stopRFIDReader"])
         [self stopRFIDReader :successCallback :errorCallback];
+    else if([action isEqualToString:@"stopRFIDReaderWithErrorMessage"])
+        [self stopRFIDReaderWithErrorMessage :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"stopScanner"])
         [self stopScanner :successCallback :errorCallback];
     else if([action isEqualToString:@"deinitializeReader"])
@@ -234,6 +236,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"])
@@ -246,20 +250,16 @@ 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:@"recognizeImageFrame"])
-        [self recognizeImageFrame :[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"])
         [self recognizeVideoFrame :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"showScannerWithCameraIDAndOpts"])
         [self showScannerWithCameraIDAndOpts :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
-    else if([action isEqualToString:@"recognizeImageWithImageInputParams"])
-        [self recognizeImageWithImageInputParams :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImageWithCameraMode"])
         [self recognizeImageWithCameraMode :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
+    else if([action isEqualToString:@"recognizeImagesWithImageInputs"])
+        [self recognizeImagesWithImageInputs :[args objectAtIndex:0] :successCallback :errorCallback];
     else
         [self result:[NSString stringWithFormat:@"%@/%@", @"method not implemented: ", action] :errorCallback];
 }
@@ -282,8 +282,10 @@ typedef void (^Callback)(NSString* response);
     [self result:@"showScannerWithCameraID() is an android-only method" :errorCallback];
 }
 
-- (void) recognizeImageFrame:(NSString*)base64 :(NSDictionary*)opts :(Callback)successCallback :(Callback)errorCallback{
-    [self result:@"recognizeImageFrame() is an android-only method" :errorCallback];
+- (void) stopRFIDReaderWithErrorMessage:(NSMutableString*)message :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared stopRFIDReaderWithErrorMessage:message completion:^() {
+        [self result:@"" :successCallback];
+    }];
 }
 
 - (void) recognizeImageWithOpts:(NSString*)base64 :(NSDictionary*)opts :(Callback)successCallback :(Callback)errorCallback{
@@ -298,20 +300,12 @@ typedef void (^Callback)(NSString* response);
     [self result:@"showScannerWithCameraIDAndOpts() is an android-only method" :errorCallback];
 }
 
-- (void) recognizeImageWithImageInputParams:(NSString*)base64 :(NSDictionary*)params :(Callback)successCallback :(Callback)errorCallback{
-    [self result:@"recognizeImageWithImageInputParams() is an android-only method" :errorCallback];
-}
-
 - (void) getLicenseMessage:(Callback)successCallback :(Callback)errorCallback{
     [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{
@@ -358,6 +352,10 @@ typedef void (^Callback)(NSString* response);
     [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)
@@ -367,6 +365,15 @@ typedef void (^Callback)(NSString* response);
         });
 }
 
+- (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]];
+        });
+}
+
 - (void) recognizeImageWithCameraMode:(NSMutableString*)base64 :(BOOL)cameraMode :(Callback)successCallback :(Callback)errorCallback{
     [self recognizeImageWith :base64 :cameraMode :successCallback :errorCallback];
 }

package/src/ios/RGLWJSONConstructor.h

@@ -12,6 +12,8 @@
 +(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;
 +(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)action;

package/src/ios/RGLWJSONConstructor.m

@@ -35,6 +35,42 @@
     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)
+        pageIndex = [[input valueForKey:@"pageIndex"] integerValue];
+    NSInteger light = 6;
+    if([input valueForKey:@"light"] != nil)
+        pageIndex = [[input valueForKey:@"light"] integerValue];
+    if([input valueForKey:@"bitmap"] != nil){
+        UIImage* image = [UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:[input valueForKey:@"bitmap"] options:NSDataBase64DecodingIgnoreUnknownCharacters]];
+        return [[RGLImageInput alloc] initWithImage:image light:light pageIndex:pageIndex];
+    }
+    return nil;
+}
+
 +(NSMutableDictionary*)generateCGPoint:(CGPoint)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
 
@@ -107,6 +143,9 @@
         case RGLDocReaderActionError:
             result = 3;
             break;
+        case RGLDocReaderActionProcessTimeout:
+            result = 10;
+            break;
         default:
             break;
     }
@@ -118,7 +157,7 @@
     NSInteger result = 0;
     switch (input) {
         case RGLRFIDCompleteActionComplete:
-            result = 10;
+            result = 999;
             break;
         case RGLRFIDCompleteActionError:
             result = 3;
@@ -136,6 +175,29 @@
     return result;
 }
 
++(NSNumber*)generateRGLImageQualityCheckType:(RGLImageQualityCheckType)value {
+    if(value == RGLImageQualityCheckTypeImageGlares)
+        return @0;
+    else if(value == RGLImageQualityCheckTypeImageFocus)
+        return @1;
+    else if(value == RGLImageQualityCheckTypeImageResolution)
+        return @2;
+    else if(value == RGLImageQualityCheckTypeImageColorness)
+        return @3;
+    else if(value == RGLImageQualityCheckTypeImagePerspective)
+        return @4;
+    else if(value == RGLImageQualityCheckTypeImageBounds)
+        return @5;
+    else if(value == RGLImageQualityCheckTypeScreenCapture)
+        return @6;
+    else if(value == RGLImageQualityCheckTypePortrait)
+        return @7;
+    else if(value == RGLImageQualityCheckTypeHandwritten)
+        return @8;
+    else
+        return @0;
+}
+
 +(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)input {
     return 5;
 }
@@ -155,6 +217,9 @@
         case 3:
             result[@"results"] = [self generateRGLDocumentReaderResults:results];
             break;
+        case 10:
+            result[@"results"] = [self generateRGLDocumentReaderResults:results];
+            break;
         case 5:
             result[@"results"] = [self generateResultsWithNotification:[self generateRGLRFIDNotify:notify]];
             break;
@@ -164,7 +229,7 @@
         case 8:
             result[@"results"] = [self generateRGLDocumentReaderResults:results];
             break;
-        case 10:
+        case 999:
             result[@"results"] = [self generateResultsWithRFID :results :1];
             action = 1;
             break;
@@ -251,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);
@@ -400,7 +463,7 @@
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;
 
-    result[@"type"] = input.type;
+    result[@"type"] = [self generateRGLImageQualityCheckType:input.type];
     result[@"result"] = @(input.result);
     result[@"featureType"] = @(input.featureType);
     result[@"boundRects"] = [self generateNSArrayCGRect:input.boundRects];
@@ -571,7 +634,6 @@
     result[@"status"] = @(input.status);
     result[@"extLeSupport"] = @(input.extLeSupport);
     result[@"processTime"] = @(input.processTime);
-    result[@"sessionDataStatus"] = [self generateRGLRFIDSessionDataStatus:input.sessionDataStatus];
 
     return result;
 }

package/src/ios/RegulaConfig.m

@@ -447,6 +447,37 @@
     return group;
 }
 
++(RGLOnlineProcessingConfig*)RGLOnlineProcessingConfigFromJSON:(NSDictionary*)dict {
+    if([dict valueForKey:@"mode"] == nil) return nil;
+
+    RGLOnlineProcessingConfig *result = [[RGLOnlineProcessingConfig alloc] initWithMode:[[dict valueForKey:@"mode"] integerValue]];
+
+    if([dict valueForKey:@"imageFormat"] != nil)
+        result.imageFormat = [[dict valueForKey:@"imageFormat"] integerValue];
+    if([dict valueForKey:@"url"] != nil)
+        result.serviceURL = [dict valueForKey:@"url"];
+    if([dict valueForKey:@"imageCompressionQuality"] != nil)
+        result.imageCompressionQuality = [[dict valueForKey:@"imageCompressionQuality"] floatValue];
+    if([dict valueForKey:@"processParams"] != nil) {
+        RGLProcessParams *params = [RGLProcessParams new];
+        [self setProcessParams:[dict valueForKey:@"processParams"] :params];
+        result.processParams = params;
+    }
+
+    return result;
+}
+
++(RGLReprocParams*)RGLReprocParamsFromJSON:(NSDictionary*)dict {
+    RGLReprocParams *result = [RGLReprocParams new];
+
+    if([dict valueForKey:@"serviceUrl"] != nil)
+        result.serviceURL = [dict valueForKey:@"serviceUrl"];
+    if([dict valueForKey:@"failIfNoService"] != nil)
+        result.failIfNoService = [dict valueForKey:@"failIfNoService"];
+
+    return result;
+}
+
 +(void)setCustomization:(NSDictionary*)options :(RGLCustomization*)customization {
     if([options valueForKey:@"cameraFrameBorderWidth"] != nil)
         customization.cameraFrameBorderWidth = [[options valueForKey:@"cameraFrameBorderWidth"] floatValue];
@@ -550,6 +581,8 @@
         customization.hologramAnimationPositionMultiplier = [[options valueForKey:@"hologramAnimationPositionMultiplier"] floatValue];
     if([options valueForKey:@"hologramAnimationImage"] != nil)
         customization.hologramAnimationImage = [self imageFromBase64:[options valueForKey:@"hologramAnimationImage"]];
+    if([options valueForKey:@"uiCustomizationLayer"] != nil)
+        customization.customUILayerJSON = [options valueForKey:@"uiCustomizationLayer"];
 }
 
 +(void)setFunctionality:(NSDictionary*)options :(RGLFunctionality*)functionality {
@@ -588,10 +621,6 @@
         functionality.singleResult = [[options valueForKey:@"singleResult"] boolValue];
     if([options valueForKey:@"cameraPosition"] != nil)
         functionality.cameraPosition = [self AVCaptureDevicePositionWithNSInteger:[[options valueForKey:@"cameraPosition"] integerValue]];
-    if([options valueForKey:@"onlineMode"] != nil)
-        functionality.onlineMode = [[options valueForKey:@"onlineMode"] boolValue];
-    if([options valueForKey:@"serviceURL"] != nil)
-        functionality.serviceURL = [[options valueForKey:@"serviceURL"] stringValue];
     if([options valueForKey:@"btDeviceName"] != nil)
         functionality.btDeviceName = [[options valueForKey:@"btDeviceName"] stringValue];
     if([options valueForKey:@"useAuthenticator"] != nil)
@@ -612,6 +641,8 @@
         functionality.recordScanningProcess = [[options valueForKey:@"recordScanningProcess"] boolValue];
     if([options valueForKey:@"manualMultipageMode"] != nil)
         functionality.manualMultipageMode = [[options valueForKey:@"manualMultipageMode"] boolValue];
+    if([options valueForKey:@"onlineProcessingConfiguration"] != nil)
+        functionality.onlineProcessingConfig = [self RGLOnlineProcessingConfigFromJSON:[options valueForKey:@"onlineProcessingConfiguration"]];;
 }
 
 +(void)setProcessParams:(NSDictionary*)options :(RGLProcessParams*)processParams {
@@ -755,6 +786,7 @@
     result[@"toolbarSize"] = [NSNumber numberWithFloat:customization.toolbarSize];
     result[@"hologramAnimationImageContentMode"] = [NSNumber numberWithInteger:[self NSIntegerWithUIViewContentMode:customization.hologramAnimationImageContentMode]];
     result[@"hologramAnimationPositionMultiplier"] = [NSNumber numberWithFloat:customization.hologramAnimationPositionMultiplier];
+    result[@"uiCustomizationLayer"] = customization.customUILayerJSON;
     result[@"hologramAnimationImage"] = [UIImageJPEGRepresentation(customization.hologramAnimationImage, 1.0) base64EncodedStringWithOptions:0];
     if(customization.customLabelStatus != nil)
         result[@"customLabelStatus"] = customization.customLabelStatus.string;
@@ -794,8 +826,6 @@
     result[@"videoSessionPreset"] = [NSNumber numberWithInteger:[self NSIntegerWithAVCaptureSessionPreset:functionality.videoSessionPreset]];
     result[@"videoCaptureMotionControl"] = [NSNumber numberWithBool:functionality.videoCaptureMotionControl];
     result[@"orientation"] = [NSNumber numberWithInteger:[self NSIntegerWithUIInterfaceOrientationMask:functionality.orientation]];
-    result[@"onlineMode"] = [NSNumber numberWithBool:functionality.onlineMode];
-    result[@"serviceURL"] = functionality.serviceURL;
     result[@"cameraPosition"] = [NSNumber numberWithInteger:[self NSIntegerWithAVCaptureDevicePosition:functionality.cameraPosition]];
     result[@"btDeviceName"] = functionality.btDeviceName;
     result[@"useAuthenticator"] = [NSNumber numberWithBool:functionality.isUseAuthenticator];
@@ -966,6 +996,10 @@
         rfidScenario.authorizedInstallCert = [[options valueForKey:@"authorizedInstallCert"] boolValue];
     if([options valueForKey:@"authorizedInstallQCert"] != nil)
         rfidScenario.authorizedInstallQCert = [[options valueForKey:@"authorizedInstallQCert"] boolValue];
+    if([options valueForKey:@"reprocessParams"] != nil)
+        rfidScenario.reprocParams = [self RGLReprocParamsFromJSON: [options valueForKey:@"reprocessParams"]];
+    if([options valueForKey:@"defaultReadingBufferSize"] != nil)
+        rfidScenario.defaultReadingBufferSize = [[options valueForKey:@"defaultReadingBufferSize"] intValue];
 }
 
 @end