8.4.609

Author: Jenkins

.dart_tool/package_config.json

@@ -87,9 +87,9 @@
     },
     {
       "name": "meta",
-      "rootUri": "file:///Users/administratorregula/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///Users/administratorregula/.pub-cache/hosted/pub.dev/meta-1.17.0",
       "packageUri": "lib/",
-      "languageVersion": "2.12"
+      "languageVersion": "3.5"
     },
     {
       "name": "path",
@@ -135,7 +135,7 @@
     },
     {
       "name": "test_api",
-      "rootUri": "file:///Users/administratorregula/.pub-cache/hosted/pub.dev/test_api-0.7.6",
+      "rootUri": "file:///Users/administratorregula/.pub-cache/hosted/pub.dev/test_api-0.7.7",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
@@ -159,8 +159,8 @@
     }
   ],
   "generator": "pub",
-  "generatorVersion": "3.9.0",
+  "generatorVersion": "3.10.0-290.4.beta",
   "flutterRoot": "file:///Users/administratorregula/development/flutter",
-  "flutterVersion": "3.35.1",
+  "flutterVersion": "3.38.0",
   "pubCache": "file:///Users/administratorregula/.pub-cache"
 }

android/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     dependencies {
-        implementation('com.regula.documentreader:api:8.3.11882') {
+        implementation('com.regula.documentreader:api:8.4.12046') {
             transitive = true
         }
 

android/src/main/kotlin/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,16 +32,18 @@ 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)
         return
     }
 
     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> {

android/src/main/kotlin/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,30 +772,42 @@ 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 ->
     when (key) {
         "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)
     }
 }
 
 fun getFonts(fonts: Map<CustomizationFont, Typeface>, sizes: Map<CustomizationFont, Int>) = mapOf(
     "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>) =

android/src/main/kotlin/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
 }

android/src/main/kotlin/com/regula/plugin/documentreader/Main.kt

@@ -44,11 +44,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 +90,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 +148,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)
 

android/src/test/kotlin/com/regula/plugin/documentreader/FlutterDocumentReaderApiPlugin.kt

@@ -7,6 +7,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
+@Suppress("unused")
 val context: Context
     get() = ApplicationProvider.getApplicationContext()
 
