@regulaforensics/react-native-document-reader-api 6.4.0 → 6.6.0

package/android/src/main/java/com/regula/documentreader/RNRegulaDocumentReaderModule.java

@@ -22,6 +22,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+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;
@@ -32,14 +33,15 @@ 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.params.ImageInputParam;
+import com.regula.documentreader.api.internal.params.ImageInputParam;
 import com.regula.documentreader.api.params.rfid.PKDCertificate;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
 import com.regula.documentreader.api.params.rfid.authorization.TAChallenge;
 import com.regula.documentreader.api.results.DocumentReaderResults;
-import com.regula.documentreader.api.parser.DocReaderResultsJsonParser;
+import com.regula.documentreader.api.internal.parser.DocReaderResultsJsonParser;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -55,15 +57,21 @@ import static com.regula.documentreader.api.DocumentReader.Instance;
 
 import androidx.annotation.NonNull;
 
-@SuppressWarnings({"ConstantConditions", "RedundantSuppression"})
+@SuppressWarnings({"ConstantConditions", "RedundantSuppression", "MissingPermission"})
 public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule implements ActivityEventListener, LifecycleEventListener {
     private final static String prepareDatabaseProgressChangeEvent = "prepareDatabaseProgressChangeEvent";
     private final static String completionEvent = "completionEvent";
     private final static String videoEncoderCompletionEvent = "videoEncoderCompletionEvent";
     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;
     JSONArray data;
     private final ReactContext reactContext;
@@ -124,40 +132,51 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
         return (T) data.get(index);
     }
 
-    private void send(String event, String data) {
+    static void send(ReactContext reactContext, String event, String data) {
         WritableMap map = Arguments.createMap();
         map.putString("msg", data);
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(event, map);
     }
 
     private void sendProgress(int progress) {
-        send(prepareDatabaseProgressChangeEvent, progress + "");
+        send(reactContext, prepareDatabaseProgressChangeEvent, progress + "");
     }
 
     private void sendCompletion(int action, DocumentReaderResults results, DocumentReaderException error) {
-        send(completionEvent, JSONConstructor.generateCompletion(action, results, error, getContext()).toString());
+        send(reactContext, completionEvent, JSONConstructor.generateCompletion(action, results, error, getContext()).toString());
     }
 
     private void sendVideoEncoderCompletion(String sessionId, File file) {
-        send(videoEncoderCompletionEvent, JSONConstructor.generateVideoEncoderCompletion(sessionId, file).toString());
+        send(reactContext, videoEncoderCompletionEvent, JSONConstructor.generateVideoEncoderCompletion(sessionId, file).toString());
     }
 
     private void sendIRfidNotificationCompletion(int notification, Bundle value) {
-        send(rfidNotificationCompletionEvent, JSONConstructor.generateRfidNotificationCompletion(notification, value).toString());
+        send(reactContext, rfidNotificationCompletionEvent, JSONConstructor.generateRfidNotificationCompletion(notification, value).toString());
     }
 
     private void sendPACertificateCompletion(byte[] serialNumber, PAResourcesIssuer issuer) {
-        send(paCertificateCompletionEvent, JSONConstructor.generatePACertificateCompletion(serialNumber, issuer).toString());
+        send(reactContext, paCertificateCompletionEvent, JSONConstructor.generatePACertificateCompletion(serialNumber, issuer).toString());
     }
 
     private void sendTACertificateCompletion(String keyCAR) {
-        send(taCertificateCompletionEvent, keyCAR);
+        send(reactContext, taCertificateCompletionEvent, keyCAR);
     }
 
     private void sendTASignatureCompletion(TAChallenge challenge) {
-        send(taSignatureCompletionEvent, JSONConstructor.generateTAChallenge(challenge).toString());
+        send(reactContext, taSignatureCompletionEvent, JSONConstructor.generateTAChallenge(challenge).toString());
     }
 
+    private void sendBleOnServiceConnectedEvent(boolean isBleManagerConnected) {
+        send(reactContext, bleOnServiceConnectedEvent, isBleManagerConnected +"");
+    }
+
+    private void sendBleOnServiceDisconnectedEvent() {
+        send(reactContext, bleOnServiceDisconnectedEvent, "");
+    }
+
+    private void sendBleOnDeviceReadyEvent() {
+        send(reactContext, bleOnDeviceReadyEvent, "");
+    }
 
     private interface Callback {
         void success(Object o);
@@ -194,6 +213,18 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
                 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;
@@ -314,6 +345,12 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
                 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;
@@ -341,6 +378,9 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
                 case "recognizeImage":
                     recognizeImage(callback, args(0));
                     break;
+                case "recognizeData":
+                    recognizeData(callback, args(0));
+                    break;
                 case "setRfidSessionStatus":
                     setRfidSessionStatus(callback, args(0));
                     break;
@@ -359,9 +399,6 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
                 case "setTCCParams":
                     setTCCParams(callback, args(0));
                     break;
-                case "initializeReaderWithDatabase":
-                    initializeReaderWithDatabase(callback, args(0), args(1));
-                    break;
                 case "recognizeImageWithOpts":
                     recognizeImageWithOpts(callback, args(0), args(1));
                     break;
@@ -378,7 +415,8 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
                     recognizeImagesWithImageInputs(callback, args(0));
                     break;
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -421,6 +459,37 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
             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());
     }
