@regulaforensics/cordova-plugin-document-reader-api 5.6.0 → 6.1.1

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.6.0",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^5.6.0",
+    "@regulaforensics/cordova-plugin-document-reader-api": "^6.1.1",
+    "@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() {
@@ -168,7 +176,26 @@ var app = {
 
         function usualRFID() {
             doRfid = false
-            DocumentReader.startRFIDReader(function (m) { handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m))) }, function (e) { })
+            var notification = "rfidNotificationCompletionEvent"
+            var paCert = "paCertificateCompletionEvent"
+            var taCert = "taCertificateCompletionEvent"
+            var taSig = "taSignatureCompletionEvent"
+            DocumentReader.startRFIDReader(function (m) {
+                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) {
+                    m = m.substring(paCert.length, m.length)
+                    console.log(paCert + ": " + m)
+                } 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) {
+                    m = m.substring(taSig.length, m.length)
+                    console.log(taSig + ": " + m)
+                } else
+                    handleCompletion(DocumentReader.DocumentReaderCompletion.fromJson(JSON.parse(m)))
+            }, function (e) { })
         }
 
         function handleResults(results) {
@@ -186,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) {
@@ -274,7 +327,8 @@ var app = {
                         DocumentReader.getAvailableScenarios(function (s) {
                             DocumentReader.isRFIDAvailableForUse(function (r) { postInitialize(JSON.parse(s), r) }, function (e) { })
                         }, function (e) { })
-                        addCertificates()
+                        DocumentReader.setRfidDelegate(Enum.RFIDDelegate.NO_PA, function (r) { }, function (e) { })
+                        // addCertificates()
                     }, function (error) {
                         console.log(error)
                         document.getElementById("status").innerHTML = error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "5.6.0",
+  "version": "6.1.1",
   "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.6.0"
+<plugin id="cordova-plugin-document-reader-api" version="6.1.1"
   xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
@@ -18,14 +18,14 @@
     </config-file>
     <header-file src="src/ios/RGLDocumentReader.h" />
     <source-file src="src/ios/RGLDocumentReader.m" />
-    <header-file src="src/ios/JSONConstructor.h" />
-    <source-file src="src/ios/JSONConstructor.m" />
+    <header-file src="src/ios/RGLWJSONConstructor.h" />
+    <source-file src="src/ios/RGLWJSONConstructor.m" />
     <header-file src="src/ios/RegulaConfig.h" />
     <source-file src="src/ios/RegulaConfig.m" />
     <podspec>
       <config/>
       <pods>
-        <pod name="DocumentReader" spec="~> 5.6.2001" />
+        <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,16 +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.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;
@@ -27,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;
 
@@ -38,6 +51,13 @@ public class DocumentReader extends CordovaPlugin {
     private boolean backgroundRFIDEnabled = false;
     private Activity activity;
     JSONArray data;
+    private IRfidPKDCertificateCompletion paCertificateCompletion;
+    private IRfidPKDCertificateCompletion taCertificateCompletion;
+    private IRfidTASignatureCompletion taSignatureCompletion;
+    private final static String rfidNotificationCompletionEvent = "rfidNotificationCompletionEvent";
+    private final static String paCertificateCompletionEvent = "paCertificateCompletionEvent";
+    private final static String taCertificateCompletionEvent = "taCertificateCompletionEvent";
+    private final static String taSignatureCompletionEvent = "taSignatureCompletionEvent";
     private static int databaseDownloadProgress = 0;
 
     private Context getContext() {
@@ -83,7 +103,7 @@ public class DocumentReader extends CordovaPlugin {
         callbackContext.sendPluginResult(pluginResult);
     }
 
-    private void sendCompletion(int action, DocumentReaderResults results, Throwable error) {
+    private void sendCompletion(int action, DocumentReaderResults results, DocumentReaderException error) {
         PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, JSONConstructor.generateCompletion(action, results, error, getContext()).toString());
         pluginResult.setKeepCallback(true);
         callbackContext.sendPluginResult(pluginResult);
@@ -95,6 +115,30 @@ public class DocumentReader extends CordovaPlugin {
         callbackContext.sendPluginResult(pluginResult);
     }
 
+    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);
+    }
+
+    private void sendPACertificateCompletion(byte[] serialNumber, PAResourcesIssuer issuer) {
+        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, paCertificateCompletionEvent + JSONConstructor.generatePACertificateCompletion(serialNumber, issuer).toString());
+        pluginResult.setKeepCallback(true);
+        callbackContext.sendPluginResult(pluginResult);
+    }
+
+    private void sendTACertificateCompletion(String keyCAR) {
+        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, taCertificateCompletionEvent + keyCAR);
+        pluginResult.setKeepCallback(true);
+        callbackContext.sendPluginResult(pluginResult);
+    }
+    private void sendTASignatureCompletion(TAChallenge challenge) {
+        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, taSignatureCompletionEvent + JSONConstructor.generateTAChallenge(challenge).toString());
+        pluginResult.setKeepCallback(true);
+        callbackContext.sendPluginResult(pluginResult);
+    }
+
+
     @Override
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
         this.callbackContext = callbackContext;
