@regulaforensics/react-native-document-reader-api 6.5.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,6 +33,7 @@ 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;
@@ -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;
@@ -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());
     }
@@ -537,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();
@@ -578,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) {
@@ -724,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");
     }
 
@@ -780,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

@@ -13,6 +13,7 @@ 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;
@@ -43,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"))
@@ -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 {
@@ -485,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);
@@ -496,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;
     }
@@ -684,6 +704,7 @@ class RegulaConfig {
                 setProcessParams(params, input.getJSONObject("processParams"));
                 builder.setProcessParams(params);
             }
+            return builder.build();
         } catch (JSONException e) {
             e.printStackTrace();
         }

package/example/App.js

@@ -170,6 +170,7 @@ export default class App extends Component {
   }
 
   displayResults(results) {
+    if(results == null) return
     this.setState({ fullName: results.getTextFieldValueByType({ fieldType: Enum.eVisualFieldType.FT_SURNAME_AND_GIVEN_NAMES }) })
     if (results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE }) != null)
       this.setState({ docFront: { uri: "data:image/png;base64," + results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE }) } })
@@ -210,6 +211,7 @@ export default class App extends Component {
         </View>
         }
         {!this.state.isReadingRfidCustomUi && <View style={styles.container}>
+        <Text/><Text/>
           <Text style={{
             top: 1,
             left: 1,

package/example/android/app/build.gradle

@@ -15,14 +15,8 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
-
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
     defaultConfig {
         applicationId "com.regula.dr.fullrfid"
         minSdkVersion rootProject.ext.minSdkVersion

package/example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.regula.dr.fullrfid">
 
+  <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+  <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.NFC" />
 

package/example/android/build.gradle

@@ -1,19 +1,17 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
-        ndkVersion = "21.4.7075529"
+        compileSdkVersion = 33
+        targetSdkVersion = 33
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath('com.android.tools.build:gradle:7.2.2')
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -21,13 +19,10 @@ allprojects {
     repositories {
         mavenCentral()
         mavenLocal()
-
         maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
         }
         maven {
-            // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 

package/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/example/ios/Podfile

@@ -20,5 +20,13 @@ target 'DocumentReader' do
   post_install do |installer|
     react_native_post_install(installer)
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
+
+    installer.pods_project.targets.each do |target|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+            config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end
   end
 end

package/example/metro.config.js

@@ -1,5 +1,8 @@
 const path = require('path');
-const folders = ["../", "../core", path.resolve(path.join(__dirname, './node_modules'))];
+const folders = [
+  "../",
+  path.resolve(path.join(__dirname, './node_modules'))
+];
 module.exports = {
   transformer: {
     getTransformOptions: async () => ({

package/example/package.json

@@ -10,8 +10,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "6.5.0",
-    "@regulaforensics/react-native-document-reader-core-fullrfid": "6.5.0",
+    "@regulaforensics/react-native-document-reader-api": "6.6.0",
+    "@regulaforensics/react-native-document-reader-core-fullrfid": "6.6.0",
     "react": "17.0.2",
     "react-native": "^0.67.0",
     "react-native-check-box": "^2.1.7",