@@ -525,16 +594,9 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
         callback.success(Instance().isRFIDAvailableForUse());
     }
 
-    private void initializeReader(Callback callback, Object license) {
+    private void initializeReader(Callback callback, JSONObject config) {
         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));
+            Instance().initializeReader(getContext(), JSONConstructor.DocReaderConfigFromJSON(config), getInitCompletion(callback));
         else
             callback.success("already initialized");
     }
@@ -544,6 +606,20 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
         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();
@@ -559,6 +635,11 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
         Instance().recognizeImage(Helpers.bitmapFromBase64(base64Image), getCompletion());
     }
 
+    private void recognizeData(@SuppressWarnings("unused") Callback callback, Object data) {
+        stopBackgroundRFID();
+        Instance().recognizeImage(Base64.decode(data.toString(), Base64.DEFAULT), getCompletion());
+    }
+
     private void recognizeImages(@SuppressWarnings("unused") Callback callback, JSONArray base64Images) throws JSONException {
         stopBackgroundRFID();
         Bitmap[] images = new Bitmap[base64Images.length()];
@@ -580,7 +661,7 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
     }
 
     private void cancelDBUpdate(Callback callback) {
-        callback.success(Instance().cancelDBUpdate());
+        callback.success(Instance().cancelDBUpdate(getContext()));
     }
 
     private void resetConfiguration(Callback callback) {
@@ -726,7 +807,7 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
         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");
     }
 
@@ -782,6 +863,10 @@ public class RNRegulaDocumentReaderModule extends ReactContextBaseJavaModule imp
         };
     }
 
