@regulaforensics/react-native-document-reader-api 7.6.21-nightly → 7.6.35-beta

package/RNDocumentReaderApi.podspec

@@ -14,6 +14,6 @@ Pod::Spec.new do |s|
   s.source       = { :http => 'file:' + __dir__ }
   s.ios.deployment_target = '12.0'
   s.source_files  = "ios/*.{h,m}"
-  s.dependency 'DocumentReaderNightly', '7.6.4228'
+  s.dependency 'DocumentReader', '7.5.4221'
   s.dependency 'React'
 end

package/android/build.gradle

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

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

@@ -22,7 +22,6 @@ 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
@@ -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() {
@@ -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

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(
@@ -366,6 +369,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()
 }

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<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)
@@ -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/package.json

@@ -10,8 +10,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "7.6.21-nightly",
-    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "7.6.904-nightly",
+    "@regulaforensics/react-native-document-reader-api": "7.6.35-beta",
+    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "7.5.893",
     "react-native-progress": "5.0.0",
     "react-native-radio-buttons-group": "3.0.5",
     "@rneui/base": "4.0.0-rc.7",

package/index.d.ts

@@ -1477,6 +1477,7 @@ export class OnlineProcessingConfig {
     processParams?: ProcessParams
     imageFormat?: number
     imageCompressionQuality?: number
+    requestHeaders?: Record<string, string>
 
     static fromJson(jsonObject?: any): OnlineProcessingConfig | undefined {
         if (jsonObject == null || jsonObject == undefined) return undefined
@@ -1487,6 +1488,7 @@ export class OnlineProcessingConfig {
         result.processParams = ProcessParams.fromJson(jsonObject["processParams"])
         result.imageFormat = jsonObject["imageFormat"]
         result.imageCompressionQuality = jsonObject["imageCompressionQuality"]
+        result.requestHeaders = jsonObject["requestHeaders"]
 
         return result
     }
@@ -5417,7 +5419,7 @@ export default class DocumentReader {
     static addPKDCertificates(certificates: PKDCertificate[], successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static clearPKDCertificates(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static startNewSession(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
-    static connectBluetoothDevice(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static connectBluetoothDevice(btDeviceName: string, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static setLocalizationDictionary(dictionary: Record<string, string>, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static getLicense(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static getAvailableScenarios(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void

package/index.js

@@ -998,6 +998,7 @@ export class OnlineProcessingConfig {
         result.processParams = ProcessParams.fromJson(jsonObject["processParams"])
         result.imageFormat = jsonObject["imageFormat"]
         result.imageCompressionQuality = jsonObject["imageCompressionQuality"]
+        result.requestHeaders = jsonObject["requestHeaders"]
 
         return result
     }
@@ -4433,7 +4434,7 @@ DocumentReader.setTCCParams = (params, successCallback, errorCallback) => RNRegu
 DocumentReader.addPKDCertificates = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "addPKDCertificates", [certificates], successCallback, errorCallback)
 DocumentReader.clearPKDCertificates = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "clearPKDCertificates", [], successCallback, errorCallback)
 DocumentReader.startNewSession = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "startNewSession", [], successCallback, errorCallback)
-DocumentReader.connectBluetoothDevice = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "connectBluetoothDevice", [], successCallback, errorCallback)
+DocumentReader.connectBluetoothDevice = (btDeviceName, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "connectBluetoothDevice", [btDeviceName], successCallback, errorCallback)
 DocumentReader.setLocalizationDictionary = (dictionary, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "setLocalizationDictionary", [dictionary], successCallback, errorCallback)
 DocumentReader.getLicense = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "getLicense", [], successCallback, errorCallback)
 DocumentReader.getAvailableScenarios = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "getAvailableScenarios", [], successCallback, errorCallback)

package/ios/RGLWJSONConstructor.h

@@ -184,4 +184,9 @@
 +(NSDictionary* _Nullable)generateTransactionInfo:(RGLTransactionInfo* _Nullable)input;
 
 @end
+
+@interface RGLWRequestInterceptorProxy : NSObject <RGLURLRequestInterceptingDelegate>
+- (instancetype _Nonnull)initWithHeaders:(NSDictionary*_Nonnull)headers;
+@end
+
 #endif

package/ios/RGLWJSONConstructor.m

@@ -11,6 +11,13 @@
 
 @implementation RGLWJSONConstructor
 
+static NSMutableArray* weakReferencesHolder;
++(void) holdWeakReference:(id)reference {
+    if(!weakReferencesHolder)
+        weakReferencesHolder = [NSMutableArray new];
+    [weakReferencesHolder addObject:reference];
+}
+
 +(NSString*)dictToString:(NSDictionary*)input {
     if(input == nil) return nil;
     return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:input options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding];
@@ -406,6 +413,11 @@
         [RGLWConfig setProcessParams:[input valueForKey:@"processParams"] :params];
         result.processParams = params;
     }
+    if([input valueForKey:@"requestHeaders"] != nil) {
+        RGLWRequestInterceptorProxy* proxy = [[RGLWRequestInterceptorProxy alloc] initWithHeaders:[input valueForKey:@"requestHeaders"]];
+        [self holdWeakReference: proxy];
+        result.requestInterceptingDelegate = proxy;
+    }
     
     return result;
 }
@@ -2336,3 +2348,22 @@
 }
 
 @end
+
+@implementation RGLWRequestInterceptorProxy {
+    NSDictionary* _headers;
+}
+
+- (instancetype)initWithHeaders:(NSDictionary*)headers {
+    self = [super init];
+    _headers = [headers copy];
+    return self;
+}
+
+-(NSURLRequest*)interceptorPrepareRequest:(NSURLRequest*)request {
+    NSMutableURLRequest *interceptedRequest = [request mutableCopy];
+    for (NSString* key in _headers.allKeys)
+        [interceptedRequest addValue:[_headers valueForKey:key] forHTTPHeaderField:key];
+    return interceptedRequest;
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/react-native-document-reader-api",
-  "version": "7.6.21-nightly",
+  "version": "7.6.35-beta",
   "description": "React Native module for reading and validation of identification documents (API framework)",
   "main": "index.js",
   "scripts": {