@regulaforensics/cordova-plugin-document-reader-api 8.4.303-nightly → 8.4.346-rc

package/src/android/Main.kt

@@ -1,4 +1,5 @@
 @file:SuppressLint("MissingPermission")
+@file:Suppress("EnumValuesSoftDeprecate")
 
 package com.regula.plugin.documentreader
 
@@ -16,6 +17,7 @@ import com.regula.documentreader.api.DocumentReader.Instance
 import com.regula.documentreader.api.completions.IDocumentReaderCompletion
 import com.regula.documentreader.api.completions.IDocumentReaderInitCompletion
 import com.regula.documentreader.api.completions.IDocumentReaderPrepareDbCompletion
+import com.regula.documentreader.api.completions.IVideoEncoderCompletion
 import com.regula.documentreader.api.completions.model.PrepareProgress
 import com.regula.documentreader.api.completions.rfid.IRfidPKDCertificateCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion
@@ -29,12 +31,14 @@ import com.regula.documentreader.api.enums.LCID
 import com.regula.documentreader.api.enums.eImageQualityCheckType
 import com.regula.documentreader.api.enums.eLDS_ParsingErrorCodes
 import com.regula.documentreader.api.enums.eLDS_ParsingNotificationCodes
+import com.regula.documentreader.api.enums.eMDLDeviceEngagement
 import com.regula.documentreader.api.enums.eRFID_DataFile_Type
 import com.regula.documentreader.api.enums.eRFID_ErrorCodes
 import com.regula.documentreader.api.enums.eVisualFieldType
 import com.regula.documentreader.api.errors.DocReaderRfidException
 import com.regula.documentreader.api.errors.DocumentReaderException
 import com.regula.documentreader.api.internal.core.CoreScenarioUtil
+import com.regula.documentreader.api.params.mdl.DataRetrieval
 import com.regula.documentreader.api.results.DocumentReaderNotification
 import com.regula.documentreader.api.results.DocumentReaderResults
 import com.regula.documentreader.api.results.DocumentReaderResults.fromRawResults