@@ -119,6 +163,9 @@ public class DocumentReader extends CordovaPlugin {
         };
         try {
             switch (action) {
+                case "initializeReaderAutomatically":
+                    initializeReaderAutomatically(callback);
+                    break;
                 case "getAPIVersion":
                     getAPIVersion(callback);
                     break;
@@ -224,6 +271,9 @@ public class DocumentReader extends CordovaPlugin {
                 case "getRfidSessionStatus":
                     getRfidSessionStatus(callback);
                     break;
+                case "setRfidDelegate":
+                    setRfidDelegate(callback, args(0));
+                    break;
                 case "setEnableCoreLogs":
                     setEnableCoreLogs(callback, args(0));
                     break;
@@ -263,9 +313,24 @@ public class DocumentReader extends CordovaPlugin {
                 case "setRfidSessionStatus":
                     setRfidSessionStatus(callback, args(0));
                     break;
+                case "providePACertificates":
+                    providePACertificates(callback, args(0));
+                    break;
+                case "provideTACertificates":
+                    provideTACertificates(callback, args(0));
+                    break;
+                case "provideTASignature":
+                    provideTASignature(callback, args(0));
+                    break;
+                case "parseCoreResults":
+                    parseCoreResults(callback, args(0));
+                    break;
                 case "initializeReaderWithDatabasePath":
                     initializeReaderWithDatabasePath(callback, args(0), args(1));
                     break;
+                case "initializeReaderWithDatabase":
+                    initializeReaderWithDatabase(callback, args(0), args(1));
+                    break;
                 case "recognizeImageFrame":
                     recognizeImageFrame(callback, args(0), args(1));
                     break;
@@ -300,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);
     }
@@ -311,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);
     }
@@ -369,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) {
@@ -395,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) {
@@ -407,8 +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().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");
     }
@@ -509,7 +604,12 @@ public class DocumentReader extends CordovaPlugin {
 
     private void startRFIDReader(@SuppressWarnings("unused") Callback callback) {
         stopBackgroundRFID();
-        Instance().startRFIDReader(getContext(), getCompletion());
+        IRfidReaderRequest delegate = null;
+        if (rfidDelegate == RFIDDelegate.NO_PA)
+            delegate = getIRfidReaderRequestNoPA();
+        if (rfidDelegate == RFIDDelegate.FULL)
+            delegate = getIRfidReaderRequest();
+        Instance().startRFIDReader(getContext(), getCompletion(), delegate, this::sendIRfidNotificationCompletion);
     }
 
     private void stopRFIDReader(Callback callback) {
@@ -545,10 +645,52 @@ public class DocumentReader extends CordovaPlugin {
         startForegroundDispatch(getActivity());
     }
 
+    private void providePACertificates(Callback callback, JSONArray certificatesJSON) throws JSONException {
+        if (paCertificateCompletion == null) {
+            callback.error("paCertificateCompletion is null");
+            return;
+        }
+        PKDCertificate[] certificates = new PKDCertificate[certificatesJSON.length()];
+        for (int i = 0; i < certificatesJSON.length(); i++) {
+            JSONObject certificate = certificatesJSON.getJSONObject(i);
+            certificates[i] = new PKDCertificate(Base64.decode(certificate.get("binaryData").toString(), Base64.DEFAULT), certificate.getInt("resourceType"), certificate.has("privateKey") ? Base64.decode(certificate.get("privateKey").toString(), Base64.DEFAULT) : null);
+        }
+        paCertificateCompletion.onCertificatesReceived(certificates);
+        callback.success();
+    }
+
+    private void provideTACertificates(Callback callback, JSONArray certificatesJSON) throws JSONException {
+        if (taCertificateCompletion == null) {
+            callback.error("taCertificateCompletion is null");
+            return;
+        }
+        PKDCertificate[] certificates = new PKDCertificate[certificatesJSON.length()];
+        for (int i = 0; i < certificatesJSON.length(); i++) {
+            JSONObject certificate = certificatesJSON.getJSONObject(i);
+            certificates[i] = new PKDCertificate(Base64.decode(certificate.get("binaryData").toString(), Base64.DEFAULT), certificate.getInt("resourceType"), certificate.has("privateKey") ? Base64.decode(certificate.get("privateKey").toString(), Base64.DEFAULT) : null);
+        }
+        taCertificateCompletion.onCertificatesReceived(certificates);
+        callback.success();
+    }
+
+    private void provideTASignature(Callback callback, Object signature) {
+        if (taSignatureCompletion == null) {
+            callback.error("taSignatureCompletion is null");
+            return;
+        }
+        taSignatureCompletion.onSignatureReceived(Base64.decode(signature.toString(), Base64.DEFAULT));
+        callback.success();
+    }
+
     private void setCameraSessionIsPaused(Callback callback, @SuppressWarnings("unused") boolean ignored) {
         callback.error("setCameraSessionIsPaused() is an ios-only method");
     }
 
+    private void setRfidDelegate(Callback callback, int delegate) {
+        rfidDelegate = delegate;
+        callback.success();
+    }
+
     private void getCameraSessionIsPaused(Callback callback) {
         callback.error("getCameraSessionIsPaused() is an ios-only method");
     }
@@ -575,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();
         };
     }
