@regulaforensics/cordova-plugin-document-reader-api 6.8.1 → 6.9.1

package/src/android/DocumentReader.java

@@ -1,7 +1,12 @@
 package cordova.plugin.documentreader;
 
+import static com.regula.documentreader.api.DocumentReader.Instance;
+import static cordova.plugin.documentreader.Helpers.*;
+import static cordova.plugin.documentreader.JSONConstructor.*;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.LocaleManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -12,51 +17,53 @@ import android.graphics.Bitmap;
 import android.nfc.NfcAdapter;
 import android.nfc.tech.IsoDep;
 import android.os.Build;
-import android.os.Bundle;
+import android.os.LocaleList;
 import android.util.Base64;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.regula.documentreader.api.completions.ICheckDatabaseUpdate;
 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.completions.ITccParamsCompletion;
+import com.regula.documentreader.api.completions.rfid.IRfidPKDCertificateCompletion;
+import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion;
+import com.regula.documentreader.api.completions.rfid.IRfidReaderRequest;
+import com.regula.documentreader.api.completions.rfid.IRfidTASignatureCompletion;
+import com.regula.documentreader.api.completions.rfid.ITccParamsCompletion;
 import com.regula.documentreader.api.enums.DocReaderAction;
+import com.regula.documentreader.api.errors.DocReaderRfidException;
 import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreScenarioUtil;
+import com.regula.documentreader.api.internal.params.ImageInputParam;
+import com.regula.documentreader.api.internal.parser.DocReaderResultsJsonParser;
 import com.regula.documentreader.api.params.BleDeviceConfig;
 import com.regula.documentreader.api.params.DocReaderConfig;
 import com.regula.documentreader.api.params.ImageInputData;
-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.DocumentReaderGraphicField;
+import com.regula.documentreader.api.results.DocumentReaderNotification;
 import com.regula.documentreader.api.results.DocumentReaderResults;
 import com.regula.documentreader.api.results.DocumentReaderTextField;
-import com.regula.documentreader.api.internal.parser.DocReaderResultsJsonParser;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
-import org.json.JSONObject;
 import org.json.JSONException;
