@regulaforensics/document-reader 8.3.310-beta → 8.4.2-nightly

package/README.md

@@ -3,7 +3,7 @@ Document Reader allows you to read various kinds of identification documents, pa
 
 ## Demo applications
 In the [examples](examples/) folder you can find 3 demo applications:
-* [React-native](examples/react-native)
+* [React-native](examples/react_native)
 * [Ionic(ionic app with cordova, angular)](examples/ionic)
 * [Capacitor(ionic app with capacitor, react)](examples/capacitor)
 

package/RNDocumentReader.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNDocumentReader'
-  s.version      = '8.3.310-beta'
+  s.version      = '8.4.2-nightly'
   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 'DocumentReaderStage', '8.3.5085'
+  s.dependency 'DocumentReaderNightly', '8.5.5556'
   s.dependency 'React'
 end

package/android/build.gradle

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

package/android/cordova.gradle

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

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

@@ -7,6 +7,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter
 import android.content.ComponentName
+import android.content.Context.BIND_AUTO_CREATE
 import android.content.Intent
 import android.content.ServiceConnection
 import android.content.pm.PackageManager.PERMISSION_GRANTED
@@ -31,9 +32,10 @@ const val INTENT_REQUEST_ENABLE_BLUETOOTH = 197
 
 @SuppressLint("StaticFieldLeak")
 var bluetooth: BLEWrapper? = null
+lateinit var savedDeviceNameForPermissionResult: String
 lateinit var savedCallbackForPermissionResult: Callback
 
-fun connectBluetoothDevice(callback: Callback) {
+fun connectBluetoothDevice(deviceName: String, callback: Callback) {
     if (bluetooth?.isConnected == true) {
         Log.e("REGULA", "Bluetooth device already connected, returning false")
         callback(false)
@@ -41,6 +43,7 @@ fun connectBluetoothDevice(callback: Callback) {
     }
 
     if (!isBluetoothSettingsReady(activity)) {
+        savedDeviceNameForPermissionResult = deviceName
         savedCallbackForPermissionResult = callback
         return
     }
@@ -55,6 +58,7 @@ fun connectBluetoothDevice(callback: Callback) {
     Timer().schedule(timeout, SEARCHING_TIMEOUT)
 
     val bleIntent = Intent(context, RegulaBleService::class.java)
+    bleIntent.putExtra(RegulaBleService.DEVICE_NAME, deviceName)
     context.startService(bleIntent)
     context.bindService(bleIntent, object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, service: IBinder) {
@@ -70,7 +74,7 @@ fun connectBluetoothDevice(callback: Callback) {
         }
 
         override fun onServiceDisconnected(name: ComponentName) {}
-    }, 0)
+    }, BIND_AUTO_CREATE)
 }
 
 fun onRequestPermissionsResult(
@@ -83,7 +87,7 @@ fun onRequestPermissionsResult(
         savedCallbackForPermissionResult(false)
         return true
     }
-    connectBluetoothDevice(savedCallbackForPermissionResult)
+    connectBluetoothDevice(savedDeviceNameForPermissionResult, savedCallbackForPermissionResult)
     return true
 }
 
@@ -95,7 +99,7 @@ fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") da
 
     if (requestCode == INTENT_REQUEST_ENABLE_BLUETOOTH || requestCode == INTENT_REQUEST_ENABLE_LOCATION) {
         if (resultCode == Activity.RESULT_OK)
-            connectBluetoothDevice(savedCallbackForPermissionResult)
+            connectBluetoothDevice(savedDeviceNameForPermissionResult, savedCallbackForPermissionResult)
         else
             savedCallbackForPermissionResult(false)
         return true
@@ -126,7 +130,7 @@ fun deniedBluetoothPermissions(): Array<String>? {
         result.addAll(deniedBluetoothPermission(BLUETOOTH_CONNECT))
     } else
         result.addAll(deniedBluetoothPermission(ACCESS_FINE_LOCATION))
-    return result.let { if (it.size > 0) it.toTypedArray() else null }
+    return result.let { if (it.isNotEmpty()) it.toTypedArray() else null }
 }
 
 fun deniedBluetoothPermission(permission: String): Array<String> {

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

@@ -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,
@@ -141,6 +143,7 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "generateAlpha2Codes" -> processParams.generateAlpha2Codes = v as Boolean
         "disableAuthResolutionFilter" -> processParams.disableAuthResolutionFilter = v as Boolean
         "strictSecurityChecks" -> processParams.strictSecurityChecks = v as Boolean
+        "returnTransliteratedFields" -> processParams.returnTransliteratedFields = v as Boolean
         "measureSystem" -> processParams.measureSystem = v.toInt()
         "barcodeParserType" -> processParams.barcodeParserType = v.toInt()
         "perspectiveAngle" -> processParams.perspectiveAngle = v.toInt()
@@ -227,6 +230,7 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "generateAlpha2Codes" to processParams.generateAlpha2Codes,
     "disableAuthResolutionFilter" to processParams.disableAuthResolutionFilter,
     "strictSecurityChecks" to processParams.strictSecurityChecks,
+    "returnTransliteratedFields" to processParams.returnTransliteratedFields,
     "measureSystem" to processParams.measureSystem,
     "barcodeParserType" to processParams.barcodeParserType,
     "perspectiveAngle" to processParams.perspectiveAngle,
@@ -752,6 +756,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 +772,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 +783,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 +793,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

@@ -192,6 +192,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 +204,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 +215,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
 }

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

