@regulaforensics/document-reader 9.1.485-nightly → 9.1.493-beta

package/android/src/main/java/com/regula/plugin/documentreader/Main.kt

@@ -1,4 +1,5 @@
 @file:SuppressLint("MissingPermission")
+@file:Suppress("EnumValuesSoftDeprecate")
 
 package com.regula.plugin.documentreader
 
@@ -30,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
@@ -45,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)
@@ -95,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)
@@ -253,7 +263,7 @@ fun readRFID(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean,
         onRequestTACertificates,
         onRequestTASignature
     )
-    startForegroundDispatch()
+    startForegroundDispatch("readRFID")
 }
 
 fun stopRFIDReader() {
@@ -287,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)
@@ -527,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)

package/android/src/main/java/com/regula/plugin/documentreader/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/examples/capacitor/ios/App/App/Info.plist

@@ -61,7 +61,9 @@
 		<string>A0000002480100</string>
 		<string>A0000002480200</string>
 		<string>A0000002480300</string>
+		<string>A0000002480400</string>
 		<string>A00000045645444C2D3031</string>
+		<string>D2760000850101</string>
 	</array>
 </dict>
 </plist>

package/examples/capacitor/package.json

@@ -6,7 +6,7 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/document-reader": "9.1.485-nightly",
+    "@regulaforensics/document-reader": "9.1.493-beta",
     "@regulaforensics/document-reader-core-fullauthrfid": "8.4.787",
     "@regulaforensics/document-reader-btdevice": "8.4.31",
     "@awesome-cordova-plugins/file": "6.6.0",

package/examples/ionic/config.xml

@@ -44,7 +44,9 @@
                 <string>A0000002480100</string>
                 <string>A0000002480200</string>
                 <string>A0000002480300</string>
+                <string>A0000002480400</string>
                 <string>A00000045645444C2D3031</string>
+                <string>D2760000850101</string>
             </array>
         </config-file>
         <config-file parent="com.apple.developer.nfc.readersession.formats" target="*-Debug.plist">