@regulaforensics/react-native-document-reader-api 7.6.787-nightly → 8.1.68-nightly

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 = '12.0'
+  s.ios.deployment_target = '13.0'
   s.source_files  = "ios/*.{h,m}"
-  s.dependency 'DocumentReaderNightly', '7.6.4234'
+  s.dependency 'DocumentReaderNightly', '8.1.4473'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:7.6.10434') {
+    implementation('com.regula.documentreader:api:8.1.11283') {
         transitive = true
     }
 }

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

@@ -22,11 +22,10 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
-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
@@ -67,9 +66,9 @@ fun connectBluetoothDevice(callback: Callback) {
     Timer().schedule(timer, SEARCHING_TIMEOUT)
 
     // start searching devices
-    val bleIntent = Intent(activity, RegulaBleService::class.java)
-    activity.startService(bleIntent)
-    activity.bindService(bleIntent, object : ServiceConnection {
+    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() {
@@ -88,7 +87,7 @@ fun connectBluetoothDevice(callback: Callback) {
 
 fun onRequestPermissionsResult(
     requestCode: Int,
-    permissions: Array<out String>,
+    permissions: Array<String>,
     grantResults: IntArray
 ): Boolean {
     if (requestCode != BLE_ACCESS_PERMISSION || permissions.isEmpty()) return false
@@ -117,7 +116,7 @@ fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") da
 }
 
 fun isBluetoothSettingsReady(activity: Activity): Boolean {
-    deniedBluetoothPermissions(activity)?.let {
+    deniedBluetoothPermissions()?.let {
         requestPermissions(activity, it, BLE_ACCESS_PERMISSION)
         return false
     }
@@ -132,31 +131,28 @@ fun isBluetoothSettingsReady(activity: Activity): Boolean {
     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 requestEnableBluetooth(activity: Activity) {
     val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-    activity.startActivityForResult(enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
+    startActivityForResult(activity, enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
 }
 
 fun requestEnableLocationService(activity: Activity) {
     val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-    activity.startActivityForResult(myIntent, INTENT_REQUEST_ENABLE_LOCATION)
+    startActivityForResult(activity, myIntent, INTENT_REQUEST_ENABLE_LOCATION)
 }

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

@@ -6,6 +6,8 @@
 //  Copyright © 2023 Regula. All rights reserved.
 //
 
+@file:Suppress("EnumValuesSoftDeprecate")
+
 package com.regula.documentreader
 
 import android.content.Context
@@ -53,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())
@@ -86,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,
@@ -140,6 +144,7 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "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()
@@ -158,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()
@@ -222,6 +226,7 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "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,
@@ -240,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,
@@ -439,6 +443,8 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "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()
@@ -458,7 +464,7 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "ePassportDataGroups" -> setDataGroups(rfidScenario.ePassportDataGroups(), v as JSONObject)
         "eIDDataGroups" -> setDataGroups(rfidScenario.eIDDataGroups(), v as JSONObject)
         "eDLDataGroups" -> setDataGroups(rfidScenario.eDLDataGroups(), v as JSONObject)
-        "dtcDataGroups" -> setDataGroups(rfidScenario.DTCDataGroup(), v as JSONObject)
+        "dtcDataGroups" -> setDTCDataGroup(rfidScenario.DTCDataGroup(), v as JSONObject)
     }
 }
 
@@ -499,6 +505,8 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "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,
@@ -518,7 +526,7 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "ePassportDataGroups" to getDataGroups(rfidScenario.ePassportDataGroups()),
     "eIDDataGroups" to getDataGroups(rfidScenario.eIDDataGroups()),
     "eDLDataGroups" to getDataGroups(rfidScenario.eDLDataGroups()),
-    "dtcDataGroups" to getDataGroups(rfidScenario.DTCDataGroup())
+    "dtcDataGroups" to getDTCDataGroup(rfidScenario.DTCDataGroup())
 ).toJsonObject()
 
 fun setDataGroups(dataGroup: DataGroups, opts: JSONObject) = opts.forEach { k, v ->
@@ -552,15 +560,6 @@ fun setDataGroups(dataGroup: DataGroups, opts: JSONObject) = opts.forEach { k, v
         "DG20" -> dataGroup.isDG20 = value
         "DG21" -> dataGroup.isDG21 = value
     }
-    if (dataGroup is DTCDataGroup) when (k) {
-        "DG15" -> dataGroup.isDG15 = value
-        "DG16" -> dataGroup.isDG16 = value
-        "DG17" -> dataGroup.isDG17 = value
-        "DG18" -> dataGroup.isDG18 = value
-        "DG22" -> dataGroup.isDG22 = value
-        "DG23" -> dataGroup.isDG23 = value
-        "DG24" -> dataGroup.isDG24 = value
-    }
 }
 
 fun getDataGroups(dataGroup: DataGroups): JSONObject {
@@ -593,18 +592,28 @@ fun getDataGroups(dataGroup: DataGroups): JSONObject {
         result["DG20"] = dataGroup.isDG20
         result["DG21"] = dataGroup.isDG21
     }
-    if (dataGroup is DTCDataGroup) {
-        result["DG15"] = dataGroup.isDG15
-        result["DG16"] = dataGroup.isDG16
-        result["DG17"] = dataGroup.isDG17
-        result["DG18"] = dataGroup.isDG18
-        result["DG22"] = dataGroup.isDG22
-        result["DG23"] = dataGroup.isDG23
-        result["DG24"] = dataGroup.isDG24
-    }
     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
@@ -617,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
     }
 }
 
@@ -631,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 ->
@@ -649,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)
@@ -672,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()
 }
@@ -682,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
     }
 }
 
@@ -690,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

@@ -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
@@ -106,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(
@@ -175,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
 }
@@ -186,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
 }
@@ -366,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()
 }
@@ -524,13 +534,13 @@ fun eIDDataGroupsFromJSON(input: JSONObject): EIDDataGroups {
 
 fun generateEIDDataGroups(input: EIDDataGroups): JSONObject = getDataGroups(input)
 
-fun dtcDataGroupsFromJSON(input: JSONObject): DTCDataGroup {
+fun dtcDataGroupFromJSON(input: JSONObject): DTCDataGroup {
     val result = DTCDataGroup()
-    setDataGroups(result, input)
+    setDTCDataGroup(result, input)
     return result
 }
 
-fun generateDTCDataGroups(input: DTCDataGroup): JSONObject = getDataGroups(input)
+fun generateDTCDataGroup(input: DTCDataGroup): JSONObject = getDTCDataGroup(input)
 
 fun rfidScenarioFromJSON(input: JSONObject): RfidScenario {
     val result = RfidScenario()
@@ -1713,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))
 
@@ -2181,7 +2192,7 @@ fun documentReaderResultsFromJSON(temp: JSONObject?): DocumentReaderResults? {
     result.status = documentReaderResultsStatusFromJSON(input.optJSONObject("status"))!!
     result.vdsncData = vdsncDataFromJSON(input.optJSONObject("vdsncData")!!)
     result.dtcData = input.getString("dtcData")
-    result.transactionInfo = transactionInfoFromJSON(input.optJSONObject("transactionInfo"))
+    result.transactionInfo = transactionInfoFromJSON(input.optJSONObject("transactionInfo"))!!
 
     return result
 }

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

@@ -1,10 +1,10 @@
-@file:Suppress("UNCHECKED_CAST")
+@file:Suppress("UNCHECKED_CAST", "MissingPermission")
 
 package com.regula.documentreader
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.PendingIntent
+import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.nfc.NfcAdapter
@@ -21,7 +21,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.facebook.react.modules.core.PermissionListener
+import com.facebook.react.modules.core.PermissionAwareActivity
 import com.regula.common.LocalizationCallbacks
 import com.regula.documentreader.Convert.bitmapToBase64
 import com.regula.documentreader.Convert.byteArrayFromBase64
@@ -55,11 +55,40 @@ import com.regula.documentreader.api.results.DocumentReaderScenario
 import org.json.JSONArray
 import org.json.JSONObject
 
+lateinit var args: JSONArray
+lateinit var binding: ReactContext
+val context: Context
+    get() = binding.applicationContext
+val activity: Activity
+    get() = binding.currentActivity!!
+val lifecycle: Lifecycle
+    get() = (activity as AppCompatActivity).lifecycle
+
+fun sendEvent(event: String, data: Any? = "") {
+    val map = Arguments.createMap()
+    val result = if (data is JSONObject || data is JSONArray) data.toString() else data.toString() + ""
+    map.putString("msg", result)
+    binding.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(event, map)
+}
+
+fun <T> argsNullable(index: Int): T? {
+    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    // Rewrite it according to react native documentation!!!
+    // the is no int or double in js so all ints are sent as double by default
+    val value = args[index]
+    if (value is Double) if (value % 1 == 0.0) {
+        val intValue = value.toInt()
+        return intValue as T
+    }
+    if (args[index].toString() == "null") return null
+    return args[index] as T
+}
+
 @Suppress("unused", "UNUSED_PARAMETER")
-class RNRegulaDocumentReaderModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(rc), ActivityEventListener, PermissionListener {
+class RNRegulaDocumentReaderModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), ActivityEventListener {
     init {
-        reactContext = rc
-        reactContext.addActivityEventListener(this)
+        binding = reactContext
+        binding.addActivityEventListener(this)
     }
 
     @ReactMethod
@@ -70,7 +99,9 @@ class RNRegulaDocumentReaderModule(rc: ReactApplicationContext) : ReactContextBa
 
     @ReactMethod
     fun exec(moduleName: String?, action: String?, args: ReadableArray, successCallback: com.facebook.react.bridge.Callback, errorCallback: com.facebook.react.bridge.Callback) = exec(action, args, successCallback, errorCallback)
+
     override fun getName() = "RNRegulaDocumentReader"
+
     override fun onNewIntent(intent: Intent) {
         newIntent(intent)
     }
@@ -78,38 +109,20 @@ class RNRegulaDocumentReaderModule(rc: ReactApplicationContext) : ReactContextBa
     override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
         onActivityResult(requestCode, resultCode, data)
     }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?) = com.regula.documentreader.onRequestPermissionsResult(requestCode, permissions!!, grantResults!!)
 }
 
