@regulaforensics/react-native-document-reader-api 7.4.735 → 7.5.85-rc

package/README.md

@@ -8,7 +8,7 @@ This repository contains the source code of the Document Reader API, and the sam
 
 ## Documentation
 
-You can find documentation [here](https://docs.regulaforensics.com/develop/doc-reader-sdk/mobile/react-native).
+You can find documentation [here](https://docs.regulaforensics.com/develop/doc-reader-sdk/mobile).
 
 ## License
 

package/RNDocumentReaderApi.podspec

@@ -12,8 +12,8 @@ Pod::Spec.new do |s|
   s.homepage     = 'https://regulaforensics.com'
 
   s.source       = { :http => 'file:' + __dir__ }
-  s.ios.deployment_target = '11.0'
+  s.ios.deployment_target = '13.0'
   s.source_files  = "ios/*.{h,m}"
-  s.dependency 'DocumentReader', '7.4.3900'
+  s.dependency 'DocumentReaderStage', '7.7.4492'
   s.dependency 'React'
 end

package/android/build.gradle

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

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

@@ -5,10 +5,13 @@
 //  Created by Pavel Masiuk on 21.09.2023.
 //  Copyright © 2023 Regula. All rights reserved.
 //
+@file:SuppressLint("MissingPermission")
 
 package com.regula.documentreader
 
-import android.Manifest.permission.*
+import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.Manifest.permission.BLUETOOTH_CONNECT
+import android.Manifest.permission.BLUETOOTH_SCAN
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter
@@ -19,94 +22,137 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
-import androidx.annotation.RequiresPermission
-import androidx.core.app.ActivityCompat.requestPermissions
 import androidx.core.content.ContextCompat.checkSelfPermission
-import com.regula.documentreader.api.ble.BLEWrapper
-import com.regula.documentreader.api.ble.BleWrapperCallback
-import com.regula.documentreader.api.ble.RegulaBleService
+import com.regula.common.ble.BLEWrapper
+import com.regula.common.ble.BleWrapperCallback
+import com.regula.common.ble.RegulaBleService
 import com.regula.documentreader.api.internal.permission.BluetoothPermissionHelper.BLE_ACCESS_PERMISSION
 import com.regula.documentreader.api.internal.permission.BluetoothSettingsHelper.isBluetoothEnabled
 import com.regula.documentreader.api.internal.permission.BluetoothSettingsHelper.isLocationServiceEnabled
+import java.util.Timer
+import java.util.TimerTask
 
-const val REQUEST_ENABLE_LOCATION = 196
-const val REQUEST_ENABLE_BT = 197
+const val SEARCHING_TIMEOUT: Long = 7000
+
+const val INTENT_REQUEST_ENABLE_LOCATION = 196
+const val INTENT_REQUEST_ENABLE_BLUETOOTH = 197
 
 @SuppressLint("StaticFieldLeak")
-var bleManager: BLEWrapper? = null
+lateinit var bluetooth: BLEWrapper
+lateinit var savedCallbackForPermissionResult: Callback
+var deviceConnected = false
 
-@RequiresPermission("android.permission.BLUETOOTH_CONNECT")
-fun requestEnableBle(activity: Activity) {
-    val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-    activity.startActivityForResult(enableIntent, REQUEST_ENABLE_BT)
+fun connectBluetoothDevice(callback: Callback) {
+    // return if already connected
+    if (deviceConnected) return
+
+    // If some of the bluetooth permissions/settings don't match the requirements,
+    // save callback for later and request the permissions/settings.
+    // Callback will then be used in onRequestPermissionsResult for permission requests
+    // and in onActivityResult for settings change requests.
+    if (!isBluetoothSettingsReady(activity)) {
+        savedCallbackForPermissionResult = callback
+        return
+    }
+
+    // set searching timeout
+    val timer = object : TimerTask() {
+        override fun run() {
+            callback.success(false)
+            bluetooth.stopDeviceScan()
+            bluetooth.disconnect()
+        }
+    }
+    Timer().schedule(timer, SEARCHING_TIMEOUT)
+
+    // start searching devices
+    val bleIntent = Intent(context, RegulaBleService::class.java)
+    context.startService(bleIntent)
+    context.bindService(bleIntent, object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            bluetooth = (service as RegulaBleService.LocalBinder).service.bleManager
+            bluetooth.addCallback(object : BleWrapperCallback() {
+                override fun onDeviceReady() {
+                    timer.cancel()
+                    bluetooth.removeCallback(this)
+                    deviceConnected = true
+                    callback.success(true)
+                }
+            })
+        }
+
+        override fun onServiceDisconnected(name: ComponentName) {}
+    }, 0)
 }
 
-fun requestEnableLocationService(activity: Activity) {
-    val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-    activity.startActivityForResult(myIntent, REQUEST_ENABLE_LOCATION)
+fun onRequestPermissionsResult(
+    requestCode: Int,
+    permissions: Array<String>,
+    grantResults: IntArray
+): Boolean {
+    if (requestCode != BLE_ACCESS_PERMISSION || permissions.isEmpty()) return false
+    if (grantResults.isEmpty() || grantResults[0] != PERMISSION_GRANTED) {
+        savedCallbackForPermissionResult.success(false)
+        return true
+    }
+    connectBluetoothDevice(savedCallbackForPermissionResult)
+    return true
 }
 
-// requestEnableBle() is called after a check for permission
-@SuppressLint("MissingPermission")
-fun isBlePermissionsGranted(activity: Activity): Boolean {
-    if (!isLocationServiceEnabled(activity)) {
-        requestEnableLocationService(activity)
-        return false
+fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") data: Intent?): Boolean {
+    var resultCode = rc
+    if (requestCode == INTENT_REQUEST_ENABLE_LOCATION)
+        resultCode = if (isLocationServiceEnabled(activity)) Activity.RESULT_OK
+        else requestCode
+
+    if (requestCode == INTENT_REQUEST_ENABLE_BLUETOOTH || requestCode == INTENT_REQUEST_ENABLE_LOCATION) {
+        if (resultCode == Activity.RESULT_OK)
+            connectBluetoothDevice(savedCallbackForPermissionResult)
+        else
+            savedCallbackForPermissionResult.success(false)
+        return true
     }
-    deniedBluetoothPermissions(activity)?.let {
+    return false
+}
+
+fun isBluetoothSettingsReady(activity: Activity): Boolean {
+    deniedBluetoothPermissions()?.let {
         requestPermissions(activity, it, BLE_ACCESS_PERMISSION)
         return false
     }
     if (!isBluetoothEnabled(activity)) {
-        requestEnableBle(activity)
+        requestEnableBluetooth(activity)
+        return false
+    }
+    if (!isLocationServiceEnabled(activity)) {
+        requestEnableLocationService(activity)
         return false
     }
     return true
 }
 
-fun deniedBluetoothPermissions(activity: Activity): Array<String>? {
+fun deniedBluetoothPermissions(): Array<String>? {
     val result = mutableListOf<String>()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-        result.addAll(deniedBluetoothPermission(activity, BLUETOOTH_SCAN))
-        result.addAll(deniedBluetoothPermission(activity, BLUETOOTH_CONNECT))
+        result.addAll(deniedBluetoothPermission(BLUETOOTH_SCAN))
+        result.addAll(deniedBluetoothPermission(BLUETOOTH_CONNECT))
     } else
-        result.addAll(deniedBluetoothPermission(activity, ACCESS_FINE_LOCATION))
+        result.addAll(deniedBluetoothPermission(ACCESS_FINE_LOCATION))
     return result.let { if (it.size > 0) it.toTypedArray() else null }
 }
 
-fun deniedBluetoothPermission(
-    activity: Activity,
-    permission: String
-): Array<String> {
-    if (checkSelfPermission(activity, permission) != PERMISSION_GRANTED)
+fun deniedBluetoothPermission(permission: String): Array<String> {
+    if (checkSelfPermission(context, permission) != PERMISSION_GRANTED)
         return arrayOf(permission)
     return arrayOf()
 }
 
-fun startBluetoothService(
-    activity: Activity,
-    onConnected: (Boolean) -> Unit,
-    onDisconnected: () -> Unit,
-    onReady: () -> Unit
-) {
-    val bleIntent = Intent(activity, RegulaBleService::class.java)
-    activity.startService(bleIntent)
-
-    activity.bindService(bleIntent, object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName, service: IBinder) {
-            bleManager = (service as RegulaBleService.LocalBinder).service.bleManager
-            val isBleManagerConnected = bleManager?.isConnected == true
-            onConnected(isBleManagerConnected)
-            if (!isBleManagerConnected) {
-                bleManager?.addCallback(object : BleWrapperCallback() {
-                    override fun onDeviceReady() {
-                        bleManager!!.removeCallback(this)
-                        onReady()
-                    }
-                })
-            }
-        }
+fun requestEnableBluetooth(activity: Activity) {
+    val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+    startActivityForResult(activity, enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
+}
 
-        override fun onServiceDisconnected(name: ComponentName) = onDisconnected()
-    }, 0)
-}
+fun requestEnableLocationService(activity: Activity) {
+    val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+    startActivityForResult(activity, myIntent, INTENT_REQUEST_ENABLE_LOCATION)
+}

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

@@ -1,11 +1,13 @@
 //
-//  Config.java
+//  Config.kt
 //  DocumentReader
 //
 //  Created by Pavel Masiuk on 21.09.2023.
 //  Copyright © 2023 Regula. All rights reserved.
 //
 
+@file:Suppress("EnumValuesSoftDeprecate")
+
 package com.regula.documentreader
 
 import android.content.Context
@@ -26,6 +28,7 @@ import com.regula.documentreader.api.params.LivenessParams
 import com.regula.documentreader.api.params.ParamsCustomization
 import com.regula.documentreader.api.params.ProcessParam
 import com.regula.documentreader.api.params.RfidScenario
+import com.regula.documentreader.api.params.rfid.dg.DTCDataGroup
 import com.regula.documentreader.api.params.rfid.dg.DataGroups
 import com.regula.documentreader.api.params.rfid.dg.EIDDataGroups
 import com.regula.documentreader.api.params.rfid.dg.EPassportDataGroups
@@ -52,6 +55,7 @@ fun setFunctionality(functionality: Functionality, opts: JSONObject) = opts.forE
         "isCameraTorchCheckDisabled" -> editor.setIsCameraTorchCheckDisabled(v as Boolean)
         "recordScanningProcess" -> editor.setDoRecordProcessingVideo(v as Boolean)
         "manualMultipageMode" -> editor.setManualMultipageMode(v as Boolean)
+        "torchTurnedOn" -> editor.setTorchTurnedOn(v as Boolean)
         "showCaptureButtonDelayFromDetect" -> editor.setShowCaptureButtonDelayFromDetect(v.toLong())
         "showCaptureButtonDelayFromStart" -> editor.setShowCaptureButtonDelayFromStart(v.toLong())
         "orientation" -> editor.setOrientation(v.toInt())
@@ -85,6 +89,7 @@ fun getFunctionality(functionality: Functionality) = mapOf(
     "isCameraTorchCheckDisabled" to functionality.isCameraTorchCheckDisabled,
     "recordScanningProcess" to functionality.doRecordProcessingVideo(),
     "manualMultipageMode" to functionality.isManualMultipageMode,
+    "torchTurnedOn" to functionality.isTorchTurnedOn,
     "showCaptureButtonDelayFromDetect" to functionality.showCaptureButtonDelayFromDetect,
     "showCaptureButtonDelayFromStart" to functionality.showCaptureButtonDelayFromStart,
     "orientation" to functionality.orientation,
@@ -129,12 +134,17 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "shouldReturnPackageForReprocess" -> processParams.shouldReturnPackageForReprocess = v as Boolean
         "disablePerforationOCR" -> processParams.disablePerforationOCR = v as Boolean
         "respectImageQuality" -> processParams.respectImageQuality = v as Boolean
+        "strictImageQuality" -> processParams.strictImageQuality = v as Boolean
         "splitNames" -> processParams.splitNames = v as Boolean
         "doDetectCan" -> processParams.doDetectCan = v as Boolean
         "useFaceApi" -> processParams.useFaceApi = v as Boolean
         "useAuthenticityCheck" -> processParams.useAuthenticityCheck = v as Boolean
         "checkHologram" -> processParams.checkHologram = v as Boolean
         "generateNumericCodes" -> processParams.generateNumericCodes = v as Boolean
+        "strictBarcodeDigitalSignatureCheck" -> processParams.strictBarcodeDigitalSignatureCheck = v as Boolean
+        "selectLongestNames" -> processParams.selectLongestNames = v as Boolean
+        "generateDTCVC" -> processParams.generateDTCVC = v as Boolean
+        "strictDLCategoryExpiry" -> processParams.strictDLCategoryExpiry = v as Boolean
         "measureSystem" -> processParams.measureSystem = v.toInt()
         "barcodeParserType" -> processParams.barcodeParserType = v.toInt()
         "perspectiveAngle" -> processParams.perspectiveAngle = v.toInt()
@@ -153,7 +163,6 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "dateFormat" -> processParams.dateFormat = v as String
         "scenario" -> processParams.scenario = v as String
         "captureButtonScenario" -> processParams.captureButtonScenario = v as String
-        "sessionLogFolder" -> processParams.sessionLogFolder = v as String
         "timeout" -> processParams.timeout = v.toDouble()
         "timeoutFromFirstDetect" -> processParams.timeoutFromFirstDetect = v.toDouble()
         "timeoutFromFirstDocType" -> processParams.timeoutFromFirstDocType = v.toDouble()
@@ -207,12 +216,17 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "shouldReturnPackageForReprocess" to processParams.shouldReturnPackageForReprocess,
     "disablePerforationOCR" to processParams.disablePerforationOCR,
     "respectImageQuality" to processParams.respectImageQuality,
+    "strictImageQuality" to processParams.strictImageQuality,
     "splitNames" to processParams.splitNames,
     "doDetectCan" to processParams.doDetectCan,
     "useFaceApi" to processParams.useFaceApi,
     "useAuthenticityCheck" to processParams.useAuthenticityCheck,
     "checkHologram" to processParams.checkHologram,
     "generateNumericCodes" to processParams.generateNumericCodes,
+    "strictBarcodeDigitalSignatureCheck" to processParams.strictBarcodeDigitalSignatureCheck,
+    "selectLongestNames" to processParams.selectLongestNames,
+    "generateDTCVC" to processParams.generateDTCVC,
+    "strictDLCategoryExpiry" to processParams.strictDLCategoryExpiry,
     "measureSystem" to processParams.measureSystem,
     "barcodeParserType" to processParams.barcodeParserType,
     "perspectiveAngle" to processParams.perspectiveAngle,
@@ -231,7 +245,6 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "dateFormat" to processParams.dateFormat,
     "scenario" to processParams.scenario,
     "captureButtonScenario" to processParams.captureButtonScenario,
-    "sessionLogFolder" to processParams.sessionLogFolder,
     "timeout" to processParams.timeout,
     "timeoutFromFirstDetect" to processParams.timeoutFromFirstDetect,
     "timeoutFromFirstDocType" to processParams.timeoutFromFirstDocType,
@@ -278,6 +291,7 @@ fun setCustomization(customization: ParamsCustomization, opts: JSONObject, conte
         "activityIndicatorColor" -> editor.setActivityIndicatorColor(v.toColor())
         "statusBackgroundColor" -> editor.setStatusBackgroundColor(v.toColor())
         "cameraPreviewBackgroundColor" -> editor.setCameraPreviewBackgroundColor(v.toColor())
+        "backgroundMaskColor" -> editor.setBackgroundMaskColor(v.toColor())
         "statusPositionMultiplier" -> editor.setStatusPositionMultiplier(v.toFloat())
         "resultStatusPositionMultiplier" -> editor.setResultStatusPositionMultiplier(v.toFloat())
         "toolbarSize" -> editor.setToolbarSize(v.toFloat())
@@ -288,6 +302,8 @@ fun setCustomization(customization: ParamsCustomization, opts: JSONObject, conte
         "cameraFramePortraitAspectRatio" -> editor.setCameraFramePortraitAspectRatio(v.toFloat())
         "cameraFrameCornerRadius" -> editor.setCameraFrameCornerRadius(v.toFloat())
         "livenessAnimationPositionMultiplier" -> editor.setLivenessAnimationPositionMultiplier(v.toFloat())
+        "nextPageAnimationStartDelay" -> editor.setNextPageAnimationStartDelay(v.toFloat())
+        "nextPageAnimationEndDelay" -> editor.setNextPageAnimationEndDelay(v.toFloat())
         "multipageAnimationFrontImage" -> editor.setMultipageAnimationFrontImage(v.toDrawable(context))
         "multipageAnimationBackImage" -> editor.setMultipageAnimationBackImage(v.toDrawable(context))
         "borderBackgroundImage" -> editor.setBorderBackgroundImage(v.toDrawable(context))
@@ -349,6 +365,7 @@ fun getCustomization(customization: ParamsCustomization) = mapOf(
     "activityIndicatorColor" to customization.activityIndicatorColor.toLong(),
     "statusBackgroundColor" to customization.statusBackgroundColor.toLong(),
     "cameraPreviewBackgroundColor" to customization.cameraPreviewBackgroundColor.toLong(),
+    "backgroundMaskColor" to customization.backgroundMaskColor.toLong(),
     "statusPositionMultiplier" to customization.statusPositionMultiplier,
     "resultStatusPositionMultiplier" to customization.resultStatusPositionMultiplier,
     "backgroundMaskAlpha" to customization.backgroundMaskAlpha,
@@ -359,6 +376,8 @@ fun getCustomization(customization: ParamsCustomization) = mapOf(
     "cameraFramePortraitAspectRatio" to customization.cameraFramePortraitAspectRatio,
     "cameraFrameCornerRadius" to customization.cameraFrameCornerRadius,
     "livenessAnimationPositionMultiplier" to customization.livenessAnimationPositionMultiplier,
+    "nextPageAnimationStartDelay" to customization.nextPageAnimationStartDelay,
+    "nextPageAnimationEndDelay" to customization.nextPageAnimationEndDelay,
     "multipageAnimationFrontImage" to customization.multipageAnimationFrontImage.toString(),
     "multipageAnimationBackImage" to customization.multipageAnimationBackImage.toString(),
     "borderBackgroundImage" to customization.borderBackgroundImage.toString(),
@@ -422,6 +441,10 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "applyAmendments" -> rfidScenario.isApplyAmendments = v as Boolean
         "autoSettings" -> rfidScenario.isAutoSettings = v as Boolean
         "proceedReadingAlways" -> rfidScenario.proceedReadingAlways = v as Boolean
+        "readDTC" -> rfidScenario.isReadDTC = v as Boolean
+        "mrzStrictCheck" -> rfidScenario.isMrzStrictCheck = v as Boolean
+        "loadCRLFromRemote" -> rfidScenario.isLoadCRLFromRemote = v as Boolean
+        "independentSODStatus" -> rfidScenario.isIndependentSODStatus = v as Boolean
         "signManagementAction" -> rfidScenario.signManagementAction = v.toInt()
         "readingBuffer" -> rfidScenario.readingBuffer = v.toInt()
         "onlineTAToSignDataType" -> rfidScenario.onlineTAToSignDataType = v.toInt()
@@ -437,9 +460,11 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "mrz" -> rfidScenario.mrz = v as String
         "eSignPINDefault" -> rfidScenario.seteSignPINDefault(v as String)
         "eSignPINNewValue" -> rfidScenario.seteSignPINNewValue(v as String)
+        "cardAccess" -> rfidScenario.cardAccess = v as String
         "ePassportDataGroups" -> setDataGroups(rfidScenario.ePassportDataGroups(), v as JSONObject)
         "eIDDataGroups" -> setDataGroups(rfidScenario.eIDDataGroups(), v as JSONObject)
         "eDLDataGroups" -> setDataGroups(rfidScenario.eDLDataGroups(), v as JSONObject)
+        "dtcDataGroups" -> setDTCDataGroup(rfidScenario.DTCDataGroup(), v as JSONObject)
     }
 }
 
@@ -478,6 +503,10 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "applyAmendments" to rfidScenario.isApplyAmendments,
     "autoSettings" to rfidScenario.isAutoSettings,
     "proceedReadingAlways" to rfidScenario.proceedReadingAlways,
+    "readDTC" to rfidScenario.isReadDTC,
+    "mrzStrictCheck" to rfidScenario.isMrzStrictCheck,
+    "loadCRLFromRemote" to rfidScenario.isLoadCRLFromRemote,
+    "independentSODStatus" to rfidScenario.isIndependentSODStatus,
     "signManagementAction" to rfidScenario.signManagementAction,
     "readingBuffer" to rfidScenario.readingBuffer,
     "onlineTAToSignDataType" to rfidScenario.onlineTAToSignDataType,
@@ -493,9 +522,11 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "mrz" to rfidScenario.mrz,
     "eSignPINDefault" to rfidScenario.geteSignPINDefault(),
     "eSignPINNewValue" to rfidScenario.geteSignPINNewValue(),
+    "cardAccess" to rfidScenario.cardAccess,
     "ePassportDataGroups" to getDataGroups(rfidScenario.ePassportDataGroups()),
     "eIDDataGroups" to getDataGroups(rfidScenario.eIDDataGroups()),
-    "eDLDataGroups" to getDataGroups(rfidScenario.eDLDataGroups())
+    "eDLDataGroups" to getDataGroups(rfidScenario.eDLDataGroups()),
+    "dtcDataGroups" to getDTCDataGroup(rfidScenario.DTCDataGroup())
 ).toJsonObject()
 
 fun setDataGroups(dataGroup: DataGroups, opts: JSONObject) = opts.forEach { k, v ->
@@ -564,6 +595,25 @@ fun getDataGroups(dataGroup: DataGroups): JSONObject {
     return result.toJsonObject()
 }
 
+fun setDTCDataGroup(dataGroup: DTCDataGroup, opts: JSONObject) = opts.forEach { k, v ->
+    val value = v as Boolean
+    when (k) {
+        "DG17" -> dataGroup.isDG17 = value
+        "DG18" -> dataGroup.isDG18 = value
+        "DG22" -> dataGroup.isDG22 = value
+        "DG23" -> dataGroup.isDG23 = value
+        "DG24" -> dataGroup.isDG24 = value
+    }
+}
+
+fun getDTCDataGroup(dataGroup: DTCDataGroup) = mapOf(
+    "DG17" to dataGroup.isDG17,
+    "DG18" to dataGroup.isDG18,
+    "DG22" to dataGroup.isDG22,
+    "DG23" to dataGroup.isDG23,
+    "DG24" to dataGroup.isDG24,
+).toJsonObject()
+
 fun setImageQA(input: ImageQA, opts: JSONObject) = opts.forEach { k, v ->
     when (k) {
         "focusCheck" -> input.focusCheck = v as Boolean
@@ -576,6 +626,7 @@ fun setImageQA(input: ImageQA, opts: JSONObject) = opts.forEach { k, v ->
         "brightnessThreshold" -> input.brightnessThreshold = v.toDouble()
         "expectedPass" -> input.expectedPass = v.toIntArray()
         "glaresCheckParams" -> input.glaresCheckParams = glaresCheckParamsFromJSON(v as JSONObject)
+        "occlusionCheck" -> input.occlusionCheck = v as Boolean
     }
 }
 
@@ -590,6 +641,7 @@ fun getImageQA(input: ImageQA) = mapOf(
     "brightnessThreshold" to input.brightnessThreshold,
     "expectedPass" to input.expectedPass.generate(),
     "glaresCheckParams" to generateGlaresCheckParams(input.glaresCheckParams),
+    "occlusionCheck" to input.occlusionCheck,
 ).toJsonObject()
 
 fun setAuthenticityParams(input: AuthenticityParams, opts: JSONObject) = opts.forEach { k, v ->
@@ -608,6 +660,7 @@ fun setAuthenticityParams(input: AuthenticityParams, opts: JSONObject) = opts.fo
         "checkPhotoEmbedding" -> input.checkPhotoEmbedding = v as Boolean
         "checkPhotoComparison" -> input.checkPhotoComparison = v as Boolean
         "checkLetterScreen" -> input.checkLetterScreen = v as Boolean
+        "checkSecurityText" -> input.checkSecurityText = v as Boolean
         "livenessParams" -> {
             if (input.livenessParams == null) input.livenessParams = LivenessParams.defaultParams()
             setLivenessParams(input.livenessParams!!, v as JSONObject)
@@ -631,6 +684,7 @@ fun getAuthenticityParams(input: AuthenticityParams?) = input?.let {
         "checkPhotoEmbedding" to it.checkPhotoEmbedding,
         "checkPhotoComparison" to it.checkPhotoComparison,
         "checkLetterScreen" to it.checkLetterScreen,
+        "checkSecurityText" to it.checkSecurityText,
         "livenessParams" to getLivenessParams(it.livenessParams)
     ).toJsonObject()
 }
@@ -641,6 +695,8 @@ fun setLivenessParams(input: LivenessParams, opts: JSONObject) = opts.forEach {
         "checkMLI" -> input.checkMLI = v as Boolean
         "checkHolo" -> input.checkHolo = v as Boolean
         "checkED" -> input.checkED = v as Boolean
+        "checkBlackAndWhiteCopy" -> input.checkBlackAndWhiteCopy = v as Boolean
+        "checkDynaprint" -> input.checkDynaprint = v as Boolean
     }
 }
 
@@ -649,7 +705,9 @@ fun getLivenessParams(input: LivenessParams?) = input?.let {
         "checkOVI" to input.checkOVI,
         "checkMLI" to input.checkMLI,
         "checkHolo" to input.checkHolo,
-        "checkED" to input.checkED
+        "checkED" to input.checkED,
+        "checkBlackAndWhiteCopy" to input.checkBlackAndWhiteCopy,
+        "checkDynaprint" to input.checkDynaprint,
     ).toJsonObject()
 }
 

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

@@ -1,5 +1,5 @@
 //
-//  JSONConstructor.java
+//  JSONConstructor.kt
 //  DocumentReader
 //
 //  Created by Pavel Masiuk on 21.09.2023.
@@ -26,6 +26,7 @@ import com.regula.documentreader.api.enums.PDF417Info
 import com.regula.documentreader.api.enums.eGraphicFieldType
 import com.regula.documentreader.api.enums.eRFID_DataFile_Type
 import com.regula.documentreader.api.enums.eRPRM_Lights
+import com.regula.documentreader.api.listener.NetworkInterceptorListener
 import com.regula.documentreader.api.params.AuthenticityParams
 import com.regula.documentreader.api.params.BackendProcessingConfig
 import com.regula.documentreader.api.params.BleDeviceConfig
@@ -46,6 +47,7 @@ import com.regula.documentreader.api.params.rfid.TccParams
 import com.regula.documentreader.api.params.rfid.authorization.PAAttribute
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer
 import com.regula.documentreader.api.params.rfid.authorization.TAChallenge
+import com.regula.documentreader.api.params.rfid.dg.DTCDataGroup
 import com.regula.documentreader.api.params.rfid.dg.EDLDataGroups
 import com.regula.documentreader.api.params.rfid.dg.EIDDataGroups
 import com.regula.documentreader.api.params.rfid.dg.EPassportDataGroups
@@ -105,6 +107,8 @@ import com.regula.documentreader.Convert.generateByteArray
 import org.json.JSONArray
 import org.json.JSONObject
 
+val weakReferencesHolder = mutableListOf<Any>()
+
 fun generateCompletion(action: Int, results: DocumentReaderResults?, error: RegulaException?, context: Context?) = object : JSONObject() { init {
     put("action", action)
     if (listOf(
@@ -174,6 +178,7 @@ fun transactionInfoFromJSON(temp: JSONObject?): TransactionInfo? {
 
     if (input.has("transactionId")) result.transactionId = input.getString("transactionId")
     if (input.has("tag")) result.tag = input.getString("tag")
+    if (input.has("sessionLogFolder")) result.sessionLogFolder = input.getString("sessionLogFolder")
 
     return result
 }
@@ -185,6 +190,7 @@ fun generateTransactionInfo(temp: TransactionInfo?): JSONObject? {
 
     result.put("transactionId", input.transactionId)
     result.put("tag", input.tag)
+    result.put("sessionLogFolder", input.sessionLogFolder)
 
     return result
 }
@@ -243,6 +249,17 @@ fun generateDocReaderConfig(temp: DocReaderConfig?): JSONObject? {
     return result
 }
 
+fun bleDeviceConfigFromJSON(input: JSONObject): BleDeviceConfig {
+    var result = BleDeviceConfig(bluetooth)
+
+    if (input.has("customDb")) result = BleDeviceConfig(bluetooth, byteArrayFromBase64(input.getString("customDb")))
+    if (input.has("licenseUpdate")) result.setLicenseUpdate(input.getBoolean("licenseUpdate"))
+    if (input.has("delayedNNLoad")) result.isDelayedNNLoad = input.getBoolean("delayedNNLoad")
+    if (input.has("blackList")) result.blackList = input.getJSONObject("blackList")
+
+    return result
+}
+
 fun scannerConfigFromJSON(input: JSONObject): ScannerConfig {
     val builder = if (input.has("scenario")) ScannerConfig.Builder(input.getString("scenario"))
     else ScannerConfig.Builder(onlineProcessingConfigFromJSON(input.getJSONObject("onlineProcessingConfig"))!!)
@@ -274,6 +291,7 @@ fun recognizeConfigFromJSON(input: JSONObject): RecognizeConfig {
     else RecognizeConfig.Builder(onlineProcessingConfigFromJSON(input.getJSONObject("onlineProcessingConfig"))!!)
 
     if (input.has("oneShotIdentification")) builder.setOneShotIdentification(input.getBoolean("oneShotIdentification"))
+    if (input.has("dtc")) builder.setDTC(byteArrayFromBase64(input.getString("dtc"))!!)
     if (input.has("livePortrait")) builder.setLivePortrait(bitmapFromBase64(input.getString("livePortrait"))!!)
     if (input.has("extPortrait")) builder.setExtPortrait(bitmapFromBase64(input.getString("extPortrait"))!!)
     if (input.has("image")) builder.setBitmap(bitmapFromBase64(input.getString("image"))!!)
@@ -302,6 +320,7 @@ fun generateRecognizeConfig(temp: RecognizeConfig?): JSONObject? {
     result.put("scenario", input.scenario)
     result.put("onlineProcessingConfig", generateOnlineProcessingConfig(input.onlineProcessingConfig))
     result.put("oneShotIdentification", input.oneShotIdentification)
+    result.put("dtc", generateByteArray(input.dtc))
     result.put("livePortrait", bitmapToBase64(input.livePortrait))
     result.put("extPortrait", bitmapToBase64(input.extPortrait))
     result.put("image", bitmapToBase64(input.bitmap))
@@ -325,6 +344,7 @@ fun backendProcessingConfigFromJSON(temp: JSONObject?): BackendProcessingConfig?
     val result = BackendProcessingConfig(input.getString("url"))
     if (input.has("httpHeaders")) result.httpHeaders = stringMapFromJson(input.getJSONObject("httpHeaders"))
     if (input.has("rfidServerSideChipVerification")) result.rfidServerSideChipVerification = input.getBoolean("rfidServerSideChipVerification")
+    if (input.has("timeoutConnection")) result.timeoutConnection = input.getDouble("timeoutConnection")
 
     return result
 }
@@ -337,6 +357,7 @@ fun generateBackendProcessingConfig(temp: BackendProcessingConfig?): JSONObject?
     result.put("url", input.url)
     result.put("httpHeaders", generateStringMap(input.httpHeaders))
     result.put("rfidServerSideChipVerification", input.rfidServerSideChipVerification)
+    result.put("timeoutConnection", input.timeoutConnection)
 
     return result
 }
@@ -350,6 +371,11 @@ fun onlineProcessingConfigFromJSON(temp: JSONObject?): OnlineProcessingConfig? {
     if (input.has("url")) builder.setUrl(input.getString("url"))
     if (input.has("imageCompressionQuality")) builder.setImageCompressionQuality(input.getDouble("imageCompressionQuality").toFloat())
     if (input.has("processParams")) builder.setProcessParams(processParamFromJSON(input.getJSONObject("processParams")))
+    if (input.has("requestHeaders")) {
+        val listener = NetworkInterceptorListener { input.getJSONObject("requestHeaders").forEach { k, v -> it.setRequestProperty(k, v as String) } }
+        weakReferencesHolder.add(listener)
+        builder.setNetworkInterceptorListener(listener)
+    }
 
     return builder.build()
 }
@@ -508,6 +534,14 @@ fun eIDDataGroupsFromJSON(input: JSONObject): EIDDataGroups {
 
 fun generateEIDDataGroups(input: EIDDataGroups): JSONObject = getDataGroups(input)
 
+fun dtcDataGroupFromJSON(input: JSONObject): DTCDataGroup {
+    val result = DTCDataGroup()
+    setDTCDataGroup(result, input)
+    return result
+}
+
+fun generateDTCDataGroup(input: DTCDataGroup): JSONObject = getDTCDataGroup(input)
+
 fun rfidScenarioFromJSON(input: JSONObject): RfidScenario {
     val result = RfidScenario()
     setRfidScenario(result, input)
@@ -573,18 +607,6 @@ fun generateTypeface(temp: Typeface?, size: Int? = null): JSONObject? {
     return result
 }
 
-fun bleDeviceConfigFromJSON(input: JSONObject): BleDeviceConfig {
-    val bleWrapper = bleManager
-    var result = BleDeviceConfig(bleWrapper)
-
-    if (input.has("customDb")) result = BleDeviceConfig(bleWrapper!!, byteArrayFromBase64(input.getString("customDb")))
-    if (input.has("licenseUpdate")) result.setLicenseUpdate(input.getBoolean("licenseUpdate"))
-    if (input.has("delayedNNLoad")) result.isDelayedNNLoad = input.getBoolean("delayedNNLoad")
-    if (input.has("blackList")) result.blackList = input.getJSONObject("blackList")
-
-    return result
-}
-
 fun imageInputDataFromJSON(temp: JSONObject?): ImageInputData? {
     if (temp == null || !temp.has("image")) return null
     val input: JSONObject = temp
@@ -1701,6 +1723,7 @@ fun generateDocumentReaderAuthenticityResult(temp: DocumentReaderAuthenticityRes
     temp ?: return null
     val input: DocumentReaderAuthenticityResult = temp
 
+    @Suppress("DEPRECATION")
     result.put("status", input.status)
     result.put("checks", generateList(input.checks, ::generateDocumentReaderAuthenticityCheck, context))
 
@@ -2168,7 +2191,8 @@ fun documentReaderResultsFromJSON(temp: JSONObject?): DocumentReaderResults? {
     result.documentType = listFromJSON(input.optJSONArray("documentType"), ::documentReaderDocumentTypeFromJSON)!!
     result.status = documentReaderResultsStatusFromJSON(input.optJSONObject("status"))!!
     result.vdsncData = vdsncDataFromJSON(input.optJSONObject("vdsncData")!!)
-    result.transactionInfo = transactionInfoFromJSON(input.optJSONObject("transactionInfo"))
+    result.dtcData = input.getString("dtcData")
+    result.transactionInfo = transactionInfoFromJSON(input.optJSONObject("transactionInfo"))!!
 
     return result
 }
@@ -2196,6 +2220,7 @@ fun generateDocumentReaderResults(temp: DocumentReaderResults?, context: Context
     result.put("documentType", generateList(input.documentType, ::generateDocumentReaderDocumentType))
     result.put("status", generateDocumentReaderResultsStatus(input.status))
     result.put("vdsncData", generateVDSNCData(input.vdsncData))
+    result.put("dtcData", input.dtcData)
     result.put("transactionInfo", generateTransactionInfo(input.transactionInfo))
 
     return result