@@ -16,10 +17,17 @@ class FlutterDocumentReaderApiPluginTest {
     // config
 
     @Test
-    fun initConfig() = compare("initConfig", ::initConfigFromJSON, ::generateInitConfig, "databasePath", "useBleDevice")
+    fun initConfig() = compare(
+        "initConfig", ::initConfigFromJSON, ::generateInitConfig,
+        "databasePath",
+        "useBleDevice"
+    )
 
     @Test
-    fun onlineProcessingConfig() = compare("onlineProcessingConfig", ::onlineProcessingConfigFromJSON, ::generateOnlineProcessingConfig, "requestHeaders")
+    fun onlineProcessingConfig() = compare(
+        "onlineProcessingConfig", ::onlineProcessingConfigFromJSON, ::generateOnlineProcessingConfig,
+        "requestHeaders"
+    )
 
     @Test
     fun imageInputData() = compare("imageInputData", ::imageInputDataFromJSON, ::generateImageInputData)
@@ -28,10 +36,16 @@ class FlutterDocumentReaderApiPluginTest {
     fun recognizeConfig() = compare("recognizeConfig", ::recognizeConfigFromJSON, ::generateRecognizeConfig)
 
     @Test
-    fun recognizeConfig2() = compare("recognizeConfig2", ::recognizeConfigFromJSON, ::generateRecognizeConfig, "onlineProcessingConfig.requestHeaders")
+    fun recognizeConfig2() = compare(
+        "recognizeConfig2", ::recognizeConfigFromJSON, ::generateRecognizeConfig,
+        "onlineProcessingConfig.requestHeaders"
+    )
 
     @Test
-    fun scannerConfig() = compare("scannerConfig", ::scannerConfigFromJSON, ::generateScannerConfig, "onlineProcessingConfig.requestHeaders")
+    fun scannerConfig() = compare(
+        "scannerConfig", ::scannerConfigFromJSON, ::generateScannerConfig,
+        "onlineProcessingConfig.requestHeaders"
+    )
 
     // params.process_params
 
@@ -103,7 +117,10 @@ class FlutterDocumentReaderApiPluginTest {
     @Test
     fun functionality() = compare(
         "functionality", ::functionalityFromJSON, ::generateFunctionality,
-        "useAuthenticator", "singleResult", "videoSessionPreset", "cameraPositionIOS"
+        "useAuthenticator",
+        "singleResult",
+        "videoSessionPreset",
+        "cameraPositionIOS"
     )
 
     // info
@@ -117,7 +134,8 @@ class FlutterDocumentReaderApiPluginTest {
     @Test
     fun docReaderScenario() = compare(
         "docReaderScenario", ::documentReaderScenarioFromJSON, ::generateDocumentReaderScenario,
-        "barcodeExt", "frame"
+        "barcodeExt",
+        "frame"
     )
 
     @Test
@@ -268,7 +286,10 @@ class FlutterDocumentReaderApiPluginTest {
     fun transactionInfo() = compare("transactionInfo", ::transactionInfoFromJSON, ::generateTransactionInfo)
 
     @Test
-    fun results() = compare("results", ::documentReaderResultsFromJSON, ::generateDocumentReaderResults, "vdsncData.certificateChain")
+    fun results() = compare(
+        "results", ::documentReaderResultsFromJSON, ::generateDocumentReaderResults,
+        "vdsncData.certificateChain"
+    )
 
     // rfid
 

example/README.md

@@ -5,7 +5,7 @@
 1. Download or the clone current repository using the command `git clone https://github.com/regulaforensics/DocumentReader-Flutter.git`.
 2. Put `regula.license` file at `assets/` (you can get a trial license [here](https://client.regulaforensics.com)).
 3. Put `db.dat` file at `ios/Runner/` and `android/app/src/main/assets/Regula/` (you can get a trial database [here](https://client.regulaforensics.com/customer/databases))
-4. Execute `flutter pub get` within this directory.
+4. Execute `flutter pub get && (cd ios && pod install || pod update)` within this directory.
 5. Run the app: `flutter run`.
 
 ## Additional examples

example/ios/Tests/Tests.swift

@@ -119,7 +119,17 @@ class Tests: XCTestCase {
                        "statusTextFont.style",
                        "resultStatusTextFont.style",
                        "multipageButtonTextFont.style",
-                       "fonts",])
+                       "colors.rfidEnableNfcButtonBackground",
+                       "colors.rfidEnableNfcButtonText",
+                       "colors.rfidEnableNfcDescriptionText",
+                       "colors.rfidEnableNfcTitleText",
+                       "fonts.rfidProcessingScreenHintLabel.style",
+                       "fonts.rfidProcessingScreenProgressLabel.style",
+                       "fonts.rfidProcessingScreenResultLabel.style",
+                       "fonts.rfidEnableNfcTitleText",
+                       "fonts.rfidEnableNfcDescriptionText",
+                       "fonts.rfidEnableNfcButtonText",
+                       "images.rfidEnableNfcImage",])
     }
 
     func test_functionality() {

example/pubspec.yaml

@@ -14,8 +14,8 @@ dependencies:
     sdk: flutter
   flutter_document_reader_api:
     path: ../
-  flutter_document_reader_core_fullauthrfid: 8.3.772
-  flutter_document_reader_btdevice: 7.6.17
+  flutter_document_reader_core_fullauthrfid: 8.4.1159
+  flutter_document_reader_btdevice:  7.6.17
   cupertino_icons: ^1.0.8
 
 dev_dependencies: