@regulaforensics/document-reader 8.4.375-beta → 8.4.386-beta

package/RNDocumentReader.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNDocumentReader'
-  s.version      = '8.4.375-beta'
+  s.version      = '8.4.386-beta'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDDocumentReader.h', 'ios/CVDDocumentReader.m' ]
-  s.dependency 'DocumentReader', '8.3.5107'
+  s.dependency 'DocumentReaderStage', '8.4.5290'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -20,7 +20,7 @@ android {
 rootProject.allprojects {
     repositories {
         maven {
-            url "https://maven.regulaforensics.com/RegulaDocumentReader"
+            url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
         }
     }
 }
@@ -29,7 +29,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:8.3.11882'){
+    implementation('com.regula.documentreader:api:8.4.11971'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -1,12 +1,12 @@
 repositories {
     maven {
-        url "https://maven.regulaforensics.com/RegulaDocumentReader"
+        url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
     }
 }
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:8.3.11882'){
+    implementation('com.regula.documentreader:api:8.4.11971'){
         transitive = true
     }
 }

package/android/src/main/java/com/regula/plugin/documentreader/Config.kt

@@ -11,7 +11,7 @@ import androidx.core.content.ContextCompat
 import com.regula.documentreader.api.enums.CustomizationColor
 import com.regula.documentreader.api.enums.CustomizationFont
 import com.regula.documentreader.api.enums.CustomizationImage
-import com.regula.documentreader.api.enums.LogLevel
+import com.regula.documentreader.api.internal.enums.LogLevel
 import com.regula.documentreader.api.params.AuthenticityParams
 import com.regula.documentreader.api.params.Functionality
 import com.regula.documentreader.api.params.ImageQA
@@ -47,6 +47,7 @@ fun setFunctionality(config: Functionality, input: JSONObject) = input.forEach {
         "recordScanningProcess" -> editor.setDoRecordProcessingVideo(v as Boolean)
         "manualMultipageMode" -> editor.setManualMultipageMode(v as Boolean)
         "torchTurnedOn" -> editor.setTorchTurnedOn(v as Boolean)
+        "preventScreenRecording" -> editor.setPreventScreenRecording(v as Boolean)
         "showCaptureButtonDelayFromDetect" -> editor.setShowCaptureButtonDelayFromDetect(v.toLong())
         "showCaptureButtonDelayFromStart" -> editor.setShowCaptureButtonDelayFromStart(v.toLong())
         "orientation" -> editor.setOrientation(v.toInt())
@@ -82,6 +83,7 @@ fun getFunctionality(input: Functionality) = mapOf(
     "recordScanningProcess" to input.doRecordProcessingVideo(),
     "manualMultipageMode" to input.isManualMultipageMode,
     "torchTurnedOn" to input.isTorchTurnedOn,
+    "preventScreenRecording" to input.doPreventScreenRecording(),
     "showCaptureButtonDelayFromDetect" to input.showCaptureButtonDelayFromDetect,
     "showCaptureButtonDelayFromStart" to input.showCaptureButtonDelayFromStart,
     "orientation" to input.orientation,
@@ -182,6 +184,16 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
             if (processParams.authenticityParams == null) processParams.authenticityParams = AuthenticityParams.defaultParams()
             setAuthenticityParams(processParams.authenticityParams!!, v as JSONObject)
         }
+
+        "setCheckFilter" -> processParams.setCheckFilter((v as JSONObject).getString("checkType"), filterObjectFromJSON(v.getJSONObject("filterObject")))
+        "removeCheckFilter" -> processParams.removeCheckFilter(v as String)
+        "clearCheckFilter" -> processParams.clearCheckFilter()
+        "checkFilters" -> {
+            processParams.clearCheckFilter()
+            (v as JSONObject).forEach { key, value ->
+                processParams.setCheckFilter(key, filterObjectFromJSON(value as JSONObject))
+            }
+        }
     }
 }
 
@@ -693,6 +705,16 @@ fun setAuthenticityParams(input: AuthenticityParams, opts: JSONObject) = opts.fo
             if (input.livenessParams == null) input.livenessParams = LivenessParams.defaultParams()
             setLivenessParams(input.livenessParams!!, v as JSONObject)
         }
+
+        "setCheckFilter" -> input.setCheckFilter((v as JSONObject).getString("checkType"), filterObjectFromJSON(v.getJSONObject("filterObject")))
+        "removeCheckFilter" -> input.removeCheckFilter(v as String)
+        "clearCheckFilter" -> input.clearCheckFilter()
+        "checkFilters" -> {
+            input.clearCheckFilter()
+            (v as JSONObject).forEach { key, value ->
+                input.setCheckFilter(key, filterObjectFromJSON(value as JSONObject))
+            }
+        }
     }
 }
 