@@ -609,4 +751,57 @@ public class DocumentReader extends CordovaPlugin {
                 callback.error("Init failed:" + error);
         };
     }
+
+    private IRfidReaderRequest getIRfidReaderRequest() {
+        return new IRfidReaderRequest() {
+            @Override
+            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, @NonNull IRfidPKDCertificateCompletion completion) {
+                taCertificateCompletion = completion;
+                sendTACertificateCompletion(keyCAR);
+            }
+
+            @Override
+            public void onRequestTASignature(TAChallenge challenge, @NonNull IRfidTASignatureCompletion completion) {
+                taSignatureCompletion = completion;
+                sendTASignatureCompletion(challenge);
+            }
+        };
+    }
+
+    private IRfidReaderRequest getIRfidReaderRequestNoPA() {
+        return new IRfidReaderRequest() {
+            @Override
+            public void onRequestPACertificates(byte[] serialNumber, PAResourcesIssuer issuer, @NonNull IRfidPKDCertificateCompletion completion) {
+                paCertificateCompletion = null;
+                completion.onCertificatesReceived(new PKDCertificate[0]);
+            }
+
+            @Override
+            public void onRequestTACertificates(String keyCAR, @NonNull IRfidPKDCertificateCompletion completion) {
+                taCertificateCompletion = completion;
+                sendTACertificateCompletion(keyCAR);
+            }
+
+            @Override
+            public void onRequestTASignature(TAChallenge challenge, @NonNull IRfidTASignatureCompletion completion) {
+                taSignatureCompletion = completion;
+                sendTASignatureCompletion(challenge);
+            }
+        };
+    }
+
+    private static int rfidDelegate = RFIDDelegate.NULL;
+
+    private static class RFIDDelegate {
+        public static final int NULL = 0;
+        public static final int NO_PA = 1;
+        public static final int FULL = 2;
+    }
 }

package/src/android/Helpers.java

@@ -17,7 +17,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,18 +24,21 @@ 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);
         return result;
     }
 
-    static Drawable drawableFromBase64(String base64, Context context) {
-        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(Base64.decode(base64.getBytes(), Base64.DEFAULT));
-        return Drawable.createFromResourceStream(context.getResources(), null, byteArrayInputStream, null);
+    static BitmapDrawable drawableFromBase64(String base64, Context context)
+    {
+        byte[] decodedByte = Base64.decode(base64, 0);
+        Bitmap bitmap =  BitmapFactory.decodeByteArray(decodedByte, 0, decodedByte.length);
+        float density = context.getResources().getDisplayMetrics().density;
+        int width = (int)(bitmap.getWidth()*density);
+        int height = (int)(bitmap.getHeight()*density);
+        return new BitmapDrawable(context.getResources(), Bitmap.createScaledBitmap(bitmap, width, height, false));
     }
 
     static Bitmap bitmapFromDrawable(Drawable drawable) {
@@ -132,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;
+    }
 }