+import org.json.JSONObject;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import static com.regula.documentreader.api.DocumentReader.Instance;
-
-@SuppressWarnings({"ConstantConditions", "RedundantSuppression"})
+@SuppressWarnings({"ConstantConditions", "RedundantSuppression", "deprecation"})
 public class DocumentReader extends CordovaPlugin {
     private CallbackContext callbackContext;
     private boolean backgroundRFIDEnabled = false;
@@ -65,16 +72,30 @@ public class DocumentReader extends CordovaPlugin {
     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 final static String eventDatabaseProgress = "database_progress";
+    private final static String eventCompletion = "completion";
+    // These events have a method that is associated only with this event
+    private final static List<String> singleEvents = Arrays.asList(eventDatabaseProgress, eventCompletion);
+
+    private final static String rfidOnProgressEvent = "rfid_notification_completion";
+    private final static String rfidOnChipDetectedEvent = "rfidOnChipDetectedEvent";
+    private final static String rfidOnRetryReadChipEvent = "rfidOnRetryReadChipEvent";
+
+    private final static String eventPACertificateCompletion = "pa_certificate_completion";
+    private final static String eventTACertificateCompletion = "ta_certificate_completion";
+    private final static String eventTASignatureCompletion = "ta_signature_completion";
 
     private final static String bleOnServiceConnectedEvent = "bleOnServiceConnectedEvent";
     private final static String bleOnServiceDisconnectedEvent = "bleOnServiceDisconnectedEvent";
     private final static String bleOnDeviceReadyEvent = "bleOnDeviceReadyEvent";
 
+    private final static String eventVideoEncoderCompletion = "video_encoder_completion";
+    private final static String onCustomButtonTappedEvent = "onCustomButtonTappedEvent";
+    // These events are not working in cordova and ionic because they don't have a method
+    // associated with it. Callbacks are set automatically right after init.
+    private final static List<String> skippedEvents = Arrays.asList(eventVideoEncoderCompletion, onCustomButtonTappedEvent);
+
     private static int databaseDownloadProgress = 0;
 
     private Context getContext() {
@@ -89,7 +110,7 @@ public class DocumentReader extends CordovaPlugin {
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         if (intent.getAction() != null && intent.getAction().equals(NfcAdapter.ACTION_TECH_DISCOVERED) && backgroundRFIDEnabled)
-            Instance().readRFID(IsoDep.get(intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)), getCompletion());
+            Instance().readRFID(IsoDep.get(intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)), getRfidReaderCompletion());
     }
 
     @Override
@@ -114,75 +135,29 @@ public class DocumentReader extends CordovaPlugin {
         return (T) data.get(index);
     }
 
-    private void sendProgress(int progress) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, progress);
-        pluginResult.setKeepCallback(true);
-        callbackContext.sendPluginResult(pluginResult);
-    }
-
-    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);
-    }
-
-    private void sendVideoEncoderCompletion(String sessionId, File file) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, JSONConstructor.generateVideoEncoderCompletion(sessionId, file).toString());
-        pluginResult.setKeepCallback(true);
-        callbackContext.sendPluginResult(pluginResult);
-    }
-
-    private void sendIRfidNotificationCompletion(int notification, Bundle value) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, rfidNotificationCompletionEvent + JSONConstructor.generateRfidNotificationCompletion(notification, value));
-        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));
-        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));
-        pluginResult.setKeepCallback(true);
-        callbackContext.sendPluginResult(pluginResult);
-    }
-    private void sendBleOnServiceConnectedEvent(boolean isBleManagerConnected) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, bleOnServiceConnectedEvent + isBleManagerConnected);
-        pluginResult.setKeepCallback(true);
-        callbackContext.sendPluginResult(pluginResult);
-    }
-
-    private void sendBleOnServiceDisconnectedEvent() {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, bleOnServiceDisconnectedEvent);
-        pluginResult.setKeepCallback(true);
-        callbackContext.sendPluginResult(pluginResult);
-    }
-    private void sendBleOnDeviceReadyEvent() {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, bleOnDeviceReadyEvent);
-        pluginResult.setKeepCallback(true);
-        callbackContext.sendPluginResult(pluginResult);
-    }
-
-    private void sendOnCustomButtonTappedEvent(int tag) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, tag);
+    private void sendEvent(String event, Object data) {
+        PluginResult pluginResult;
+        String result;
+        if (data instanceof JSONObject || data instanceof JSONArray)
+            result = data.toString();
+        else
+            result = (String) data;
+        if (skippedEvents.contains(event))
+            return;
+        // Allows user to determine which event fired when there are more
+        // than one event associated with the function
+        if (!singleEvents.contains(event))
+            result = event + result;
+        pluginResult = new PluginResult(PluginResult.Status.OK, result);
         pluginResult.setKeepCallback(true);
         callbackContext.sendPluginResult(pluginResult);
     }
 
-
     @Override
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
         this.callbackContext = callbackContext;
         activity = cordova.getActivity();