-fun sendEvent(event: String, data: Any? = "") {
-    val map = Arguments.createMap()
-    val result = if (data is JSONObject || data is JSONArray) data.toString() else data.toString() + ""
-    map.putString("msg", result)
-    reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(event, map)
-}
-
-fun <T> argsNullable(index: Int): T? {
-    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    // Rewrite it according to react native documentation!!!
-    // the is no int or double in js so all ints are sent as double by default
-    val value = args[index]
-    if (value is Double) if (value % 1 == 0.0) {
-        val intValue = value.toInt()
-        return intValue as T
+fun requestPermissions(activity: Activity, permissions: Array<String>, requestCode: Int) {
+    (activity as PermissionAwareActivity).requestPermissions(permissions, requestCode) { code, perms, grantResults ->
+        onRequestPermissionsResult(code, perms, grantResults)
     }
-    if (args[index].toString() == "null") return null
-    return args[index] as T
 }
 
-lateinit var args: JSONArray
-lateinit var reactContext: ReactContext
-val lifecycle: Lifecycle
-    get() = (activity as AppCompatActivity).lifecycle
+fun startActivityForResult(activity: Activity, intent: Intent, requestCode: Int) {
+    activity.startActivityForResult(intent, requestCode)
+}
 
 fun exec(action: String?, arguments: ReadableArray, successCallback: com.facebook.react.bridge.Callback, errorCallback: com.facebook.react.bridge.Callback) {
     args = JSONArray(arguments.toArrayList())
-    reactContext.currentActivity?.let { activity = it }
     val callback = object : Callback {
         override fun success(data: Any?) = successCallback.invoke(data.toSendable())
         override fun error(message: String) = errorCallback.invoke(message)
@@ -194,14 +207,6 @@ interface Callback {
     fun error(message: String)
 }
 
-@SuppressLint("StaticFieldLeak")
-lateinit var activity: Activity
-lateinit var lifecycleObserver: LifecycleEventObserver
-val context
-    get() = activity
-
-var backgroundRFIDEnabled = false
-
 const val eventCompletion = "completion"
 const val eventDatabaseProgress = "database_progress"
 
@@ -509,6 +514,9 @@ fun newIntent(intent: Intent): Boolean {
     return true
 }
 
+var backgroundRFIDEnabled = false
+lateinit var lifecycleObserver: LifecycleEventObserver
+
 fun startForegroundDispatch() {
     backgroundRFIDEnabled = true
     val filters: Array<IntentFilter?> = arrayOfNulls(1)
@@ -516,9 +524,9 @@ fun startForegroundDispatch() {
     filters[0]!!.addAction(NfcAdapter.ACTION_TECH_DISCOVERED)
     filters[0]!!.addCategory(Intent.CATEGORY_DEFAULT)
     val techList = arrayOf(arrayOf("android.nfc.tech.IsoDep"))
-    val intent = Intent(context, context.javaClass)
+    val intent = Intent(activity, activity.javaClass)
     val flag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0
-    val pendingIntent = PendingIntent.getActivity(context, 0, intent, flag)
+    val pendingIntent = PendingIntent.getActivity(activity, 0, intent, flag)
 
     if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
         enableForegroundDispatch(pendingIntent, filters, techList)
@@ -529,7 +537,7 @@ fun startForegroundDispatch() {
             else -> Unit
         }
     }
-    context.runOnUiThread { lifecycle.addObserver(lifecycleObserver) }
+    activity.runOnUiThread { lifecycle.addObserver(lifecycleObserver) }
 }
 
 fun enableForegroundDispatch(
@@ -538,15 +546,15 @@ fun enableForegroundDispatch(
     techList: Array<Array<String>>
 ) = NfcAdapter.getDefaultAdapter(context).enableForegroundDispatch(activity, pendingIntent, filters, techList)
 
-fun disableForegroundDispatch() = NfcAdapter.getDefaultAdapter(activity).disableForegroundDispatch(activity)
+fun disableForegroundDispatch() = NfcAdapter.getDefaultAdapter(context).disableForegroundDispatch(activity)
 
 fun stopBackgroundRFID() {
     if (!backgroundRFIDEnabled) return
     backgroundRFIDEnabled = false
     if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
         disableForegroundDispatch()
-    context.runOnUiThread { lifecycle.removeObserver(lifecycleObserver) }
+    activity.runOnUiThread { lifecycle.removeObserver(lifecycleObserver) }
 }
 
 // Weak references
-var localizationCallbacks: LocalizationCallbacks? = null
+var localizationCallbacks: LocalizationCallbacks? = null

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

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/example/ios/DocumentReader.xcodeproj/project.pbxproj

@@ -448,7 +448,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = DocumentReaderTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -477,7 +477,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = DocumentReaderTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -612,7 +612,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -678,7 +678,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",

package/example/ios/Podfile

@@ -1,3 +1,5 @@
+source "https://github.com/CocoaPods/Specs.git"
+
 # Resolve react_native_pods.rb with node to allow for hoisting
 require Pod::Executable.execute_command('node', ['-p',
   'require.resolve(

package/example/package.json

@@ -10,8 +10,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "7.6.787-nightly",
-    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "7.6.910-nightly",
+    "@regulaforensics/react-native-document-reader-api": "8.1.68-nightly",
+    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "8.1.75-nightly",
     "react-native-progress": "5.0.0",
     "react-native-radio-buttons-group": "3.0.5",
     "@rneui/base": "4.0.0-rc.7",