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

package/example/package.json

@@ -13,11 +13,11 @@
   "author": "Regula Forensics Inc.",
   "license": "commercial",
   "dependencies": {
-    "cordova-android": "^9.0.0",
-    "cordova-ios": "^6.1.1",
+    "cordova-android": "^10.1.1",
+    "cordova-ios": "^6.2.0",
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "@regulaforensics/cordova-plugin-document-reader-api": "^6.4.0",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.4.0",
+    "@regulaforensics/cordova-plugin-document-reader-api": "6.5.0",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "6.5.0",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-image-picker": "^1.1.3",
     "cordova-plugin-android-permissions": "1.1.0",
@@ -47,4 +47,4 @@
   "devDependencies": {
     "cordova-plugin-whitelist": "^1.3.4"
   }
-}
+}

package/example/www/js/index.js

@@ -1,9 +1,9 @@
 var app = {
-    initialize: function() {
+    initialize: function () {
         document.addEventListener('deviceready', this.onDeviceReady.bind(this), false)
     },
 
-    onDeviceReady: function() {
+    onDeviceReady: function () {
         this.receivedEvent('deviceready')
         document.getElementById("status").innerHTML = "loading......"
         document.getElementById("status").style.backgroundColor = "grey"
@@ -14,13 +14,14 @@ var app = {
         var doRfid = false
         var encryption = false
         const ENCRYPTED_RESULT_SERVICE = "https://api.regulaforensics.com/api/process"
+        var isReadingRfidCustomUi = false
         var isReadingRfid = false
         var rfidUIHeader = "Reading RFID"
         var rfidUIHeaderColor = "black"
         var rfidDescription = "Place your phone on top of the NFC tag"
         var rfidProgress = -1
-        document.getElementById("rfidUI").style.display = isReadingRfid ? "" : "none"
-        document.getElementById("mainUI").style.display = !isReadingRfid ? "" : "none"
+        document.getElementById("rfidUI").style.display = isReadingRfidCustomUi ? "" : "none"
+        document.getElementById("mainUI").style.display = !isReadingRfidCustomUi ? "" : "none"
         document.getElementById("rfidUIHeader").innerHTML = rfidUIHeader
         document.getElementById("rfidUIHeader").style.color = rfidUIHeaderColor
         document.getElementById("rfidDescription").innerHTML = rfidDescription
@@ -35,7 +36,7 @@ var app = {
                 input.value = DocumentReaderScenario.fromJson(typeof scenarios[index] === "string" ? JSON.parse(scenarios[index]) : scenarios[index]).name
                 if (index == 0)
                     input.checked = true
-                input.onclick = function() { DocumentReader.setConfig({ processParams: { scenario: this.value } }, function(m) {}, function(e) {}) }
+                input.onclick = function () { DocumentReader.setConfig({ processParams: { scenario: this.value } }, function (m) { }, function (e) { }) }
                 input.style.display = "inline-block"
                 document.getElementById("scenariosRadioGroup").appendChild(input)
                 var label = document.createElement("span")
@@ -43,7 +44,7 @@ var app = {
                 label.style.display = "inline-block"
                 label.style.width = "200px"
                 label.radioButton = input
-                label.onclick = function() { this.radioButton.click() }
+                label.onclick = function () { this.radioButton.click() }
                 document.getElementById("scenariosRadioGroup").appendChild(label)
                 document.getElementById("scenariosRadioGroup").appendChild(document.createElement("br"))
             }
@@ -51,25 +52,25 @@ var app = {
                 document.getElementById("rfidCheckbox").disabled = false
                 document.getElementById("rfidCheckboxText").style.color = "black"
                 document.getElementById("rfidCheckboxText").innerHTML = " Process rfid reading"
-                document.getElementById("rfidCheckboxText").onclick = function() { document.getElementById("rfidCheckbox").click() }
-                document.getElementById("rfidCheckbox").onchange = function() { doRfid = this.checked }
+                document.getElementById("rfidCheckboxText").onclick = function () { document.getElementById("rfidCheckbox").click() }
+                document.getElementById("rfidCheckbox").onchange = function () { doRfid = this.checked }
             }
             document.getElementById("encryptionCheckbox").disabled = false
             document.getElementById("encryptionCheckboxText").style.color = "black"
             document.getElementById("encryptionCheckboxText").innerHTML = " Data encryption"
-            document.getElementById("encryptionCheckboxText").onclick = function() { document.getElementById("encryptionCheckbox").click() }
-            document.getElementById("encryptionCheckbox").onchange = function() { encryption = this.checked }
+            document.getElementById("encryptionCheckboxText").onclick = function () { document.getElementById("encryptionCheckbox").click() }
+            document.getElementById("encryptionCheckbox").onchange = function () { encryption = this.checked }
         }
 
         function scan() {
-            DocumentReader.showScanner(function(m) {
+            DocumentReader.showScanner(function (m) {
                 handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m)))
-            }, function(e) {})
+            }, function (e) { })
         }
 
         function recognizeAndroid() {
             var permissions = cordova.plugins.permissions
-            permissions.checkPermission(permissions.READ_EXTERNAL_STORAGE, function(status) {
+            permissions.checkPermission(permissions.READ_EXTERNAL_STORAGE, function (status) {
                 if (status.hasPermission)
                     recognize()
                 else {
@@ -85,11 +86,11 @@ var app = {
 
         function stopRfid() {
             hideRfidUI()
-            DocumentReader.stopRFIDReader(function(e) {}, function(e) {})
+            DocumentReader.stopRFIDReader(function (e) { }, function (e) { })
         }
 
         function recognize() {
-            window.imagePicker.getPictures(function(results) {
+            window.imagePicker.getPictures(function (results) {
                 if (results.length > 0) {
                     clearResults()
                     document.getElementById("status").innerHTML = "copying image......"
@@ -97,46 +98,50 @@ var app = {
                 }
                 var images = []
                 for (var index in results)
-                    readFile(results[index], function(base64) {
+                    readFile(results[index], function (base64) {
                         document.getElementById("status").innerHTML = "processing image......"
                         document.getElementById("status").style.backgroundColor = "grey"
                         images.push(base64)
                         if (images.length === results.length)
-                            DocumentReader.recognizeImages(images, function(m) { handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m))) }, function(e) {})
+                            DocumentReader.recognizeImages(images, function (m) { handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m))) }, function (e) { })
                     })
-            }, function(e) {}, { maximumImagesCount: 10 })
+            }, function (e) { }, { maximumImagesCount: 10 })
         }
 
         function handleCompletion(completion) {
-            if (isReadingRfid && (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR))
+            if (isReadingRfidCustomUi && (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR))
                 hideRfidUI()
-            if (isReadingRfid && completion.action === Enum.DocReaderAction.NOTIFICATION)
+            if (isReadingRfidCustomUi && completion.action === Enum.DocReaderAction.NOTIFICATION)
                 updateRfidUI(completion.results.documentReaderNotification)
             if (completion.action === Enum.DocReaderAction.COMPLETE)
-                if (isReadingRfid)
+                if (isReadingRfidCustomUi)
                     if (completion.results.rfidResult !== 1)
                         restartRfidUI()
                     else {
                         hideRfidUI()
                         displayResults(completion.results)
                     }
-            else
+                else
+                    handleResults(completion.results)
+            if (completion.action === Enum.DocReaderAction.TIMEOUT)
                 handleResults(completion.results)
+            if(completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR)
+                isReadingRfid = false
         }
 
         function showRfidUI() {
             // show animation
-            isReadingRfid = true
-            document.getElementById("rfidUI").style.display = isReadingRfid ? "" : "none"
-            document.getElementById("mainUI").style.display = !isReadingRfid ? "" : "none"
+            isReadingRfidCustomUi = true
+            document.getElementById("rfidUI").style.display = isReadingRfidCustomUi ? "" : "none"
+            document.getElementById("mainUI").style.display = !isReadingRfidCustomUi ? "" : "none"
         }
 
         function hideRfidUI() {
             // show animation
             restartRfidUI()
-            isReadingRfid = false
-            document.getElementById("rfidUI").style.display = isReadingRfid ? "" : "none"
-            document.getElementById("mainUI").style.display = !isReadingRfid ? "" : "none"
+            isReadingRfidCustomUi = false
+            document.getElementById("rfidUI").style.display = isReadingRfidCustomUi ? "" : "none"
+            document.getElementById("mainUI").style.display = !isReadingRfidCustomUi ? "" : "none"
             rfidUIHeader = "Reading RFID"
             document.getElementById("rfidUIHeader").innerHTML = rfidUIHeader
             rfidUIHeaderColor = "black"
@@ -166,21 +171,21 @@ var app = {
             rfidProgress = results.value
             document.getElementById("rfidProgress").value = rfidProgress
             if (window.cordova.platformId === 'ios')
-                DocumentReader.setRfidSessionStatus(rfidDescription + "\n" + results.value + "%", function(e) {}, function(e) {})
+                DocumentReader.setRfidSessionStatus(rfidDescription + "\n" + results.value + "%", function (e) { }, function (e) { })
         }
 
         function customRFID() {
             showRfidUI()
-            DocumentReader.readRFID(function(m) { handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m))) }, function(e) {})
+            DocumentReader.readRFID(function (m) { handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m))) }, function (e) { })
         }
 
         function usualRFID() {
-            doRfid = false
+            isReadingRfid = true
             var notification = "rfidNotificationCompletionEvent"
             var paCert = "paCertificateCompletionEvent"
             var taCert = "taCertificateCompletionEvent"
             var taSig = "taSignatureCompletionEvent"
-            DocumentReader.startRFIDReader(function(m) {
+            DocumentReader.startRFIDReader(function (m) {
                 if (m.substring(0, notification.length) === notification) {
                     m = m.substring(notification.length, m.length)
                     console.log(notification + ": " + m)
@@ -195,48 +200,41 @@ var app = {
                     console.log(taSig + ": " + m)
                 } else
                     handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m)))
-            }, function(e) {})
+            }, function (e) { })
         }
 
         function handleResults(results) {
             clearResults()
-            if (doRfid && results != null && results.chipPage != 0) {
-                accessKey = results.getTextFieldValueByType(DocumentReader.Enum.eVisualFieldType.FT_MRZ_STRINGS)
-                if (accessKey != null && accessKey != "") {
-                    accessKey = accessKey.replace(/^/g, '').replace(/\n/g, '')
-                    DocumentReader.setRfidScenario({ mrz: accessKey, pacePasswordType: DocumentReader.Enum.eRFID_Password_Type.PPT_MRZ }, function(m) {}, function(e) {})
-                } else {
-                    accessKey = results.getTextFieldValueByType(DocumentReader.Enum.eVisualFieldType.FT_CARD_ACCESS_NUMBER)
-                    if (accessKey != null && accessKey != "")
-                        DocumentReader.setRfidScenario({ password: accessKey, pacePasswordType: DocumentReader.Enum.eRFID_Password_Type.PPT_CAN }, function(m) {}, function(e) {})
-                }
+            if (doRfid && !isReadingRfid && results != null && results.chipPage != 0) {
                 //customRFID()
                 usualRFID()
-            } else
-            if (encryption) {
-                var input = JSON.parse(results.rawResult)
-                var processParam = {
-                    alreadyCropped: true,
-                    scenario: "FullProcess"
-                }
-                var body = {
-                    List: input["ContainerList"]["List"],
-                    processParam: processParam
-                }
-                postRequest(body)
-            } else
-                displayResults(results)
+            } else {
+                isReadingRfid = false
+                if (encryption) {
+                    var input = JSON.parse(results.rawResult)
+                    var processParam = {
+                        alreadyCropped: true,
+                        scenario: "FullProcess"
+                    }
+                    var body = {
+                        List: input["ContainerList"]["List"],
+                        processParam: processParam
+                    }
+                    postRequest(body)
+                } else
+                    displayResults(results)
+            }
         }
 
         function postRequest(body) {
             document.getElementById("status").innerHTML = "Getting results from server......"
             document.getElementById("status").style.backgroundColor = "grey"
             http.setDataSerializer('utf8')
-            http.post(ENCRYPTED_RESULT_SERVICE, JSON.stringify(body), { "content-type": "application/json; utf-8" }, function(response) {
-                DocumentReader.parseCoreResults(response.data, function(m) {
-                    displayResults(DocumentReader.DocumentReaderResults.fromJson(JSON.parse(m)))
-                }, function(e) {})
-            }, function(response) {
+            http.post(ENCRYPTED_RESULT_SERVICE, JSON.stringify(body), { "content-type": "application/json; utf-8" }, function (response) {
+                DocumentReader.parseCoreResults(response.data, function (m) {
+                    displayResults(DocumentReaderResults.fromJson(JSON.parse(m)))
+                }, function (e) { })
+            }, function (response) {
                 console.error(response.error)
                 document.getElementById("status").innerHTML = "Something went wrong!"
                 document.getElementById("status").style.backgroundColor = "red"
@@ -259,8 +257,8 @@ var app = {
         }
 
         function addCertificates() {
-            window.resolveLocalFileSystemURL(cordova.file.applicationDirectory + "www/certificates/", function(fileSystem) {
-                fileSystem.createReader().readEntries(function(entries) {
+            window.resolveLocalFileSystemURL(cordova.file.applicationDirectory + "www/certificates/", function (fileSystem) {
+                fileSystem.createReader().readEntries(function (entries) {
                     for (var i in entries) {
                         var item = entries[i]
                         if (item.isFile) {
@@ -268,44 +266,47 @@ var app = {
                             var pkdResourceType = 0
                             if (findExt.length > 0)
                                 pkdResourceType = Enum.PKDResourceType.getType(findExt[findExt.length - 1].toLowerCase())
-                            readFile("www/certificates/" + item.name, function(file, resType) {
+                            readFile("www/certificates/" + item.name, function (file, resType) {
                                 resType = resType[0]
                                 var certificates = []
                                 certificates.push({
                                     'binaryData': file,
                                     'resourceType': resType
                                 })
-                                DocumentReader.addPKDCertificates(certificates, function(s) {
+                                DocumentReader.addPKDCertificates(certificates, function (s) {
                                     console.log("certificate added")
-                                }, function(e) { console.log(e) })
+                                }, function (e) { console.log(e) })
                             }, pkdResourceType)
                         }
                     }
-                }, function(err) { console.log(err) })
-            }, function(err) { console.log(err) })
+                }, function (err) { console.log(err) })
+            }, function (err) { console.log(err) })
         }
 
         function readFile(path, callback, ...items) {
             if (path.substring(0, 8) !== "file:///")
                 path = cordova.file.applicationDirectory + path
-            window.resolveLocalFileSystemURL(path, function(fileEntry) {
-                fileEntry.file(function(file) {
+            window.resolveLocalFileSystemURL(path, function (fileEntry) {
+                fileEntry.file(function (file) {
                     var reader = new FileReader()
-                    reader.onloadend = function(e) {
+                    reader.onloadend = function (e) {
                         callback(this.result.substring(this.result.indexOf(',') + 1), items)
                     }
                     reader.readAsDataURL(file)
                 })
-            }, function(e) { console.log(JSON.stringify(e)) })
+            }, function (e) { console.log(JSON.stringify(e)) })
         }
 
-        readFile("www/regula.license", function(license) {
-            DocumentReader.prepareDatabase("Full", function(message) {
+        readFile("www/regula.license", function (license) {
+            DocumentReader.prepareDatabase("Full", function (message) {
                 if (message != "database prepared")
                     document.getElementById("status").innerHTML = "Downloading database: " + message + "%"
                 else {
                     document.getElementById("status").innerHTML = "Loading......"
-                    DocumentReader.initializeReader(license, function(message) {
+                    DocumentReader.initializeReader({
+                        license: license,
+                        delayedNNLoad: true
+                    }, function (message) {
                         document.getElementById("status").innerHTML = "Ready"
                         document.getElementById("status").style.backgroundColor = "green"
                         document.getElementById("showScannerButton").addEventListener("click", scan)
@@ -326,23 +327,23 @@ var app = {
                                 scenario: "Mrz",
                                 doRfid: false,
                             },
-                        }, function(m) {}, function(e) {})
-                        DocumentReader.getAvailableScenarios(function(s) {
-                            DocumentReader.isRFIDAvailableForUse(function(r) { postInitialize(JSON.parse(s), r) }, function(e) {})
-                        }, function(e) {})
-                        DocumentReader.setRfidDelegate(Enum.RFIDDelegate.NO_PA, function(r) {}, function(e) {})
-                            // addCertificates()
-                    }, function(error) {
+                        }, function (m) { }, function (e) { })
+                        DocumentReader.getAvailableScenarios(function (s) {
+                            DocumentReader.isRFIDAvailableForUse(function (r) { postInitialize(JSON.parse(s), r) }, function (e) { })
+                        }, function (e) { })
+                        DocumentReader.setRfidDelegate(Enum.RFIDDelegate.NO_PA, function (r) { }, function (e) { })
+                        // addCertificates()
+                    }, function (error) {
                         console.log(error)
                         document.getElementById("status").innerHTML = error
                         document.getElementById("status").style.backgroundColor = "red"
                     })
                 }
-            }, function(e) { console.log(e) })
+            }, function (e) { console.log(e) })
         })
     },
 
-    receivedEvent: function(id) {
+    receivedEvent: function (id) {
         var parentElement = document.getElementById(id)
         var listeningElement = parentElement.querySelector('.listening')
         var receivedElement = parentElement.querySelector('.received')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "Cordova plugin for reading and validation of identification documents (API framework)",
   "cordova": {
     "id": "@regulaforensics/cordova-plugin-document-reader-api",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-document-reader-api" version="6.4.0"
+<plugin id="cordova-plugin-document-reader-api" version="6.5.0"
   xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
@@ -25,7 +25,7 @@
     <podspec>
       <config/>
       <pods>
-        <pod name="DocumentReader" spec="~> 6.4.2552" />
+        <pod name="DocumentReader" spec="~> 6.5.2633" />
       </pods>
     </podspec>
   </platform>

package/src/android/DocumentReader.java

@@ -25,12 +25,12 @@ import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreScenarioUtil;
 import com.regula.documentreader.api.params.DocReaderConfig;
 import com.regula.documentreader.api.params.ImageInputData;
-import com.regula.documentreader.api.params.ImageInputParam;
+import com.regula.documentreader.api.internal.params.ImageInputParam;
 import com.regula.documentreader.api.params.rfid.PKDCertificate;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
 import com.regula.documentreader.api.params.rfid.authorization.TAChallenge;
 import com.regula.documentreader.api.results.DocumentReaderResults;
-import com.regula.documentreader.api.parser.DocReaderResultsJsonParser;
+import com.regula.documentreader.api.internal.parser.DocReaderResultsJsonParser;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
@@ -315,6 +315,9 @@ public class DocumentReader extends CordovaPlugin {
                 case "recognizeImage":
                     recognizeImage(callback, args(0));
                     break;
+                case "recognizeData":
+                    recognizeData(callback, args(0));
+                    break;
                 case "setRfidSessionStatus":
                     setRfidSessionStatus(callback, args(0));
                     break;
@@ -333,9 +336,6 @@ public class DocumentReader extends CordovaPlugin {
                 case "setTCCParams":
                     setTCCParams(callback, args(0));
                     break;
-                case "initializeReaderWithDatabase":
-                    initializeReaderWithDatabase(callback, args(0), args(1));
-                    break;
                 case "recognizeImageWithOpts":
                     recognizeImageWithOpts(callback, args(0), args(1));
                     break;
@@ -500,16 +500,9 @@ public class DocumentReader extends CordovaPlugin {
         callback.success(Instance().isRFIDAvailableForUse());
     }
 
-    private void initializeReader(Callback callback, Object license) {
-        if (!Instance().isReady())
-            Instance().initializeReader(getContext(), new DocReaderConfig(Base64.decode(license.toString(), Base64.DEFAULT)), getInitCompletion(callback));
-        else
-            callback.success("already initialized");
-    }
-
-    private void initializeReaderWithDatabase(Callback callback, Object license, Object db) {
+    private void initializeReader(Callback callback, JSONObject config) {
         if (!Instance().isReady())
-            Instance().initializeReader(getContext(), new DocReaderConfig(Base64.decode(license.toString(), Base64.DEFAULT), Base64.decode(db.toString(), Base64.DEFAULT)), getInitCompletion(callback));
+            Instance().initializeReader(getContext(), JSONConstructor.DocReaderConfigFromJSON(config), getInitCompletion(callback));
         else
             callback.success("already initialized");
     }
@@ -534,6 +527,11 @@ public class DocumentReader extends CordovaPlugin {
         Instance().recognizeImage(Helpers.bitmapFromBase64(base64Image), getCompletion());
     }
 
+    private void recognizeData(@SuppressWarnings("unused") Callback callback, Object data) {
+        stopBackgroundRFID();
+        Instance().recognizeImage(Base64.decode(data.toString(), Base64.DEFAULT), getCompletion());
+    }
+
     private void recognizeImages(@SuppressWarnings("unused") Callback callback, JSONArray base64Images) throws JSONException {
         stopBackgroundRFID();
         Bitmap[] images = new Bitmap[base64Images.length()];

package/src/android/Helpers.java

@@ -10,7 +10,7 @@ import android.graphics.drawable.Drawable;
 import android.util.Base64;
 
 import com.regula.documentreader.api.enums.BarcodeType;
-import com.regula.documentreader.api.params.FaceMetaData;
+import com.regula.documentreader.api.internal.params.FaceMetaData;
 import com.regula.documentreader.api.results.Bounds;
 
 import org.json.JSONArray;

package/src/android/JSONConstructor.java

@@ -15,7 +15,8 @@ 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;
@@ -56,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;
@@ -361,6 +361,28 @@ 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;
@@ -920,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));
@@ -958,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;
@@ -1243,7 +1247,6 @@ class JSONConstructor {
         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);
@@ -2038,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<>();
@@ -2105,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();