+    private ICheckDatabaseUpdate getCheckDatabaseUpdateCompletion(Callback callback) {
+        return (database) -> callback.success(JSONConstructor.generateDocReaderDocumentsDatabase(database));
+    }
+
     private ITccParamsCompletion getTCCParamsCompletion(Callback callback) {
         return (success, error) -> {
             if (success)

package/android/src/main/java/com/regula/documentreader/RegulaConfig.java

@@ -6,11 +6,14 @@ import org.json.JSONException;
 
 import com.regula.documentreader.api.DocumentReader;
 import com.regula.documentreader.api.params.ImageQA;
+import com.regula.documentreader.api.params.OnlineProcessingConfig;
 import com.regula.documentreader.api.params.ParamsCustomization;
 import com.regula.documentreader.api.params.Functionality;
 import com.regula.documentreader.api.params.ProcessParam;
+import com.regula.documentreader.api.params.rfid.ReprocParams;
 import com.regula.documentreader.api.params.rfid.dg.DataGroups;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Paint;
 import android.text.SpannableString;
@@ -41,6 +44,7 @@ class RegulaConfig {
         return object;
     }
 
+    @SuppressLint("MissingPermission")
     private static void setFunctionality(Functionality functionality, JSONObject opts) throws JSONException {
         Functionality.FunctionalityEditor editor = functionality.edit();
         if (opts.has("pictureOnBoundsReady"))
@@ -59,8 +63,6 @@ class RegulaConfig {
             editor.setShowCaptureButtonDelayFromDetect(opts.getInt("showCaptureButtonDelayFromDetect"));
         if (opts.has("showCaptureButtonDelayFromStart"))
             editor.setShowCaptureButtonDelayFromStart(opts.getInt("showCaptureButtonDelayFromStart"));
-        if (opts.has("isOnlineMode"))
-            editor.setOnlineMode(opts.getBoolean("isOnlineMode"));
         if (opts.has("databaseAutoupdate"))
             editor.setDatabaseAutoupdate(opts.getBoolean("databaseAutoupdate"));
         if (opts.has("showSkipNextPageButton"))
@@ -73,8 +75,6 @@ class RegulaConfig {
             editor.setShowCameraSwitchButton(opts.getBoolean("showCameraSwitchButton"));
         if (opts.has("cameraFrame"))
             editor.setCameraFrame(opts.getString("cameraFrame"));
-        if (opts.has("serviceURL"))
-            editor.setServiceURL(opts.getString("serviceURL"));
         if (opts.has("btDeviceName"))
             editor.setBtDeviceName(opts.getString("btDeviceName"));
         if (opts.has("orientation"))
@@ -105,6 +105,8 @@ class RegulaConfig {
             editor.setExposure(BigDecimal.valueOf(opts.getDouble("exposure")).floatValue());
         if (opts.has("rfidTimeout"))
             editor.setRfidTimeout(opts.getInt("rfidTimeout"));
+        if (opts.has("onlineProcessingConfiguration"))
+            editor.setOnlineProcessingConfiguration(OnlineProcessingConfigFromJSON(opts.getJSONObject("onlineProcessingConfiguration")));
 
         editor.apply();
     }
@@ -213,6 +215,18 @@ class RegulaConfig {
             processParams.parseBarcodes = opts.getBoolean("parseBarcodes");
         if (opts.has("shouldReturnPackageForReprocess"))
             processParams.shouldReturnPackageForReprocess = opts.getBoolean("shouldReturnPackageForReprocess");
+        if (opts.has("imageOutputMaxHeight"))
+            processParams.imageOutputMaxHeight = opts.getInt("imageOutputMaxHeight");
+        if (opts.has("imageOutputMaxWidth"))
+            processParams.imageOutputMaxWidth = opts.getInt("imageOutputMaxWidth");
+        if (opts.has("disablePerforationOCR"))
+            processParams.disablePerforationOCR = opts.getBoolean("disablePerforationOCR");
+        if (opts.has("documentGroupFilter"))
+            processParams.documentGroupFilter = intArrayFromJson(opts.getJSONArray("documentGroupFilter"));
+        if (opts.has("respectImageQuality"))
+            processParams.respectImageQuality = opts.getBoolean("respectImageQuality");
+        if (opts.has("splitNames"))
+            processParams.splitNames = opts.getBoolean("splitNames");
     }
 
     private static void setCustomization(ParamsCustomization customization, JSONObject opts, Context context) throws JSONException {
@@ -349,14 +363,12 @@ class RegulaConfig {
         object.put("showChangeFrameButton", functionality.isShowChangeFrameButton());
         object.put("showCaptureButtonDelayFromDetect", functionality.getShowCaptureButtonDelayFromDetect());
         object.put("showCaptureButtonDelayFromStart", functionality.getShowCaptureButtonDelayFromStart());
-        object.put("isOnlineMode", functionality.isOnlineMode());
         object.put("databaseAutoupdate", functionality.isDatabaseAutoupdate());
         object.put("showSkipNextPageButton", functionality.isShowSkipNextPageButton());
         object.put("useAuthenticator", functionality.isUseAuthenticator());
         object.put("skipFocusingFrames", functionality.isSkipFocusingFrames());
         object.put("showCameraSwitchButton", functionality.isShowCameraSwitchButton());
         object.put("cameraFrame", functionality.getCameraFrame());
-        object.put("serviceURL", functionality.getServiceURL());
         object.put("btDeviceName", functionality.getBtDeviceName());
         object.put("orientation", functionality.getOrientation());
         object.put("BTDeviceApiPresent", functionality.isBTDeviceApiPresent());
@@ -487,7 +499,7 @@ class RegulaConfig {
         object.put("matchTextFieldMask", processParams.matchTextFieldMask);
         object.put("fastDocDetect", processParams.fastDocDetect);
         object.put("updateOCRValidityByGlare", processParams.updateOCRValidityByGlare);
-        object.put("imageQA", processParams.imageQA != null ? processParams.imageQA.toJsonObject() : null);
+        object.put("imageQA", processParams.imageQA.toJsonObject());
         object.put("forceDocFormat", processParams.forceDocFormat);
         object.put("noGraphics", processParams.noGraphics);
         object.put("documentAreaMin", processParams.documentAreaMin);
@@ -498,6 +510,12 @@ class RegulaConfig {
         object.put("forceReadMrzBeforeLocate", processParams.forceReadMrzBeforeLocate);
         object.put("parseBarcodes", processParams.parseBarcodes);
         object.put("shouldReturnPackageForReprocess", processParams.shouldReturnPackageForReprocess);
+        object.put("imageOutputMaxHeight", processParams.imageOutputMaxHeight);
+        object.put("imageOutputMaxWidth", processParams.imageOutputMaxWidth);
+        object.put("disablePerforationOCR", processParams.disablePerforationOCR);
+        object.put("documentGroupFilter", generateIntArray(processParams.documentGroupFilter));
+        object.put("respectImageQuality", processParams.respectImageQuality);
+        object.put("splitNames", processParams.splitNames);
 
         return object;
     }
@@ -603,6 +621,10 @@ class RegulaConfig {
             setDataGroups(DocumentReader.Instance().rfidScenario().eIDDataGroups(), opts.getJSONObject("eIDDataGroups"));
         if (opts.has("eDLDataGroups"))
             setDataGroups(DocumentReader.Instance().rfidScenario().eDLDataGroups(), opts.getJSONObject("eDLDataGroups"));
+        if (opts.has("reprocessParams"))
+            DocumentReader.Instance().rfidScenario().setReprocessParams(ReprocParamsFromJSON(opts.getJSONObject("reprocessParams")));
+        if (opts.has("defaultReadingBufferSize"))
+            DocumentReader.Instance().rfidScenario().setDefaultReadingBufferSize(opts.getInt("defaultReadingBufferSize"));
     }
 
     private static void setDataGroups(DataGroups dataGroup, JSONObject opts) throws JSONException {
@@ -649,4 +671,43 @@ class RegulaConfig {
         if (opts.has("DG21"))
             dataGroup.setDG14(opts.getBoolean("DG21"));
     }
+
+    private static ReprocParams ReprocParamsFromJSON(JSONObject input) {
+        try {
+            ReprocParams result;
+            if (input.has("serviceUrl"))
+                result = new ReprocParams(input.getString("serviceUrl"));
+            else return null;
+            if (input.has("failIfNoService"))
+                result.setFailIfNoService(input.getBoolean("failIfNoService"));
+            return result;
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static OnlineProcessingConfig OnlineProcessingConfigFromJSON(JSONObject input) {
+        try {
+            OnlineProcessingConfig.Builder builder;
+            if (input.has("mode"))
+                builder = new OnlineProcessingConfig.Builder(input.getInt("mode"));
+            else return null;
+            if (input.has("imageFormat"))
+                builder.setImageFormat(input.getInt("imageFormat"));
+            if (input.has("url"))
+                builder.setUrl(input.getString("url"));
+            if (input.has("imageCompressionQuality"))
+                builder.setImageCompressionQuality((float) input.getDouble("imageCompressionQuality"));
+            if (input.has("processParams")) {
+                ProcessParam params = new ProcessParam();
+                setProcessParams(params, input.getJSONObject("processParams"));
+                builder.setProcessParams(params);
+            }
+            return builder.build();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }