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

package/src/android/DocumentReader.java

@@ -9,10 +9,12 @@ import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.nfc.NfcAdapter;
 import android.nfc.tech.IsoDep;
-import androidx.annotation.NonNull;
 import android.os.Bundle;
 import android.util.Base64;
 
+import androidx.annotation.NonNull;
+
+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;
@@ -23,13 +25,16 @@ import com.regula.documentreader.api.completions.ITccParamsCompletion;
 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.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.DocumentReaderResults;
+import com.regula.documentreader.api.results.DocumentReaderTextField;
 import com.regula.documentreader.api.internal.parser.DocReaderResultsJsonParser;
 
 import org.apache.cordova.CallbackContext;
@@ -57,9 +62,15 @@ public class DocumentReader extends CordovaPlugin {
     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 bleOnServiceConnectedEvent = "bleOnServiceConnectedEvent";
+    private final static String bleOnServiceDisconnectedEvent = "bleOnServiceDisconnectedEvent";
+    private final static String bleOnDeviceReadyEvent = "bleOnDeviceReadyEvent";
+
     private static int databaseDownloadProgress = 0;
 
     private Context getContext() {
@@ -118,13 +129,13 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void sendIRfidNotificationCompletion(int notification, Bundle value) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, rfidNotificationCompletionEvent + JSONConstructor.generateRfidNotificationCompletion(notification, value).toString());
+        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).toString());
+        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, paCertificateCompletionEvent + JSONConstructor.generatePACertificateCompletion(serialNumber, issuer));
         pluginResult.setKeepCallback(true);
         callbackContext.sendPluginResult(pluginResult);
     }
@@ -135,7 +146,23 @@ public class DocumentReader extends CordovaPlugin {
         callbackContext.sendPluginResult(pluginResult);
     }
     private void sendTASignatureCompletion(TAChallenge challenge) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, taSignatureCompletionEvent + JSONConstructor.generateTAChallenge(challenge).toString());
+        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);
     }