@@ -16,6 +16,7 @@ import com.regula.documentreader.api.DocumentReader.Instance
 import com.regula.documentreader.api.completions.IDocumentReaderCompletion
 import com.regula.documentreader.api.completions.IDocumentReaderInitCompletion
 import com.regula.documentreader.api.completions.IDocumentReaderPrepareDbCompletion
+import com.regula.documentreader.api.completions.IVideoEncoderCompletion
 import com.regula.documentreader.api.completions.model.PrepareProgress
 import com.regula.documentreader.api.completions.rfid.IRfidPKDCertificateCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion
@@ -44,11 +45,11 @@ 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)
-    "setRfidSessionStatus" -> setRfidSessionStatus(argsNullable(0))
+    "setRfidSessionStatus" -> setRfidSessionStatus()
     "getTag" -> getTag(callback)
     "setTag" -> setTag(argsNullable(0))
     "getTenant" -> getTenant(callback)
@@ -90,7 +91,7 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "addPKDCertificates" -> addPKDCertificates(args(0))
     "clearPKDCertificates" -> clearPKDCertificates()
     "startNewSession" -> startNewSession()
-    "connectBluetoothDevice" -> connectBluetoothDevice(callback)
+    "connectBluetoothDevice" -> connectBluetoothDevice(args(0), callback)
     "btDeviceRequestFlashing" -> btDeviceRequestFlashing()
     "btDeviceRequestFlashingFullIR" -> btDeviceRequestFlashingFullIR()
     "btDeviceRequestTurnOffAll" -> btDeviceRequestTurnOffAll()
@@ -148,7 +149,7 @@ fun getDocumentReaderStatus(callback: Callback) = callback(Instance().status)
 
 fun getRfidSessionStatus(iosOnly: Callback) = iosOnly(null)
 
-fun setRfidSessionStatus(iosOnly: String?) = Unit
+fun setRfidSessionStatus() = Unit
 
 fun getTag(callback: Callback) = callback(Instance().tag)
 
@@ -476,7 +477,8 @@ fun prepareCompletion(callback: Callback) = object : IDocumentReaderPrepareDbCom
 
 fun initCompletion(callback: Callback) = IDocumentReaderInitCompletion { success, error ->
     if (success) {
-        Instance().setVideoEncoderCompletion { _, file -> sendEvent(videoEncoderCompletionEvent, file.path) }
+        videoEncoderCompletion = IVideoEncoderCompletion { _, file -> sendEvent(videoEncoderCompletionEvent, file.path) }
+        Instance().setVideoEncoderCompletion(videoEncoderCompletion)
         Instance().setOnClickListener { sendEvent(onCustomButtonTappedEvent, it.tag) }
     }
     callback(generateSuccessCompletion(success, error))
@@ -577,3 +579,4 @@ fun stopBackgroundRFID() {
 
 // Weak references
 lateinit var localizationCallbacks: LocalizationCallbacks
+lateinit var videoEncoderCompletion: IVideoEncoderCompletion

package/examples/capacitor/index.tsx

@@ -6,11 +6,11 @@ import { File } from '@awesome-cordova-plugins/file'
 import { Camera, DestinationType, MediaType, PictureSourceType } from '@awesome-cordova-plugins/camera'
 import { main } from './src/main'
 
-document.addEventListener('deviceready', () => fetch("main.html")
-    .then(response => response.text())
-    .then(html => document.getElementById("content").innerHTML = html)
-    .then(_ => document.dispatchEvent(new Event('ready')))
-)
+document.addEventListener('deviceready', async () => {
+    document.getElementById("content").innerHTML = await fetch("main.html").then(r => r.text())
+    await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))
+    document.dispatchEvent(new Event('ready'))
+})
 
 export async function loadAsset(path: string): Promise<string> {
     var dir = await File.resolveDirectoryUrl(File.applicationDirectory + "public/assets")