@regulaforensics/cordova-plugin-document-reader-api 5.7.0 → 6.1.2

package/README.md

@@ -42,7 +42,7 @@ If you have issues with license verification when running the application, pleas
 6. You placed the `license` into the correct folder as described [here](#how-to-build-demo-application).
 
 ## Documentation
-You can find documentation on API [here](https://docs.regulaforensics.com/cordova).
+You can find documentation on API [here](https://docs.regulaforensics.com/develop/doc-reader-sdk/mobile/cordova).
 
 ## Additional information
 If you have any technical questions, feel free to [contact](mailto:cordova.support@regulaforensics.com) us or create issue [here](https://github.com/regulaforensics/DocumentReader-Cordova-Plugin/issues).

package/example/package.json

@@ -16,11 +16,12 @@
     "cordova-android": "^9.0.0",
     "cordova-ios": "^6.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "@regulaforensics/cordova-plugin-document-reader-api": "^5.7.0",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^5.7.0",
+    "@regulaforensics/cordova-plugin-document-reader-api": "^6.1.2",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.1.0",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-image-picker": "^1.1.3",
-    "cordova-plugin-android-permissions": "1.1.0"
+    "cordova-plugin-android-permissions": "1.1.0",
+    "cordova-plugin-advanced-http": "3.2.1"
   },
   "cordova": {
     "plugins": {
@@ -34,7 +35,8 @@
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": " "
       },
       "cordova-plugin-whitelist": {},
-      "cordova-plugin-android-permissions": {}
+      "cordova-plugin-android-permissions": {},
+      "cordova-plugin-advanced-http": {}
     },
     "platforms": [
       "android",

package/example/www/index.html

@@ -43,7 +43,7 @@
 
     <div>
         <div id="scenariosRadioGroup"
-             style="position: absolute; bottom: 100px; top: 225px; left: 75px; width:225px; padding: 5px; text-align:left; overflow: auto"/>
+             style="position: absolute; bottom: 140px; top: 225px; left: 75px; width:225px; padding: 5px; text-align:left; overflow: auto"/>
     </div>
 
     <div style="position: absolute; bottom: 10px; width: 100%; text-align: center; align-items: center">
@@ -52,6 +52,11 @@
                 id="rfidCheckboxText"
                 style="color: lightgrey"> Process rfid reading(unavailable)</span><br>
         </div>
+        <div id="encryptionDiv" style="flex-direction: row; padding: 5px">
+            <input id="encryptionCheckbox" type="checkbox" name="rfid" disabled><span
+                id="encryptionCheckboxText"
+                style="color: lightgrey"> Data encryption(unavailable)</span><br>
+        </div>
         <div style="flex-direction: row; padding: 10px">
             <button id="showScannerButton" style="margin-right: 20px">scan doc</button>
             <button id="showImagePicker" style="margin-left: 20px">scan image</button>

package/example/www/js/index.js

@@ -7,10 +7,13 @@ var app = {
         this.receivedEvent('deviceready')
         document.getElementById("status").innerHTML = "loading......"
         document.getElementById("status").style.backgroundColor = "grey"
+        var http = cordova.plugin.http
         var DocumentReaderResults = DocumentReader.DocumentReaderResults
         var DocumentReaderScenario = DocumentReader.DocumentReaderScenario
         var Enum = DocumentReader.Enum
         var doRfid = false
+        var encryption = false
+        const ENCRYPTED_RESULT_SERVICE = "https://api.regulaforensics.com/api/process"
         var isReadingRfid = false
         var rfidUIHeader = "Reading RFID"
         var rfidUIHeaderColor = "black"
@@ -47,10 +50,15 @@ var app = {
             if (canRfid) {
                 document.getElementById("rfidCheckbox").disabled = false
                 document.getElementById("rfidCheckboxText").style.color = "black"
-                document.getElementById("rfidCheckboxText").innerHTML = "Process rfid reading"
+                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("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 }
         }
 
         function scan() {
@@ -173,16 +181,16 @@ var app = {
             var taCert = "taCertificateCompletionEvent"
             var taSig = "taSignatureCompletionEvent"
             DocumentReader.startRFIDReader(function (m) {
-                if(m.substring(0, notification.length) === notification) {
+                if (m.substring(0, notification.length) === notification) {
                     m = m.substring(notification.length, m.length)
                     console.log(notification + ": " + m)
-                } else if(m.substring(0, paCert.length) === paCert) {
+                } else if (m.substring(0, paCert.length) === paCert) {
                     m = m.substring(paCert.length, m.length)
                     console.log(paCert + ": " + m)
-                } else if(m.substring(0, taCert.length) === taCert) {
+                } else if (m.substring(0, taCert.length) === taCert) {
                     m = m.substring(taCert.length, m.length)
                     console.log(taCert + ": " + m)
-                } else if(m.substring(0, taSig.length) === taSig) {
+                } else if (m.substring(0, taSig.length) === taSig) {
                     m = m.substring(taSig.length, m.length)
                     console.log(taSig + ": " + m)
                 } else
@@ -205,7 +213,33 @@ var app = {
                 //customRFID()
                 usualRFID()
             } else
-                displayResults(results)
+                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) {
+                console.error(response.error)
+                document.getElementById("status").innerHTML = "Something went wrong!"
+                document.getElementById("status").style.backgroundColor = "red"
+            })
         }
 
         function displayResults(results) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "5.7.0",
+  "version": "6.1.2",
   "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="5.7.0"
+<plugin id="cordova-plugin-document-reader-api" version="6.1.2"
   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="~> 5.7.2075" />
+        <pod name="DocumentReader" spec="~> 6.1.2374" />
       </pods>
     </podspec>
   </platform>

package/src/android/DocumentReader.java

@@ -1,5 +1,6 @@
 package cordova.plugin.documentreader;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -8,22 +9,26 @@ import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.nfc.NfcAdapter;
 import android.nfc.tech.IsoDep;
+import android.support.annotation.NonNull;
+import android.os.Bundle;
 import android.util.Base64;
 
 import com.regula.documentreader.api.completions.IDocumentReaderCompletion;
 import com.regula.documentreader.api.completions.IDocumentReaderInitCompletion;
 import com.regula.documentreader.api.completions.IDocumentReaderPrepareCompletion;
-import com.regula.documentreader.api.completions.IRfidNotificationCompletion;
 import com.regula.documentreader.api.completions.IRfidPKDCertificateCompletion;
 import com.regula.documentreader.api.completions.IRfidReaderRequest;
 import com.regula.documentreader.api.completions.IRfidTASignatureCompletion;
 import com.regula.documentreader.api.enums.DocReaderAction;
 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.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 org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
@@ -33,6 +38,8 @@ import org.json.JSONObject;
 import org.json.JSONException;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -108,8 +115,8 @@ public class DocumentReader extends CordovaPlugin {
         callbackContext.sendPluginResult(pluginResult);
     }
 
-    private void sendIRfidNotificationCompletion(int notification) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, rfidNotificationCompletionEvent + notification);
+    private void sendIRfidNotificationCompletion(int notification, Bundle value) {
+        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, rfidNotificationCompletionEvent + JSONConstructor.generateRfidNotificationCompletion(notification, value).toString());
         pluginResult.setKeepCallback(true);
         callbackContext.sendPluginResult(pluginResult);
     }
@@ -156,6 +163,9 @@ public class DocumentReader extends CordovaPlugin {
         };
         try {
             switch (action) {
+                case "initializeReaderAutomatically":
+                    initializeReaderAutomatically(callback);
+                    break;
                 case "getAPIVersion":
                     getAPIVersion(callback);
                     break;
@@ -312,6 +322,9 @@ public class DocumentReader extends CordovaPlugin {
                 case "provideTASignature":
                     provideTASignature(callback, args(0));
                     break;
+                case "parseCoreResults":
+                    parseCoreResults(callback, args(0));
+                    break;
                 case "initializeReaderWithDatabasePath":
                     initializeReaderWithDatabasePath(callback, args(0), args(1));
                     break;
@@ -352,6 +365,7 @@ public class DocumentReader extends CordovaPlugin {
         };
         Intent intent = new Intent(activity.getApplicationContext(), activity.getClass());
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        @SuppressLint("UnspecifiedImmutableFlag")
         PendingIntent pendingIntent = PendingIntent.getActivity(activity.getApplicationContext(), 0, intent, 0);
         NfcAdapter.getDefaultAdapter(getActivity()).enableForegroundDispatch(activity, pendingIntent, filters, techList);
     }
@@ -363,10 +377,32 @@ public class DocumentReader extends CordovaPlugin {
         backgroundRFIDEnabled = false;
     }
 
+    private void initializeReaderAutomatically(Callback callback) {
+        if (!Instance().isReady())
+            try {
+                InputStream is = getContext().getAssets().open("regula.license");
+                byte[] license = new byte[is.available()];
+                //noinspection ResultOfMethodCallIgnored
+                is.read(license);
+                Instance().initializeReader(getContext(), new DocReaderConfig(license), getInitCompletion(callback));
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+                callback.error("problem reading license(see logs)");
+            }
+        else
+            callback.success("already initialized");
+    }
+
     private void getAvailableScenarios(Callback callback) throws JSONException {
         callback.success(JSONConstructor.generateList(Instance().availableScenarios, JSONConstructor::generateDocumentReaderScenario).toString());
     }
 
+    private void parseCoreResults(Callback callback, String json) {
+        DocumentReaderResults results = (DocumentReaderResults) DocReaderResultsJsonParser.parseCoreResults(json).get("docReaderResults");
+        callback.success(JSONConstructor.generateDocumentReaderResults(results, getContext()).toString());
+    }
+
     private void getAPIVersion(Callback callback) {
         callback.success(Instance().version.api);
     }
@@ -421,11 +457,11 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void selectedScenario(Callback callback) {
-        callback.success(JSONConstructor.generateDocumentReaderScenarioFull(Instance().getScenario(Instance().processParams().getScenario())).toString());
+        callback.success(JSONConstructor.generateCoreDetailedScenario(CoreScenarioUtil.getScenario(Instance().processParams().getScenario())).toString());
     }
 
     private void getScenario(Callback callback, String scenario) {
-        callback.success(JSONConstructor.generateDocumentReaderScenarioFull(Instance().getScenario(scenario)).toString());
+        callback.success(JSONConstructor.generateCoreDetailedScenario(CoreScenarioUtil.getScenario(scenario)).toString());
     }
 
     private void getLicenseExpiryDate(Callback callback) {
@@ -447,11 +483,11 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void getDocumentReaderIsReady(Callback callback) {
-        callback.success(Instance().getDocumentReaderIsReady());
+        callback.success(Instance().isReady());
     }
 
     private void getDocumentReaderStatus(Callback callback) {
-        callback.success(Instance().getDocumentReaderStatus());
+        callback.success(Instance().isReady());
     }
 
     private void isRFIDAvailableForUse(Callback callback) {
@@ -459,15 +495,15 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void initializeReader(Callback callback, Object license) {
-        if (!Instance().getDocumentReaderIsReady())
-            Instance().initializeReader(getContext(), Base64.decode(license.toString(), Base64.DEFAULT), getInitCompletion(callback));
+        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) {
-        if (!Instance().getDocumentReaderIsReady())
-            Instance().initializeReader(getContext(), Base64.decode(license.toString(), Base64.DEFAULT), Base64.decode(db.toString(), Base64.DEFAULT), getInitCompletion(callback));
+        if (!Instance().isReady())
+            Instance().initializeReader(getContext(), new DocReaderConfig(Base64.decode(license.toString(), Base64.DEFAULT), Base64.decode(db.toString(), Base64.DEFAULT)), getInitCompletion(callback));
         else
             callback.success("already initialized");
     }
@@ -569,11 +605,11 @@ public class DocumentReader extends CordovaPlugin {
     private void startRFIDReader(@SuppressWarnings("unused") Callback callback) {
         stopBackgroundRFID();
         IRfidReaderRequest delegate = null;
-        if(rfidDelegate == RFIDDelegate.NO_PA)
+        if (rfidDelegate == RFIDDelegate.NO_PA)
             delegate = getIRfidReaderRequestNoPA();
-        if(rfidDelegate == RFIDDelegate.FULL)
+        if (rfidDelegate == RFIDDelegate.FULL)
             delegate = getIRfidReaderRequest();
-        Instance().startRFIDReader(getContext(), getCompletion(), delegate, getIRfidNotificationCompletion());
+        Instance().startRFIDReader(getContext(), getCompletion(), delegate, this::sendIRfidNotificationCompletion);
     }
 
     private void stopRFIDReader(Callback callback) {
@@ -681,7 +717,7 @@ public class DocumentReader extends CordovaPlugin {
     private IDocumentReaderCompletion getCompletion() {
         return (action, results, error) -> {
             sendCompletion(action, results, error);
-            if (action == DocReaderAction.ERROR || action == DocReaderAction.CANCEL || (action == DocReaderAction.COMPLETE && results.rfidResult == 1))
+            if (action == DocReaderAction.ERROR || action == DocReaderAction.CANCEL || (action == DocReaderAction.COMPLETE && results != null && results.rfidResult == 1))
                 stopBackgroundRFID();
         };
     }
@@ -719,20 +755,20 @@ public class DocumentReader extends CordovaPlugin {
     private IRfidReaderRequest getIRfidReaderRequest() {
         return new IRfidReaderRequest() {
             @Override
-            public void onRequestPACertificates(byte[] serialNumber, PAResourcesIssuer issuer, IRfidPKDCertificateCompletion completion) {
+            public void onRequestPACertificates(byte[] serialNumber, PAResourcesIssuer issuer, @NonNull IRfidPKDCertificateCompletion completion) {
                 paCertificateCompletion = completion;
                 completion.onCertificatesReceived(new PKDCertificate[0]);
                 sendPACertificateCompletion(serialNumber, issuer);
             }
 
             @Override
-            public void onRequestTACertificates(String keyCAR, IRfidPKDCertificateCompletion completion) {
+            public void onRequestTACertificates(String keyCAR, @NonNull IRfidPKDCertificateCompletion completion) {
                 taCertificateCompletion = completion;
                 sendTACertificateCompletion(keyCAR);
             }
 
             @Override
-            public void onRequestTASignature(TAChallenge challenge, IRfidTASignatureCompletion completion) {
+            public void onRequestTASignature(TAChallenge challenge, @NonNull IRfidTASignatureCompletion completion) {
                 taSignatureCompletion = completion;
                 sendTASignatureCompletion(challenge);
             }
@@ -742,19 +778,19 @@ public class DocumentReader extends CordovaPlugin {
     private IRfidReaderRequest getIRfidReaderRequestNoPA() {
         return new IRfidReaderRequest() {
             @Override
-            public void onRequestPACertificates(byte[] serialNumber, PAResourcesIssuer issuer, IRfidPKDCertificateCompletion completion) {
+            public void onRequestPACertificates(byte[] serialNumber, PAResourcesIssuer issuer, @NonNull IRfidPKDCertificateCompletion completion) {
                 paCertificateCompletion = null;
                 completion.onCertificatesReceived(new PKDCertificate[0]);
             }
 
             @Override
-            public void onRequestTACertificates(String keyCAR, IRfidPKDCertificateCompletion completion) {
+            public void onRequestTACertificates(String keyCAR, @NonNull IRfidPKDCertificateCompletion completion) {
                 taCertificateCompletion = completion;
                 sendTACertificateCompletion(keyCAR);
             }
 
             @Override
-            public void onRequestTASignature(TAChallenge challenge, IRfidTASignatureCompletion completion) {
+            public void onRequestTASignature(TAChallenge challenge, @NonNull IRfidTASignatureCompletion completion) {
                 taSignatureCompletion = completion;
                 sendTASignatureCompletion(challenge);
             }
@@ -768,9 +804,4 @@ public class DocumentReader extends CordovaPlugin {
         public static final int NO_PA = 1;
         public static final int FULL = 2;
     }
-
-
-    private IRfidNotificationCompletion getIRfidNotificationCompletion() {
-        return (notificationType, value) -> sendIRfidNotificationCompletion(notificationType);
-    }
 }

package/src/android/Helpers.java

@@ -24,9 +24,7 @@ import java.util.List;
 class Helpers {
     static Bitmap bitmapFromBase64(String base64) {
         byte[] decodedString = Base64.decode(base64, Base64.DEFAULT);
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inPreferredConfig = Bitmap.Config.RGB_565;
-        Bitmap result = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length, options);
+        Bitmap result = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length);
         int sizeMultiplier = result.getByteCount() / 5000000;
         if (result.getByteCount() > 5000000)
             result = Bitmap.createScaledBitmap(result, result.getWidth() / (int) Math.sqrt(sizeMultiplier), result.getHeight() / (int) Math.sqrt(sizeMultiplier), false);
@@ -136,4 +134,11 @@ class Helpers {
             result.add(jsonArray.optString(i));
         return result;
     }
+
+    static String[] stringArrayFromJson(JSONArray jsonArray) {
+        String[] result = new String[jsonArray.length()];
+        for (int i = 0; i < jsonArray.length(); i++)
+            result[i] = jsonArray.optString(i);
+        return result;
+    }
 }

package/src/android/JSONConstructor.java

@@ -1,9 +1,12 @@
 package cordova.plugin.documentreader;
 
+import static com.regula.documentreader.api.completions.IRfidNotificationCompletion.RFID_EXTRA_ERROR_CODE;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Rect;
+import android.os.Bundle;
 import android.util.Base64;
 
 import com.regula.documentreader.api.enums.DocReaderAction;
@@ -11,11 +14,13 @@ import com.regula.documentreader.api.enums.PDF417Info;
 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.rfid.authorization.PAAttribute;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
 import com.regula.documentreader.api.params.rfid.authorization.TAChallenge;
 import com.regula.documentreader.api.results.Bounds;
+import com.regula.documentreader.api.results.BytesData;
 import com.regula.documentreader.api.results.Coordinate;
 import com.regula.documentreader.api.results.DocReaderFieldRect;
 import com.regula.documentreader.api.results.DocumentReaderBarcodeField;
@@ -25,14 +30,15 @@ import com.regula.documentreader.api.results.DocumentReaderGraphicField;
 import com.regula.documentreader.api.results.DocumentReaderGraphicResult;
 import com.regula.documentreader.api.results.DocumentReaderNotification;
 import com.regula.documentreader.api.results.DocumentReaderResults;
+import com.regula.documentreader.api.results.DocumentReaderResultsStatus;
 import com.regula.documentreader.api.results.DocumentReaderScenario;
-import com.regula.documentreader.api.results.DocumentReaderScenarioFull;
 import com.regula.documentreader.api.results.DocumentReaderTextField;
 import com.regula.documentreader.api.results.DocumentReaderTextResult;
 import com.regula.documentreader.api.results.DocumentReaderValue;
 import com.regula.documentreader.api.results.ElementPosition;
 import com.regula.documentreader.api.results.ImageQuality;
 import com.regula.documentreader.api.results.ImageQualityGroup;
+import com.regula.documentreader.api.results.VDSNCData;
 import com.regula.documentreader.api.results.authenticity.DocumentReaderAuthenticityCheck;
 import com.regula.documentreader.api.results.authenticity.DocumentReaderAuthenticityElement;
 import com.regula.documentreader.api.results.authenticity.DocumentReaderAuthenticityResult;
@@ -294,6 +300,18 @@ class JSONConstructor {
         return result;
     }
 
+    static JSONObject generateRfidNotificationCompletion(int notification, Bundle value) {
+        JSONObject result = new JSONObject();
+        try {
+            result.put("notification", notification);
+            if(value != null)
+            result.put("value", value.get(RFID_EXTRA_ERROR_CODE));
+        } catch (JSONException ignored) {
+        }
+
+        return result;
+    }
+
     static JSONObject generatePACertificateCompletion(byte[] serialNumber, PAResourcesIssuer issuer) {
         JSONObject result = new JSONObject();
         try {
@@ -335,8 +353,6 @@ class JSONConstructor {
         JSONObject result = new JSONObject();
         if (input == null) return result;
         try {
-            result.put("uvTorch", input.uvTorch);
-            result.put("seriesProcessMode", input.seriesProcessMode);
             result.put("name", input.name);
             result.put("caption", input.caption);
             result.put("description", input.description);
@@ -346,7 +362,7 @@ class JSONConstructor {
         return result;
     }
 
-    static JSONObject generateDocumentReaderScenarioFull(DocumentReaderScenarioFull input) {
+    static JSONObject generateCoreDetailedScenario(CoreDetailedScenario input) {
         JSONObject result = new JSONObject();
         if (input == null) return result;
         try {
@@ -1039,6 +1055,92 @@ class JSONConstructor {
         return result;
     }
 
+    static JSONObject generateDocumentReaderResultsStatus(DocumentReaderResultsStatus input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("overallStatus", input.getOverallStatus());
+            result.put("optical", input.getOptical());
+            result.put("detailsOptical", generateDetailsOptical(input.getDetailsOptical()));
+            result.put("rfid", input.getRfid());
+            result.put("detailsRFID", generateDetailsRFID(input.getDetailsRFID()));
+            result.put("portrait", input.getPortrait());
+            result.put("stopList", input.getStopList());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    static JSONObject generateDetailsOptical(DocumentReaderResultsStatus.DetailsOptical input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("overallStatus", input.getOverallStatus());
+            result.put("mrz", input.getMrz());
+            result.put("text", input.getText());
+            result.put("docType", input.getDocType());
+            result.put("security", input.getSecurity());
+            result.put("imageQA", input.getImageQA());
+            result.put("expiry", input.getExpiry());
+            result.put("vds", input.getVds());
+            result.put("pagesCount", input.getPagesCount());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    static JSONObject generateDetailsRFID(DocumentReaderResultsStatus.DetailsRFID input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("pa", input.getPA());
+            result.put("ca", input.getCA());
+            result.put("aa", input.getAA());
+            result.put("ta", input.getTA());
+            result.put("bac", input.getBAC());
+            result.put("pace", input.getPACE());
+            result.put("overallStatus", input.getOverallStatus());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    static JSONObject generateVDSNCData(VDSNCData input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("type", input.getType());
+            result.put("version", input.getVersion());
+            result.put("issuingCountry", input.getIssuingCountry());
+            result.put("message", input.getMessage());
+            result.put("signatureAlgorithm", input.getSignatureAlg());
+            result.put("signature", generateBytesData(input.getSignature()));
+            result.put("certificate", generateBytesData(input.getCertificate()));
+            result.put("certificateChain", generateList(input.getCertificateChain(), JSONConstructor::generateCertificateChain));
+            result.put("notifications", generateLongArray(input.getNotifications()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    static JSONObject generateBytesData(BytesData input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("data", input.getData());
+            result.put("length", input.getLength());
+            result.put("status", input.getStatus());
+            result.put("type", input.getType());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
     static JSONObject generateDocumentReaderResults(DocumentReaderResults input, Context context) {
         JSONObject result = new JSONObject();
         if (input == null) return result;
@@ -1063,6 +1165,8 @@ class JSONConstructor {
             result.put("authenticityResult", generateDocumentReaderAuthenticityResult(input.authenticityResult, context));
             result.put("barcodeResult", generateDocumentReaderBarcodeResult(input.barcodeResult));
             result.put("documentType", generateList(input.documentType, JSONConstructor::generateDocumentReaderDocumentType));
+            result.put("status", generateDocumentReaderResultsStatus(input.status));
+            result.put("vdsncData", generateVDSNCData(input.vdsncData));
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -1074,10 +1178,6 @@ class JSONConstructor {
     static DocumentReaderScenario DocumentReaderScenarioFromJSON(JSONObject input) {
         try {
             DocumentReaderScenario result = new DocumentReaderScenario();
-            if (input.has("uvTorch"))
-                result.uvTorch = input.getBoolean("uvTorch");
-            if (input.has("seriesProcessMode"))
-                result.seriesProcessMode = input.getBoolean("seriesProcessMode");
             if (input.has("name"))
                 result.name = input.getString("name");
             if (input.has("caption"))
@@ -1091,9 +1191,9 @@ class JSONConstructor {
         return null;
     }
 
-    static DocumentReaderScenarioFull DocumentReaderScenarioFullFromJSON(JSONObject input) {
+    static CoreDetailedScenario CoreDetailedScenarioFromJSON(JSONObject input) {
         try {
-            DocumentReaderScenarioFull result = new DocumentReaderScenarioFull();
+            CoreDetailedScenario result = new CoreDetailedScenario();
             if (input.has("uvTorch"))
                 result.uvTorch = input.getBoolean("uvTorch");
             if (input.has("frameOrientation"))