@@ -168,6 +195,18 @@ public class DocumentReader extends CordovaPlugin {
                 case "initializeReaderAutomatically":
                     initializeReaderAutomatically(callback);
                     break;
+                case "isBlePermissionsGranted":
+                    isBlePermissionsGranted(callback);
+                    break;
+                case "startBluetoothService":
+                    startBluetoothService(callback);
+                    break;
+                case "initializeReaderBleDeviceConfig":
+                    initializeReaderBleDeviceConfig(callback);
+                    break;
+                case "getTag":
+                    getTag(callback);
+                    break;
                 case "getAPIVersion":
                     getAPIVersion(callback);
                     break;
@@ -288,6 +327,12 @@ public class DocumentReader extends CordovaPlugin {
                 case "setCameraSessionIsPaused":
                     setCameraSessionIsPaused(callback, args(0));
                     break;
+                case "setTag":
+                    setTag(callback, args(0));
+                    break;
+                case "checkDatabaseUpdate":
+                    checkDatabaseUpdate(callback, args(0));
+                    break;
                 case "getScenario":
                     getScenario(callback, args(0));
                     break;
@@ -351,8 +396,60 @@ public class DocumentReader extends CordovaPlugin {
                 case "recognizeImagesWithImageInputs":
                     recognizeImagesWithImageInputs(callback, args(0));
                     break;
+                case "getTextFieldValueByType":
+                    getTextFieldValueByType(callback, args(0), args(1));
+                    break;
+                case "getTextFieldValueByTypeLcid":
+                    getTextFieldValueByTypeLcid(callback, args(0), args(1), args(2));
+                    break;
+                case "getTextFieldValueByTypeSource":
+                    getTextFieldValueByTypeSource(callback, args(0), args(1), args(2));
+                    break;
+                case "getTextFieldValueByTypeLcidSource":
+                    getTextFieldValueByTypeLcidSource(callback, args(0), args(1), args(2), args(3));
+                    break;
+                case "getTextFieldValueByTypeSourceOriginal":
+                    getTextFieldValueByTypeSourceOriginal(callback, args(0), args(1), args(2), args(3));
+                    break;
+                case "getTextFieldValueByTypeLcidSourceOriginal":
+                    getTextFieldValueByTypeLcidSourceOriginal(callback, args(0), args(1), args(2), args(3), args(4));
+                    break;
+                case "getTextFieldByType":
+                    getTextFieldByType(callback, args(0), args(1));
+                    break;
+                case "getTextFieldByTypeLcid":
+                    getTextFieldByTypeLcid(callback, args(0), args(1), args(2));
+                    break;
+                case "getGraphicFieldByTypeSource":
+                    getGraphicFieldByTypeSource(callback, args(0), args(1), args(2));
+                    break;
+                case "getGraphicFieldByTypeSourcePageIndex":
+                    getGraphicFieldByTypeSourcePageIndex(callback, args(0), args(1), args(2), args(3));
+                    break;
+                case "getGraphicFieldByTypeSourcePageIndexLight":
+                    getGraphicFieldByTypeSourcePageIndexLight(callback, args(0), args(1), args(2), args(3), args(4));
+                    break;
+                case "getGraphicFieldImageByType":
+                    getGraphicFieldImageByType(callback, args(0), args(1));
+                    break;
+                case "getGraphicFieldImageByTypeSource":
+                    getGraphicFieldImageByTypeSource(callback, args(0), args(1), args(2));
+                    break;
+                case "getGraphicFieldImageByTypeSourcePageIndex":
+                    getGraphicFieldImageByTypeSourcePageIndex(callback, args(0), args(1), args(2), args(3));
+                    break;
+                case "getGraphicFieldImageByTypeSourcePageIndexLight":
+                    getGraphicFieldImageByTypeSourcePageIndexLight(callback, args(0), args(1), args(2), args(3), args(4));
+                    break;
+                case "getContainers":
+                    getContainers(callback, args(0), args(1));
+                    break;
+                case "getEncryptedContainers":
+                    getEncryptedContainers(callback, args(0));
+                    break;
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return true;
     }
@@ -396,6 +493,37 @@ public class DocumentReader extends CordovaPlugin {
             callback.success("already initialized");
     }
 
+    private void isBlePermissionsGranted(Callback callback) {
+        callback.success(BluetoothUtil.Companion.isBlePermissionsGranted(getActivity()));
+    }
+
+    private void startBluetoothService(Callback callback) {
+        BluetoothUtil.Companion.startBluetoothService(
+                getActivity(),
+                isBleManagerConnected -> {
+                    sendBleOnServiceConnectedEvent(isBleManagerConnected);
+                    return null;
+                },
+                () -> {
+                    sendBleOnServiceDisconnectedEvent();
+                    return null;
+                },
+                () -> {
+                    sendBleOnDeviceReadyEvent();
+                    return null;
+                }
+        );
+        callback.success();
+    }
+
+    private void initializeReaderBleDeviceConfig(Callback callback) {
+        if (BluetoothUtil.Companion.getBleManager() == null) callback.error("bleManager is null");
+        if (!Instance().isReady())
+            Instance().initializeReader(getContext(), new BleDeviceConfig(BluetoothUtil.Companion.getBleManager()), getInitCompletion(callback));
+        else
+            callback.success("already initialized");
+    }
+
     private void getAvailableScenarios(Callback callback) throws JSONException {
         callback.success(JSONConstructor.generateList(Instance().availableScenarios, JSONConstructor::generateDocumentReaderScenario).toString());
     }
@@ -512,6 +640,20 @@ public class DocumentReader extends CordovaPlugin {
         callback.success();
     }
 
+    private void getTag(Callback callback) {
+        callback.success(Instance().tag);
+    }
+
+    private void setTag(Callback callback, String tag) {
+        Instance().tag = tag;
+        callback.success();
+    }
+
+    private void checkDatabaseUpdate(Callback callback, String databaseId) {
+        Instance().checkDatabaseUpdate(getContext(), databaseId, getCheckDatabaseUpdateCompletion(callback));
+        callback.success();
+    }
+
     private void startNewPage(Callback callback) {
         Instance().startNewPage();
         callback.success();
@@ -553,7 +695,7 @@ public class DocumentReader extends CordovaPlugin {
     }
 
     private void cancelDBUpdate(Callback callback) {
-        callback.success(Instance().cancelDBUpdate());
+        callback.success(Instance().cancelDBUpdate(getContext()));
     }
 
     private void resetConfiguration(Callback callback) {
@@ -686,20 +828,131 @@ public class DocumentReader extends CordovaPlugin {
         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 getTextFieldValueByType(Callback callback, String raw, int fieldType) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getTextFieldValueByType(fieldType));
+    }
+
+    private void getTextFieldValueByTypeLcid(Callback callback, String raw, int fieldType, int lcid) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getTextFieldValueByType(fieldType, lcid));
+    }
+
+    private void getTextFieldValueByTypeSource(Callback callback, String raw, int fieldType, int source) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getTextFieldValueByTypeAndSource(fieldType, source));
+    }
+
+    private void getTextFieldValueByTypeLcidSource(Callback callback, String raw, int fieldType, int lcid, int source) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getTextFieldValueByType(fieldType, lcid, source));
+    }
+
+    private void getTextFieldValueByTypeSourceOriginal(Callback callback, String raw, int fieldType, int source, boolean original) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getTextFieldValueByTypeAndSource(fieldType, source, original));
+    }
+
+    private void getTextFieldValueByTypeLcidSourceOriginal(Callback callback, String raw, int fieldType, int lcid, int source, boolean original) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getTextFieldValueByType(fieldType, lcid, source, original));
+    }
+
+    private void getTextFieldByType(Callback callback, String raw, int fieldType) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        DocumentReaderTextField result = results.getTextFieldByType(fieldType);
+        if (result == null)
+            callback.success(null);
+        else
+            callback.success(JSONConstructor.generateDocumentReaderTextField(result, getContext()).toString());
+    }
+
+    private void getTextFieldByTypeLcid(Callback callback, String raw, int fieldType, int lcid) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        DocumentReaderTextField result = results.getTextFieldByType(fieldType, lcid);
+        if (result == null)
+            callback.success(null);
+        else
+            callback.success(JSONConstructor.generateDocumentReaderTextField(result, getContext()).toString());
+    }
+
+    private void getGraphicFieldByTypeSource(Callback callback, String raw, int fieldType, int source) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        DocumentReaderGraphicField result = results.getGraphicFieldByType(fieldType, source);
+        if (result == null)
+            callback.success(null);
+        else
+            callback.success(JSONConstructor.generateDocumentReaderGraphicField(result, getContext()).toString());
+    }
+
+    private void getGraphicFieldByTypeSourcePageIndex(Callback callback, String raw, int fieldType, int source, int pageIndex) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        DocumentReaderGraphicField result = results.getGraphicFieldByType(fieldType, source, pageIndex);
+        if (result == null)
+            callback.success(null);
+        else
+            callback.success(JSONConstructor.generateDocumentReaderGraphicField(result, getContext()).toString());
+    }
+
+    private void getGraphicFieldByTypeSourcePageIndexLight(Callback callback, String raw, int fieldType, int source, int pageIndex, int light) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        DocumentReaderGraphicField result = results.getGraphicFieldByType(fieldType, source, pageIndex, light);
+        if (result == null)
+            callback.success(null);
+        else
+            callback.success(JSONConstructor.generateDocumentReaderGraphicField(result, getContext()).toString());
+    }
+
+    private void getGraphicFieldImageByType(Callback callback, String raw, int fieldType) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType)));
+    }
+
+    private void getGraphicFieldImageByTypeSource(Callback callback, String raw, int fieldType, int source) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source)));
+    }
+
+    private void getGraphicFieldImageByTypeSourcePageIndex(Callback callback, String raw, int fieldType, int source, int pageIndex) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(Helpers.bitmapToBase64String(results.getGraphicFieldImageByType(fieldType, source, pageIndex)));
+    }
+
+    private void getGraphicFieldImageByTypeSourcePageIndexLight(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)));
+    }
+
+    @SuppressLint("WrongConstant")
+    private void getContainers(Callback callback, String raw, JSONArray resultType) {
+        try {
+            DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+            callback.success(results.getContainers(JSONConstructor.intArrayFromJSON(resultType)));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            callback.error(e.toString());
+        }
+    }
+
+    private void getEncryptedContainers(Callback callback, String raw) {
+        DocumentReaderResults results = DocumentReaderResults.fromRawResults(raw);
+        callback.success(results.getEncryptedContainers());
+    }
+
+    private void setCameraSessionIsPaused(Callback callback, @SuppressWarnings("unused") boolean ignored) {
+        callback.error("setCameraSessionIsPaused() is an ios-only method");
+    }
+
     private void getCameraSessionIsPaused(Callback callback) {
         callback.error("getCameraSessionIsPaused() is an ios-only method");
     }
 