@@ -44,7 +48,7 @@ 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)
@@ -94,6 +98,13 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any? = when (method) {
     "btDeviceRequestFlashing" -> btDeviceRequestFlashing()
     "btDeviceRequestFlashingFullIR" -> btDeviceRequestFlashingFullIR()
     "btDeviceRequestTurnOffAll" -> btDeviceRequestTurnOffAll()
+    "startReadMDl" -> startReadMDl(args(0), args(1), callback)
+    "startEngageDevice" -> startEngageDevice(args(0), callback)
+    "engageDeviceNFC" -> engageDeviceNFC(callback)
+    "engageDeviceData" -> engageDeviceData(args(0), callback)
+    "startRetrieveData" -> startRetrieveData(args(0), args(1), callback)
+    "retrieveDataNFC" -> retrieveDataNFC(args(0), callback)
+    "retrieveDataBLE" -> retrieveDataBLE(args(0), args(1), callback)
     "setLocalizationDictionary" -> setLocalizationDictionary(args(0))
     "getLicense" -> getLicense(callback)
     "getAvailableScenarios" -> getAvailableScenarios(callback)
@@ -219,12 +230,12 @@ fun checkDatabaseUpdate(callback: Callback, databaseID: String) = Instance().che
 @Suppress("DEPRECATION")
 fun scan(config: JSONObject) {
     stopBackgroundRFID()
-    Instance().showScanner(context, scannerConfigFromJSON(config), IDocumentReaderCompletion(completion))
+    Instance().showScanner(activity, scannerConfigFromJSON(config), IDocumentReaderCompletion(completion))
 }
 
 fun startScanner(config: JSONObject) {
     stopBackgroundRFID()
-    Instance().startScanner(context, scannerConfigFromJSON(config), IDocumentReaderCompletion(completion))
+    Instance().startScanner(activity, scannerConfigFromJSON(config), IDocumentReaderCompletion(completion))
 }
 
 fun recognize(config: JSONObject) {
@@ -243,7 +254,7 @@ fun startRFIDReader(onRequestPACertificates: Boolean, onRequestTACertificates: B
         onRequestTACertificates,
         onRequestTASignature
     )
-    Instance().startRFIDReader(context, rfidReaderCompletion, requestType.getRfidReaderRequest())
+    Instance().startRFIDReader(activity, rfidReaderCompletion, requestType.getRfidReaderRequest())
 }
 
 fun readRFID(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean, onRequestTASignature: Boolean) {
@@ -252,7 +263,7 @@ fun readRFID(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean,
         onRequestTACertificates,
         onRequestTASignature
     )
-    startForegroundDispatch()
+    startForegroundDispatch("readRFID")
 }
 
 fun stopRFIDReader() {
@@ -286,6 +297,47 @@ fun clearPKDCertificates() = Instance().clearPKDCertificates()
 
 fun startNewSession() = Instance().startNewSession()
 
+fun startReadMDl(type: Int, dataRetrieval: JSONObject, callback: Callback) {
+    stopBackgroundRFID()
+    Instance().startReadMDL(activity, eMDLDeviceEngagement.values()[type], dataRetrievalFromJSON(dataRetrieval)!!) { v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
+}
+
+fun startEngageDevice(type: Int, callback: Callback) {
+    stopBackgroundRFID()
+    Instance().startEngageDevice(activity, eMDLDeviceEngagement.values()[type]) { v1, v2 -> callback(generateDeviceEngagementCompletion(v1, v2)) }
+}
+
+lateinit var engageDeviceNFCCallback: Callback
+fun engageDeviceNFC(callback: Callback) {
+    engageDeviceNFCCallback = callback
+    stopBackgroundRFID()
+    startForegroundDispatch("engageDeviceNFC")
+}
+
+fun engageDeviceData(data: String, callback: Callback) {
+    stopBackgroundRFID()
+    Instance().engageDeviceData(data) { v1, v2 -> callback(generateDeviceEngagementCompletion(v1, v2)) }
+}
+
+fun startRetrieveData(dataRetrieval: JSONObject, deviceEngagement: JSONObject, callback: Callback) {
+    stopBackgroundRFID()
+    Instance().startRetrieveData(activity, deviceEngagementFromJSON(deviceEngagement)!!, dataRetrievalFromJSON(dataRetrieval)!!){ v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
+}
+
+lateinit var retrieveDataNFCCallback: Callback
+lateinit var retrieveDataNFCProp: DataRetrieval
+fun retrieveDataNFC(dataRetrieval: JSONObject, callback: Callback) {
+    retrieveDataNFCCallback = callback
+    retrieveDataNFCProp = dataRetrievalFromJSON(dataRetrieval)!!
+    stopBackgroundRFID()
+    startForegroundDispatch("retrieveDataNFC")
+}
+
+fun retrieveDataBLE(dataRetrieval: JSONObject, deviceEngagement: JSONObject, callback: Callback) {
+    stopBackgroundRFID()
+    Instance().retrieveDataBLE(context, deviceEngagementFromJSON(deviceEngagement)!!, dataRetrievalFromJSON(dataRetrieval)!!){ v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
+}
+
 fun setLocalizationDictionary(dictionary: JSONObject) {
     localizationCallbacks = LocalizationCallbacks { if (dictionary.has(it)) dictionary.getString(it) else null }
     Instance().setLocalizationCallback(localizationCallbacks)
@@ -476,7 +528,8 @@ fun prepareCompletion(callback: Callback) = object : IDocumentReaderPrepareDbCom
 
 fun initCompletion(callback: Callback) = IDocumentReaderInitCompletion { success, error ->
     if (success) {
-        Instance().setVideoEncoderCompletion { _, file -> sendEvent(videoEncoderCompletionEvent, file.path) }
+        videoEncoderCompletion = IVideoEncoderCompletion { _, file -> sendEvent(videoEncoderCompletionEvent, file.path) }
+        Instance().setVideoEncoderCompletion(videoEncoderCompletion)
         Instance().setOnClickListener { sendEvent(onCustomButtonTappedEvent, it.tag) }
     }
     callback(generateSuccessCompletion(success, error))
@@ -525,19 +578,22 @@ var requestType = RfidReaderRequestType(
 @Suppress("DEPRECATION", "MissingPermission")
 fun newIntent(intent: Intent): Boolean {
     if (intent.action != NfcAdapter.ACTION_TECH_DISCOVERED) return false
-    Instance().readRFID(
-        IsoDep.get(intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)),
-        rfidReaderCompletion,
-        requestType.getRfidReaderRequest()
-    )
+    val isoDep = IsoDep.get(intent.getParcelableExtra(NfcAdapter.EXTRA_TAG))
+    when (nfcFunction) {
+        "readRFID" -> Instance().readRFID(isoDep, rfidReaderCompletion, requestType.getRfidReaderRequest())
+        "engageDeviceNFC" -> Instance().engageDeviceNFC(isoDep) { v1, v2 -> engageDeviceNFCCallback(generateDeviceEngagementCompletion(v1, v2)) }
+        "retrieveDataNFC" -> Instance().retrieveDataNFC(isoDep, retrieveDataNFCProp) { v1, v2, v3 -> retrieveDataNFCCallback(generateCompletion(v1, v2, v3)) }
+    }
     return true
 }
 
 var backgroundRFIDEnabled = false
+var nfcFunction = ""
 lateinit var lifecycleObserver: LifecycleEventObserver
 
-fun startForegroundDispatch() {
+fun startForegroundDispatch(tag: String) {
     backgroundRFIDEnabled = true
+    nfcFunction = tag
     val filters: Array<IntentFilter?> = arrayOfNulls(1)
     filters[0] = IntentFilter()
     filters[0]!!.addAction(NfcAdapter.ACTION_TECH_DISCOVERED)
@@ -577,3 +633,4 @@ fun stopBackgroundRFID() {
 
 // Weak references
 lateinit var localizationCallbacks: LocalizationCallbacks
+lateinit var videoEncoderCompletion: IVideoEncoderCompletion

package/src/android/Utils.kt

@@ -12,7 +12,9 @@ import android.util.Base64
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.ByteArrayOutputStream
+import java.lang.reflect.Constructor
 import kotlin.math.sqrt
+import kotlin.reflect.KClass
 
 fun List<*>.toJson(): JSONArray {
     val result = JSONArray()
@@ -105,6 +107,18 @@ fun IntArray?.toJson() = this?.let {
     result
 }
 
+fun JSONArray.toLongArray(): LongArray {
+    val result = LongArray(length())
+    for (i in 0 until length()) result[i] = getLong(i)
+    return result
+}
+
+fun LongArray.toJson(): JSONArray {
+    val result = JSONArray()
+    for (i in indices) result.put(i, this[i])
+    return result
+}
+
 fun JSONObject.forEach(action: (String, Any) -> Unit) {
     val keys: Iterator<String> = keys()
     while (keys.hasNext()) {
@@ -123,6 +137,11 @@ fun JSONObject.getIntOrNull(name: String): Int? {
     return null
 }
 
+fun JSONObject.getLongOrNull(name: String): Long? {
+    if (has(name) && get(name).toString() != "null") return getLong(name)
+    return null
+}
+
 fun JSONObject.getDoubleOrNull(name: String): Double? {
     if (has(name) && get(name).toString() != "null") return getDouble(name)
     return null
@@ -138,6 +157,49 @@ fun JSONObject.getStringOrNull(name: String): String? {
     return null
 }
 
+fun <T : Any> KClass<T>.constructor(vararg argTypes: KClass<*>): Constructor<T> {
+    val types = mutableListOf<Class<*>>()
+    for (argType in argTypes) types.add(argType.java)
+    return java.getDeclaredConstructor(*types.toTypedArray())
+}
+
+fun <T : Any> Constructor<T>.instantiate(vararg args: Any?): T {
+    isAccessible = true
+    return newInstance(*args)
+}
+
+fun <T : Any> T.setPrivateProperty(varName: String, data: Any?) {
+    try {
+        setPrivateProperty(javaClass, varName, data)
+    } catch (_: java.lang.Exception) {
+        try {
+            setPrivateProperty(javaClass.superclass!!, varName, data)
+        } catch (_: java.lang.Exception) {
+        }
+    }
+}
+
+fun <T : Any> T.setPrivateProperty(clazz: Class<T>, varName: String, data: Any?) = clazz.getDeclaredField(varName).let {
+    it.isAccessible = true
+    it.set(this, data)
+}
+
+fun <T : Any> T.getPrivateProperty(varName: String): Any? {
+    var clazz: Class<*>? = this.javaClass
+    while (clazz != null) {
+        try {
+            val field = clazz.getDeclaredField(varName)
+            field.isAccessible = true
+            return field.get(this)
+        } catch (_: NoSuchFieldException) {
+            clazz = clazz.superclass
+        }
+    }
+    throw NoSuchFieldException(
+        "Field '$varName' not found in class hierarchy of ${this.javaClass.name}"
+    )
+}
+
 internal object Convert {
     fun String?.toByteArray(): ByteArray? {
         var str = this ?: return null

package/src/android/build.gradle

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

package/src/ios/RGLWConfig.m

@@ -35,6 +35,7 @@
         functionality.singleResult = [[options valueForKey:@"singleResult"] boolValue];
     if(options[@"torchTurnedOn"]) functionality.torchTurnedOn = [options[@"torchTurnedOn"] boolValue];
     if(options[@"preventScreenRecording"]) functionality.preventScreenRecording = [options[@"preventScreenRecording"] boolValue];
+    if(options[@"homeIndicatorAutoHide"]) functionality.homeIndicatorAutoHide = [options[@"homeIndicatorAutoHide"] boolValue];
     
     // Int
     if([options valueForKey:@"showCaptureButtonDelayFromDetect"] != nil)
@@ -61,6 +62,7 @@
     // Float
     if([options valueForKey:@"zoomFactor"] != nil)
         functionality.zoomFactor = [[options valueForKey:@"zoomFactor"] floatValue];
+    if(options[@"mdlTimeout"]) functionality.mDLTimeout = [options[@"mdlTimeout"] doubleValue];
     
     // Custom
     // in android - cameraSize
@@ -90,6 +92,7 @@
     result[@"singleResult"] = [NSNumber numberWithBool:functionality.singleResult];
     result[@"torchTurnedOn"] = @(functionality.torchTurnedOn);
     result[@"preventScreenRecording"] = @(functionality.preventScreenRecording);
+    result[@"homeIndicatorAutoHide"] = @(functionality.homeIndicatorAutoHide);
     
     // Int
     result[@"showCaptureButtonDelayFromDetect"] = [NSNumber numberWithDouble:functionality.showCaptureButtonDelayFromDetect];
@@ -107,6 +110,7 @@
     
     // Float
     result[@"zoomFactor"] = [NSNumber numberWithFloat:functionality.zoomFactor];
+    result[@"mdlTimeout"] = @(functionality.mDLTimeout);
     
     // Custom
     // in android - cameraSize
@@ -256,8 +260,8 @@
         processParams.documentGroupFilter = [options mutableArrayValueForKey:@"documentGroupFilter"];
     if([options valueForKey:@"lcidIgnoreFilter"] != nil)
         processParams.lcidIgnoreFilter = [options mutableArrayValueForKey:@"lcidIgnoreFilter"];
-    if([options valueForKey:@"lcidFilter"] != nil)
-        processParams.lcidFilter = [options mutableArrayValueForKey:@"lcidFilter"];
+    if (options[@"lcidFilter"]) processParams.lcidFilter = options[@"lcidFilter"];
+    if (options[@"fieldTypesIgnoreFilter"]) processParams.fieldTypesIgnoreFilter = options[@"fieldTypesIgnoreFilter"];
 
     // JSONObject
     if (options[@"customParams"]) processParams.customParams = options[@"customParams"];
@@ -357,6 +361,7 @@
     result[@"documentGroupFilter"] = processParams.documentGroupFilter;
     result[@"lcidIgnoreFilter"] = processParams.lcidIgnoreFilter;
     result[@"lcidFilter"] = processParams.lcidFilter;
+    result[@"fieldTypesIgnoreFilter"] = processParams.fieldTypesIgnoreFilter;
     result[@"mrzFormatsFilter"] = processParams.mrzFormatsFilter;
     result[@"resultTypeOutput"] = processParams.resultTypeOutput;
     
@@ -454,6 +459,7 @@
     if(options[@"activityIndicatorPortraitPositionMultiplier"]) customization.activityIndicatorPortraitPositionMultiplier = [options[@"activityIndicatorPortraitPositionMultiplier"] floatValue];
     if(options[@"activityIndicatorLandscapePositionMultiplier"]) customization.activityIndicatorLandscapePositionMultiplier = [options[@"activityIndicatorLandscapePositionMultiplier"] floatValue];
     if(options[@"cameraPreviewVerticalPositionMultiplier"]) customization.previewLayerPositionMultiplier = [options[@"cameraPreviewVerticalPositionMultiplier"] floatValue];
+    if(options[@"multipageButtonPositionMultiplier"]) customization.multipageButtonPositionMultiplier = [options[@"multipageButtonPositionMultiplier"] floatValue];
     
     // Drawable
     if([options valueForKey:@"multipageAnimationFrontImage"] != nil)
@@ -568,6 +574,7 @@
     result[@"activityIndicatorPortraitPositionMultiplier"] = [NSNumber numberWithFloat:customization.activityIndicatorPortraitPositionMultiplier];
     result[@"activityIndicatorLandscapePositionMultiplier"] = [NSNumber numberWithFloat:customization.activityIndicatorLandscapePositionMultiplier];
     result[@"cameraPreviewVerticalPositionMultiplier"] = [NSNumber numberWithFloat:customization.previewLayerPositionMultiplier];
+    result[@"multipageButtonPositionMultiplier"] = [NSNumber numberWithFloat:customization.multipageButtonPositionMultiplier];
     
     // Drawable
     result[@"multipageAnimationFrontImage"] = [RGLWJSONConstructor base64WithImage:customization.multipageAnimationFrontImage];

package/src/ios/RGLWJSONConstructor.h

@@ -20,6 +20,7 @@
 +(NSString* _Nullable)generateCompletion:(NSNumber*_Nonnull)action :(RGLDocumentReaderResults*_Nullable)results :(NSError*_Nullable)error;
 +(NSString* _Nonnull)generatePACertificateCompletion:(NSData *_Nullable)serialNumber :(RGLPAResourcesIssuer *_Nullable)issuer;
 +(NSString* _Nullable)generateFinalizePackageCompletion:(NSNumber*_Nonnull)action :(RGLTransactionInfo*_Nullable)info :(NSError*_Nullable)error;
++(NSString* _Nullable)generateDeviceEngagementCompletion:(RGLDeviceEngagement* _Nullable)deviceEngagement :(NSError* _Nullable)error;
 
 +(RGLConfig* _Nullable)configFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateConfig:(RGLConfig* _Nullable)input;
@@ -126,6 +127,10 @@
 +(NSDictionary* _Nullable)generateBytesData:(RGLBytesData* _Nullable)input;
 +(RGLVDSNCData* _Nullable)vdsncDataFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateVDSNCData:(RGLVDSNCData* _Nullable)input;
++(RGLDocFeature* _Nullable)docFeatureFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDocFeature:(RGLDocFeature* _Nullable)input;
++(RGLVDSData* _Nullable)vdsDataFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateVDSData:(RGLVDSData* _Nullable)input;
 +(RGLOpticalStatus* _Nullable)opticalStatusFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateOpticalStatus:(RGLOpticalStatus* _Nullable)input;
 +(RGLRFIDSessionDataStatus* _Nullable)rfidSessionDataStatusFromJson:(NSDictionary* _Nullable)input;
@@ -175,6 +180,20 @@
 +(NSDictionary* _Nullable)generateTCCParams:(RGLTCCParams* _Nullable)input;
 +(RGLTransactionInfo* _Nullable)transactionInfoFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateTransactionInfo:(RGLTransactionInfo* _Nullable)input;
++(RGLDetailsAge* _Nullable)detailsAgeFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDetailsAge:(RGLDetailsAge* _Nullable)input;
++(RGLDeviceRetrievalMethod* _Nullable)deviceRetrievalMethodFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDeviceRetrievalMethod:(RGLDeviceRetrievalMethod* _Nullable)input;
++(RGLDocumentRequest18013MDL* _Nullable)documentRequest18013MDLFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDocumentRequest18013MDL:(RGLDocumentRequest18013MDL* _Nullable)input;
++(RGLDataRetrieval* _Nullable)dataRetrievalFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDataRetrieval:(RGLDataRetrieval* _Nullable)input;
++(RGLDeviceEngagement* _Nullable)deviceEngagementFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDeviceEngagement:(RGLDeviceEngagement* _Nullable)input;
++(RGLNameSpaceMDL* _Nullable)nameSpaceMDLFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateNameSpaceMDL:(RGLNameSpaceMDL* _Nullable)input;
++(RGLDocumentRequestMDL* _Nullable)documentRequestMDLFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDocumentRequestMDL:(RGLDocumentRequestMDL* _Nullable)input;
 
 @end