@@ -726,6 +748,16 @@ fun setLivenessParams(input: LivenessParams, opts: JSONObject) = opts.forEach {
         "checkBlackAndWhiteCopy" -> input.checkBlackAndWhiteCopy = v as Boolean
         "checkDynaprint" -> input.checkDynaprint = v as Boolean
         "checkGeometry" -> input.checkGeometry = v as Boolean
+
+        "setCheckFilter" -> input.setCheckFilter((v as JSONObject).getString("checkType"), filterObjectFromJSON(v.getJSONObject("filterObject")))
+        "removeCheckFilter" -> input.removeCheckFilter(v as String)
+        "clearCheckFilter" -> input.clearCheckFilter()
+        "checkFilters" -> {
+            input.clearCheckFilter()
+            (v as JSONObject).forEach { key, value ->
+                input.setCheckFilter(key, filterObjectFromJSON(value as JSONObject))
+            }
+        }
     }
 }
 
@@ -752,6 +784,10 @@ fun setColors(input: ParamsCustomization.CustomizationEditor, opts: JSONObject)
         "rfidProcessingScreenProgressBarBackground" -> input.setColor(CustomizationColor.RFID_PROCESSING_SCREEN_PROGRESS_BAR_BACKGROUND, value)
         "rfidProcessingScreenResultLabelText" -> input.setColor(CustomizationColor.RFID_PROCESSING_SCREEN_RESULT_LABEL_TEXT, value)
         "rfidProcessingScreenLoadingBar" -> input.setColor(CustomizationColor.RFID_PROCESSING_SCREEN_LOADING_BAR, value)
+        "rfidEnableNfcTitleText" -> input.setColor(CustomizationColor.RFID_ENABLE_NFC_TITLE_TEXT, value)
+        "rfidEnableNfcDescriptionText" -> input.setColor(CustomizationColor.RFID_ENABLE_NFC_DESCRIPTION_TEXT, value)
+        "rfidEnableNfcButtonText" -> input.setColor(CustomizationColor.RFID_ENABLE_NFC_BUTTON_TEXT, value)
+        "rfidEnableNfcButtonBackground" -> input.setColor(CustomizationColor.RFID_ENABLE_NFC_BUTTON_BACKGROUND, value)
     }
 }
 
@@ -764,6 +800,10 @@ fun getColors(input: Map<CustomizationColor, Long>) = mapOf(
     "rfidProcessingScreenProgressBarBackground" to input[CustomizationColor.RFID_PROCESSING_SCREEN_PROGRESS_BAR_BACKGROUND],
     "rfidProcessingScreenResultLabelText" to input[CustomizationColor.RFID_PROCESSING_SCREEN_RESULT_LABEL_TEXT],
     "rfidProcessingScreenLoadingBar" to input[CustomizationColor.RFID_PROCESSING_SCREEN_LOADING_BAR],
+    "rfidEnableNfcTitleText" to input[CustomizationColor.RFID_ENABLE_NFC_TITLE_TEXT],
+    "rfidEnableNfcDescriptionText" to input[CustomizationColor.RFID_ENABLE_NFC_DESCRIPTION_TEXT],
+    "rfidEnableNfcButtonText" to input[CustomizationColor.RFID_ENABLE_NFC_BUTTON_TEXT],
+    "rfidEnableNfcButtonBackground" to input[CustomizationColor.RFID_ENABLE_NFC_BUTTON_BACKGROUND],
 ).toJson()
 
 fun setFonts(input: ParamsCustomization.CustomizationEditor, opts: JSONObject) = opts.forEach { key, value ->
@@ -771,6 +811,9 @@ fun setFonts(input: ParamsCustomization.CustomizationEditor, opts: JSONObject) =
         "rfidProcessingScreenHintLabel" -> CustomizationFont.RFID_PROCESSING_SCREEN_HINT_LABEL.setFont(input, value)
         "rfidProcessingScreenProgressLabel" -> CustomizationFont.RFID_PROCESSING_SCREEN_PROGRESS_LABEL.setFont(input, value)
         "rfidProcessingScreenResultLabel" -> CustomizationFont.RFID_PROCESSING_SCREEN_RESULT_LABEL.setFont(input, value)
+        "rfidEnableNfcTitleText" -> CustomizationFont.RFID_ENABLE_NFC_TITLE_TEXT.setFont(input, value)
+        "rfidEnableNfcDescriptionText" -> CustomizationFont.RFID_ENABLE_NFC_DESCRIPTION_TEXT.setFont(input, value)
+        "rfidEnableNfcButtonText" -> CustomizationFont.RFID_ENABLE_NFC_BUTTON_TEXT.setFont(input, value)
     }
 }
 