-    private void stopRFIDReaderWithErrorMessage(Callback callback, String message) {
+    private void stopRFIDReaderWithErrorMessage(Callback callback, @SuppressWarnings("unused") String message) {
         callback.error("stopRFIDReaderWithErrorMessage() is an ios-only method");
     }
 
@@ -755,6 +1008,10 @@ public class DocumentReader extends CordovaPlugin {
         };
     }
 
+    private ICheckDatabaseUpdate getCheckDatabaseUpdateCompletion(Callback callback) {
+        return (database) -> callback.success(JSONConstructor.generateDocReaderDocumentsDatabase(database));
+    }
+
     private ITccParamsCompletion getTCCParamsCompletion(Callback callback) {
         return (success, error) -> {
             if (success)

package/src/android/Helpers.java

@@ -31,13 +31,12 @@ class Helpers {
         return result;
     }
 
-    static BitmapDrawable drawableFromBase64(String base64, Context context)
-    {
+    static BitmapDrawable drawableFromBase64(String base64, Context context) {
         byte[] decodedByte = Base64.decode(base64, 0);
-        Bitmap bitmap =  BitmapFactory.decodeByteArray(decodedByte, 0, decodedByte.length);
+        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);
+        int width = (int) (bitmap.getWidth() * density);
+        int height = (int) (bitmap.getHeight() * density);
         return new BitmapDrawable(context.getResources(), Bitmap.createScaledBitmap(bitmap, width, height, false));
     }
 
@@ -64,6 +63,8 @@ class Helpers {
     }
 
     static String bitmapToBase64String(Bitmap bitmap) {
+        if(bitmap == null) return null;
+
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
         byte[] byteArray = byteArrayOutputStream.toByteArray();