-        action = (String)args.remove(0);
+        action = (String) args.remove(0);
         data = args;
         Callback callback = new Callback() {
             @Override
@@ -343,8 +318,11 @@ public class DocumentReader extends CordovaPlugin {
                 case "checkDatabaseUpdate":
                     checkDatabaseUpdate(callback, args(0));
                     break;
-                case "getScenario":
-                    getScenario(callback, args(0));
+                case "scan":
+                    scan(callback, args(0));
+                    break;
+                case "recognize":
+                    recognize(callback, args(0));
                     break;
                 case "recognizeImages":
                     recognizeImages(callback, args(0));
@@ -406,9 +384,6 @@ public class DocumentReader extends CordovaPlugin {
                 case "recognizeImagesWithImageInputs":
                     recognizeImagesWithImageInputs(callback, args(0));
                     break;
-                case "setOnCustomButtonTappedListener":
-                    setOnCustomButtonTappedListener(callback);
-                    break;
                 case "setLanguage":
                     setLanguage(callback, args(0));
                     break;
@@ -516,15 +491,15 @@ public class DocumentReader extends CordovaPlugin {
         BluetoothUtil.Companion.startBluetoothService(
                 getActivity(),
                 isBleManagerConnected -> {
-                    sendBleOnServiceConnectedEvent(isBleManagerConnected);
+                    sendEvent(bleOnServiceConnectedEvent, isBleManagerConnected);
                     return null;
                 },
                 () -> {
-                    sendBleOnServiceDisconnectedEvent();
+                    sendEvent(bleOnServiceDisconnectedEvent, "");
                     return null;
                 },
                 () -> {
-                    sendBleOnDeviceReadyEvent();
+                    sendEvent(bleOnDeviceReadyEvent, "");
                     return null;
                 }
         );
@@ -541,12 +516,12 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void getAvailableScenarios(Callback callback) throws JSONException {
-        callback.success(JSONConstructor.generateList(Instance().availableScenarios, JSONConstructor::generateDocumentReaderScenario).toString());
+        callback.success(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());
+        callback.success(generateDocumentReaderResults(results, getContext()).toString());
     }
 
     private void getAPIVersion(Callback callback) {
@@ -586,7 +561,7 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void setTCCParams(Callback callback, final JSONObject params) {
-        Instance().setTccParams(JSONConstructor.TCCParamsFromJSON(params), getTCCParamsCompletion(callback));
+        Instance().setTccParams(TCCParamsFromJSON(params), getTCCParamsCompletion(callback));
     }
 
     private void deinitializeReader(Callback callback) {
@@ -607,11 +582,7 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void selectedScenario(Callback callback) {
-        callback.success(JSONConstructor.generateCoreDetailedScenario(CoreScenarioUtil.getScenario(Instance().processParams().getScenario())).toString());
-    }
-
-    private void getScenario(Callback callback, String scenario) {
-        callback.success(JSONConstructor.generateCoreDetailedScenario(CoreScenarioUtil.getScenario(scenario)).toString());
+        callback.success(generateDocumentReaderScenario(CoreScenarioUtil.getScenario(Instance().processParams().getScenario())).toString());
     }
 
     private void getLicenseExpiryDate(Callback callback) {
@@ -625,7 +596,7 @@ public class DocumentReader extends CordovaPlugin {
         if (Instance().license().getCountryFilter() == null)
             callback.error("null");
         else
-            callback.success(JSONConstructor.generateList(Instance().license().getCountryFilter()).toString());
+            callback.success(generateList(Instance().license().getCountryFilter()).toString());
     }
 
     private void licenseIsRfidAvailable(Callback callback) {
@@ -646,7 +617,7 @@ public class DocumentReader extends CordovaPlugin {
 
     private void initializeReader(Callback callback, JSONObject config) {
         if (!Instance().isReady())
-            Instance().initializeReader(getContext(), JSONConstructor.DocReaderConfigFromJSON(config), getInitCompletion(callback));
+            Instance().initializeReader(getContext(), DocReaderConfigFromJSON(config), getInitCompletion(callback));
         else
             callback.success("already initialized");
     }
@@ -675,6 +646,16 @@ public class DocumentReader extends CordovaPlugin {
         callback.success();
     }
 
+    private void scan(@SuppressWarnings("unused") Callback callback, JSONObject config) {
+        stopBackgroundRFID();
+        Instance().showScanner(getContext(), ScannerConfigFromJSON(config), getCompletion());
+    }
+
+    private void recognize(@SuppressWarnings("unused") Callback callback, JSONObject config) {
+        stopBackgroundRFID();
+        Instance().recognize(getContext(), RecognizeConfigFromJSON(config), getCompletion());
+    }
+
     private void recognizeImageWithOpts(Callback callback, String base64Image, final JSONObject opts) throws JSONException {
         RegulaConfig.setConfig(Instance(), opts, getContext());
         recognizeImage(callback, base64Image);
@@ -694,7 +675,7 @@ public class DocumentReader extends CordovaPlugin {
         stopBackgroundRFID();
         Bitmap[] images = new Bitmap[base64Images.length()];
         for (int i = 0; i < images.length; i++)
-            images[i] = Helpers.bitmapFromBase64(base64Images.getString(i));
+            images[i] = bitmapFromBase64(base64Images.getString(i));
         Instance().recognizeImages(images, getCompletion());
     }
 
@@ -702,7 +683,7 @@ public class DocumentReader extends CordovaPlugin {
         stopBackgroundRFID();
         ImageInputData[] images = new ImageInputData[base64Images.length()];
         for (int i = 0; i < images.length; i++)
-            images[i] = JSONConstructor.ImageInputDataFromJSON(base64Images.getJSONObject(i));
+            images[i] = ImageInputDataFromJSON(base64Images.getJSONObject(i));
         Instance().recognizeImages(images, getCompletion());
     }
 
@@ -766,12 +747,7 @@ public class DocumentReader extends CordovaPlugin {
 
     private void startRFIDReader(@SuppressWarnings("unused") Callback callback) {
         stopBackgroundRFID();
-        IRfidReaderRequest delegate = null;
-        if (rfidDelegate == RFIDDelegate.NO_PA)
-            delegate = getIRfidReaderRequestNoPA();
-        if (rfidDelegate == RFIDDelegate.FULL)
-            delegate = getIRfidReaderRequest();
-        Instance().startRFIDReader(getContext(), getCompletion(), delegate, this::sendIRfidNotificationCompletion);
+        Instance().startRFIDReader(getContext(), getRfidReaderCompletion(), getRfidReaderRequest());
     }
 
     private void stopRFIDReader(Callback callback) {
@@ -807,18 +783,18 @@ public class DocumentReader extends CordovaPlugin {
         startForegroundDispatch(getActivity());
     }
 
-    private void setOnCustomButtonTappedListener(Callback callback) {
-        Instance().setOnClickListener(view -> sendOnCustomButtonTappedEvent((int) view.getTag()));
-        callback.success();
-    }
-
     private void setLanguage(Callback callback, String language) {
-        Locale locale = new Locale(language);
-        Locale.setDefault(locale);
-        Resources resources = getContext().getResources();
-        Configuration config = resources.getConfiguration();
-        config.setLocale(locale);
-        resources.updateConfiguration(config, resources.getDisplayMetrics());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            LocaleManager localeManager = (LocaleManager) getContext().getSystemService(Context.LOCALE_SERVICE);
+            localeManager.setApplicationLocales(new LocaleList(Locale.forLanguageTag(language)));
+        } else {
+            Locale locale = new Locale(language);
+            Locale.setDefault(locale);
+            Resources resources = getContext().getResources();
+            Configuration config = resources.getConfiguration();
+            config.setLocale(locale);
+            resources.updateConfiguration(config, resources.getDisplayMetrics());
+        }
         callback.success();
     }
 
@@ -900,7 +876,7 @@ public class DocumentReader extends CordovaPlugin {
         if (result == null)
             callback.success(null);
         else
-            callback.success(JSONConstructor.generateDocumentReaderTextField(result, getContext()).toString());
+            callback.success(generateDocumentReaderTextField(result, getContext()).toString());
     }
 
     private void textFieldByTypeLcid(Callback callback, String raw, int fieldType, int lcid) {
@@ -909,7 +885,7 @@ public class DocumentReader extends CordovaPlugin {
         if (result == null)
             callback.success(null);
         else
-            callback.success(JSONConstructor.generateDocumentReaderTextField(result, getContext()).toString());
+            callback.success(generateDocumentReaderTextField(result, getContext()).toString());
     }
 
     private void graphicFieldByTypeSource(Callback callback, String raw, int fieldType, int source) {
@@ -918,7 +894,7 @@ public class DocumentReader extends CordovaPlugin {
         if (result == null)
             callback.success(null);
         else
-            callback.success(JSONConstructor.generateDocumentReaderGraphicField(result, getContext()).toString());
+            callback.success(generateDocumentReaderGraphicField(result, getContext()).toString());
     }
 
     private void graphicFieldByTypeSourcePageIndex(Callback callback, String raw, int fieldType, int source, int pageIndex) {
@@ -927,7 +903,7 @@ public class DocumentReader extends CordovaPlugin {
         if (result == null)
             callback.success(null);
         else
-            callback.success(JSONConstructor.generateDocumentReaderGraphicField(result, getContext()).toString());
+            callback.success(generateDocumentReaderGraphicField(result, getContext()).toString());
     }
 
     private void graphicFieldByTypeSourcePageIndexLight(Callback callback, String raw, int fieldType, int source, int pageIndex, int light) {
@@ -936,34 +912,34 @@ public class DocumentReader extends CordovaPlugin {
         if (result == null)
             callback.success(null);
         else
-            callback.success(JSONConstructor.generateDocumentReaderGraphicField(result, getContext()).toString());
+            callback.success(generateDocumentReaderGraphicField(result, getContext()).toString());
     }
 
     private void graphicFieldImageByType(Callback callback, String raw, int fieldType) {
         DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
-        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType)));
+        callback.success(bitmapToBase64String(results.getGraphicFieldImageByType(fieldType)));
     }
 
     private void graphicFieldImageByTypeSource(Callback callback, String raw, int fieldType, int source) {
         DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
-        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source)));
+        callback.success(bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source)));
     }
 
     private void graphicFieldImageByTypeSourcePageIndex(Callback callback, String raw, int fieldType, int source, int pageIndex) {
         DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
-        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source, pageIndex)));
+        callback.success(bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source, pageIndex)));
     }
 
     private void graphicFieldImageByTypeSourcePageIndexLight(Callback callback, String raw, int fieldType, int source, int pageIndex, int light) {
         DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
-        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source, pageIndex, light)));
+        callback.success(bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source, pageIndex, light)));
     }
 
     @SuppressLint("WrongConstant")
     private void containers(Callback callback, String raw, JSONArray resultType) {
         try {
             DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
-            callback.success(results.getContainers(JSONConstructor.intArrayFromJSON(resultType)));
+            callback.success(results.getContainers(intArrayFromJSON(resultType)));
         } catch (JSONException e) {
             e.printStackTrace();
             callback.error(e.toString());
@@ -1003,24 +979,50 @@ public class DocumentReader extends CordovaPlugin {
 
     private IDocumentReaderCompletion getCompletion() {
         return (action, results, error) -> {
-            sendCompletion(action, results, error);
+            sendEvent(eventCompletion, generateCompletion(action, results, error, getContext()));
             if (action == DocReaderAction.ERROR || action == DocReaderAction.CANCEL || (action == DocReaderAction.COMPLETE && results != null && results.rfidResult == 1))
                 stopBackgroundRFID();
         };
     }
 
+    private IRfidReaderCompletion getRfidReaderCompletion() {
+        return new IRfidReaderCompletion() {
+            @Override
+            public void onCompleted(int action, @Nullable DocumentReaderResults results, @Nullable DocumentReaderException error) {
+                sendEvent(eventCompletion, generateCompletion(action, results, error, getContext()));
+                if (action == DocReaderAction.ERROR || action == DocReaderAction.CANCEL || (action == DocReaderAction.COMPLETE && results != null && results.rfidResult == 1))
+                    stopBackgroundRFID();
+            }
+
+            @Override
+            public void onChipDetected() {
+                sendEvent(rfidOnChipDetectedEvent, "");
+            }
+
+            @Override
+            public void onRetryReadChip(@NonNull DocReaderRfidException error) {
+                sendEvent(rfidOnRetryReadChipEvent, generateRegulaException(error));
+            }
+
+            @Override
+            public void onProgress(@Nullable DocumentReaderNotification notification) {
+                sendEvent(rfidOnProgressEvent, generateDocumentReaderNotification(notification));
+            }
+        };
+    }
+
     private IDocumentReaderPrepareCompletion getPrepareCompletion(Callback callback) {
         return new IDocumentReaderPrepareCompletion() {
             @Override
             public void onPrepareProgressChanged(int progress) {
                 if (progress != databaseDownloadProgress) {
-                    sendProgress(progress);
+                    sendEvent(eventDatabaseProgress, progress + "");
                     databaseDownloadProgress = progress;
                 }
             }
 
             @Override
-            public void onPrepareCompleted(boolean status, DocumentReaderException error) {
+            public void onPrepareCompleted(boolean status, @Nullable DocumentReaderException error) {
                 if (status)
                     callback.success("database prepared");
                 else
@@ -1032,7 +1034,8 @@ public class DocumentReader extends CordovaPlugin {
     private IDocumentReaderInitCompletion getInitCompletion(Callback callback) {
         return (success, error) -> {
             if (success) {
-                Instance().setVideoEncoderCompletion(this::sendVideoEncoderCompletion);
+                Instance().setVideoEncoderCompletion((sessionId, file) -> sendEvent(eventVideoEncoderCompletion, generateVideoEncoderCompletion(sessionId, file)));
+                Instance().setOnClickListener(view -> sendEvent(onCustomButtonTappedEvent, view.getTag()));
                 callback.success("init completed");
             } else
                 callback.error("Init failed:" + error);
@@ -1040,7 +1043,7 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private ICheckDatabaseUpdate getCheckDatabaseUpdateCompletion(Callback callback) {
-        return (database) -> callback.success(JSONConstructor.generateDocReaderDocumentsDatabase(database));
+        return (database) -> callback.success(generateDocReaderDocumentsDatabase(database));
     }
 
     private ITccParamsCompletion getTCCParamsCompletion(Callback callback) {
@@ -1057,20 +1060,19 @@ public class DocumentReader extends CordovaPlugin {
             @Override
             public void onRequestPACertificates(byte[] serialNumber, PAResourcesIssuer issuer, @NonNull IRfidPKDCertificateCompletion completion) {
                 paCertificateCompletion = completion;
-                completion.onCertificatesReceived(new PKDCertificate[0]);
-                sendPACertificateCompletion(serialNumber, issuer);
+                sendEvent(eventPACertificateCompletion, generatePACertificateCompletion(serialNumber, issuer));
             }
 
             @Override
             public void onRequestTACertificates(String keyCAR, @NonNull IRfidPKDCertificateCompletion completion) {
                 taCertificateCompletion = completion;
-                sendTACertificateCompletion(keyCAR);
+                sendEvent(eventTACertificateCompletion, keyCAR);
             }
 
             @Override
             public void onRequestTASignature(TAChallenge challenge, @NonNull IRfidTASignatureCompletion completion) {
                 taSignatureCompletion = completion;
-                sendTASignatureCompletion(challenge);
+                sendEvent(eventTASignatureCompletion, generateTAChallenge(challenge));
             }
         };
     }
@@ -1086,17 +1088,26 @@ public class DocumentReader extends CordovaPlugin {
             @Override
             public void onRequestTACertificates(String keyCAR, @NonNull IRfidPKDCertificateCompletion completion) {
                 taCertificateCompletion = completion;
-                sendTACertificateCompletion(keyCAR);
+                sendEvent(eventTACertificateCompletion, keyCAR);
             }
 
             @Override
             public void onRequestTASignature(TAChallenge challenge, @NonNull IRfidTASignatureCompletion completion) {
                 taSignatureCompletion = completion;
-                sendTASignatureCompletion(challenge);
+                sendEvent(eventTASignatureCompletion, generateTAChallenge(challenge));
             }
         };
     }
 
+    private IRfidReaderRequest getRfidReaderRequest() {
+        IRfidReaderRequest delegate = null;
+        if (rfidDelegate == RFIDDelegate.NO_PA)
+            delegate = getIRfidReaderRequestNoPA();
+        if (rfidDelegate == RFIDDelegate.FULL)
+            delegate = getIRfidReaderRequest();
+        return delegate;
+    }
+
     private static int rfidDelegate = RFIDDelegate.NULL;
 
     private static class RFIDDelegate {