@@ -778,16 +821,21 @@ fun getFonts(fonts: Map<CustomizationFont, Typeface>, sizes: Map<CustomizationFo
     "rfidProcessingScreenHintLabel" to CustomizationFont.RFID_PROCESSING_SCREEN_HINT_LABEL.getFont(fonts, sizes),
     "rfidProcessingScreenProgressLabel" to CustomizationFont.RFID_PROCESSING_SCREEN_PROGRESS_LABEL.getFont(fonts, sizes),
     "rfidProcessingScreenResultLabel" to CustomizationFont.RFID_PROCESSING_SCREEN_RESULT_LABEL.getFont(fonts, sizes),
+    "rfidEnableNfcTitleText" to CustomizationFont.RFID_ENABLE_NFC_TITLE_TEXT.getFont(fonts, sizes),
+    "rfidEnableNfcDescriptionText" to CustomizationFont.RFID_ENABLE_NFC_DESCRIPTION_TEXT.getFont(fonts, sizes),
+    "rfidEnableNfcButtonText" to CustomizationFont.RFID_ENABLE_NFC_BUTTON_TEXT.getFont(fonts, sizes),
 ).toJson()
 
 fun setImages(input: ParamsCustomization.CustomizationEditor, opts: JSONObject) = opts.forEach { key, v ->
     when (key) {
         "rfidProcessingScreenFailureImage" -> input.setImage(CustomizationImage.RFID_PROCESSING_SCREEN_FAILURE_IMAGE, v.toDrawable())
+        "rfidEnableNfcImage" -> input.setImage(CustomizationImage.RFID_ENABLE_NFC_IMAGE, v.toDrawable())
     }
 }
 
 fun getImages(input: Map<CustomizationImage, Drawable>) = mapOf(
     "rfidProcessingScreenFailureImage" to (input[CustomizationImage.RFID_PROCESSING_SCREEN_FAILURE_IMAGE] ?: ContextCompat.getDrawable(context, com.regula.documentreader.api.R.drawable.reg_ic_error)).toBase64(),
+    "rfidEnableNfcImage" to (input[CustomizationImage.RFID_ENABLE_NFC_IMAGE] ?: ContextCompat.getDrawable(context, com.regula.documentreader.api.R.drawable.reg_enable_nfc)).toBase64(),
 ).toJson()
 
 fun CustomizationFont.getFont(fonts: Map<CustomizationFont, Typeface>, sizes: Map<CustomizationFont, Int>) =

package/android/src/main/java/com/regula/plugin/documentreader/JSONConstructor.kt

@@ -27,6 +27,8 @@ import com.regula.documentreader.api.params.BackendProcessingConfig
 import com.regula.documentreader.api.params.BleDeviceConfig
 import com.regula.documentreader.api.params.DocReaderConfig
 import com.regula.documentreader.api.params.FaceApiParams
+import com.regula.documentreader.api.params.FilterObject
+import com.regula.documentreader.api.params.FilterObjectType
 import com.regula.documentreader.api.params.Functionality
 import com.regula.documentreader.api.params.ImageInputData
 import com.regula.documentreader.api.params.ImageQA
@@ -192,6 +194,7 @@ fun initConfigFromJSON(input: JSONObject) = input.let {
 
     if (it.has("licenseUpdate")) result.setLicenseUpdate(it.getBoolean("licenseUpdate"))
     if (it.has("delayedNNLoad")) result.isDelayedNNLoad = it.getBoolean("delayedNNLoad")
+    result.licenseUpdateTimeout = it.getDoubleOrNull("licenseUpdateTimeout")
     result.blackList = it.getJSONObjectOrNull("blackList")
     result
 }
@@ -203,6 +206,7 @@ fun generateInitConfig(input: DocReaderConfig?) = input?.let {
         "databasePath" to it.customDbPath,
         "licenseUpdate" to it.isLicenseUpdate,
         "delayedNNLoad" to it.isDelayedNNLoad,
+        "licenseUpdateTimeout" to it.licenseUpdateTimeout,
         "blackList" to it.blackList
     ).toJson()
 }
@@ -213,6 +217,7 @@ fun initBleDeviceConfigFromJSON(input: JSONObject) = input.let {
 
     if (it.has("licenseUpdate")) result.setLicenseUpdate(it.getBoolean("licenseUpdate"))
     if (it.has("delayedNNLoad")) result.isDelayedNNLoad = it.getBoolean("delayedNNLoad")
+    result.licenseUpdateTimeout = it.getDoubleOrNull("licenseUpdateTimeout")
     result.blackList = it.getJSONObjectOrNull("blackList")
     result
 }
@@ -1793,3 +1798,28 @@ fun generateMatrix(input: Matrix?) = input?.let {
     for (f in floats) result.put(java.lang.Float.valueOf(f))
     result
 }
+
+fun filterObjectFromJSON(it: JSONObject): FilterObject {
+    val result = FilterObject()
+
+    result.docIDsFilter = filterObjectTypeIntFromJSON(it.getJSONObjectOrNull("docIDsFilter"))
+    result.docFormatsFilter = filterObjectTypeIntFromJSON(it.getJSONObjectOrNull("docFormatsFilter"))
+    result.docCategoriesFilter = filterObjectTypeIntFromJSON(it.getJSONObjectOrNull("docCategoriesFilter"))
+    result.docCountriesFilter = filterObjectTypeStringFromJSON(it.getJSONObjectOrNull("docCountriesFilter"))
+
+    return result
+}
+
+fun filterObjectTypeIntFromJSON(input: JSONObject?): FilterObjectType<Int>? = input?.let {
+    val array = it.getJSONArray("list").toArray<Int>()!!
+    if (it.getBoolean("isInclude"))
+        return FilterObjectType.createIncludeList(array)
+    return FilterObjectType.createExcludeList(array)
+}
+
+fun filterObjectTypeStringFromJSON(input: JSONObject?): FilterObjectType<String>? = input?.let {
+    val array = it.getJSONArray("list").toArray<String>()!!
+    if (it.getBoolean("isInclude"))
+        return FilterObjectType.createIncludeList(array)
+    return FilterObjectType.createExcludeList(array)
+}

package/android/src/main/java/com/regula/plugin/documentreader/Main.kt

@@ -44,7 +44,7 @@ import org.json.JSONObject
 import com.regula.plugin.documentreader.Convert.toBase64
 import com.regula.plugin.documentreader.Convert.toByteArray
 
-fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
+fun methodCall(method: String, callback: (Any?) -> Unit): Any? = when (method) {
     "getDocumentReaderIsReady" -> getDocumentReaderIsReady(callback)
     "getDocumentReaderStatus" -> getDocumentReaderStatus(callback)
     "getRfidSessionStatus" -> getRfidSessionStatus(callback)
@@ -122,6 +122,16 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "finalizePackage" -> finalizePackage(callback)
     "endBackendTransaction" -> endBackendTransaction()
     "getTranslation" -> getTranslation(callback, args(0), args(1))
+    // remove after finishing old dr support
+    "processParamsSetCheckFilter" -> processParamsSetCheckFilter(args(0), args(1))
+    "processParamsRemoveCheckFilter" -> processParamsRemoveCheckFilter(args(0))
+    "processParamsClearCheckFilter" -> processParamsClearCheckFilter()
+    "authenticityParamsSetCheckFilter" -> authenticityParamsSetCheckFilter(args(0), args(1))
+    "authenticityParamsRemoveCheckFilter" -> authenticityParamsRemoveCheckFilter(args(0))
+    "authenticityParamsClearCheckFilter" -> authenticityParamsClearCheckFilter()
+    "livenessParamsSetCheckFilter" -> livenessParamsSetCheckFilter(args(0), args(1))
+    "livenessParamsRemoveCheckFilter" -> livenessParamsRemoveCheckFilter(args(0))
+    "livenessParamsClearCheckFilter" -> livenessParamsClearCheckFilter()
     else -> Unit
 }
 
@@ -452,6 +462,19 @@ fun getTranslation(callback: Callback, className: String, value: Int) = when (cl
     else -> Unit
 }
 
+// remove after finishing old dr support
+fun processParamsSetCheckFilter(checkType: String, filter: JSONObject) = Instance().processParams().setCheckFilter(checkType, filterObjectFromJSON(filter))
+fun processParamsRemoveCheckFilter(checkType: String) = Instance().processParams().removeCheckFilter(checkType)
+fun processParamsClearCheckFilter() = Instance().processParams().clearCheckFilter()
+
+fun authenticityParamsSetCheckFilter(checkType: String, filter: JSONObject) = Instance().processParams().authenticityParams?.setCheckFilter(checkType, filterObjectFromJSON(filter))
+fun authenticityParamsRemoveCheckFilter(checkType: String) = Instance().processParams().authenticityParams?.removeCheckFilter(checkType)
+fun authenticityParamsClearCheckFilter() = Instance().processParams().authenticityParams?.clearCheckFilter()
+
+fun livenessParamsSetCheckFilter(checkType: String, filter: JSONObject) = Instance().processParams().authenticityParams?.livenessParams?.setCheckFilter(checkType, filterObjectFromJSON(filter))
+fun livenessParamsRemoveCheckFilter(checkType: String) = Instance().processParams().authenticityParams?.livenessParams?.removeCheckFilter(checkType)
+fun livenessParamsClearCheckFilter() = Instance().processParams().authenticityParams?.livenessParams?.clearCheckFilter()
+
 // --------------------------------------------------------------------------------------------------------------------------
 
 val completion = { action: Int, results: DocumentReaderResults?, error: DocumentReaderException? ->