9.2.904

Author: Jenkins

.dart_tool/package_config.json

@@ -105,7 +105,7 @@
     },
     {
       "name": "source_span",
-      "rootUri": "file:///Users/administratorregula/.pub-cache/hosted/pub.dev/source_span-1.10.1",
+      "rootUri": "file:///Users/administratorregula/.pub-cache/hosted/pub.dev/source_span-1.10.2",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },

android/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     dependencies {
-        implementation('com.regula.documentreader:api:9.1.12250') {
+        implementation('com.regula.documentreader:api:9.2.12446') {
             transitive = true
         }
 

android/src/main/kotlin/com/regula/plugin/documentreader/Config.kt

@@ -18,6 +18,7 @@ import com.regula.documentreader.api.params.ImageQA
 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.Bsi
 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
@@ -147,6 +148,11 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "strictSecurityChecks" -> processParams.strictSecurityChecks = v as Boolean
         "returnTransliteratedFields" -> processParams.returnTransliteratedFields = v as Boolean
         "checkCaptureProcessIntegrity" -> processParams.checkCaptureProcessIntegrity = v as Boolean
+        "bsiTr03135" -> {
+            val temp = Bsi()
+            temp.generateResult = (v as JSONObject).getBooleanOrNull("generateResult")
+            processParams.bsiTr03135 = temp
+        }
         "measureSystem" -> processParams.measureSystem = v.toInt()
         "barcodeParserType" -> processParams.barcodeParserType = v.toInt()
         "perspectiveAngle" -> processParams.perspectiveAngle = v.toInt()
@@ -236,6 +242,9 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "strictSecurityChecks" to processParams.strictSecurityChecks,
     "returnTransliteratedFields" to processParams.returnTransliteratedFields,
     "checkCaptureProcessIntegrity" to processParams.checkCaptureProcessIntegrity,
+    "bsiTr03135" to mapOf(
+        "generateResult" to processParams.bsiTr03135?.generateResult
+    ).toJson(),
     "measureSystem" to processParams.measureSystem,
     "barcodeParserType" to processParams.barcodeParserType,
     "perspectiveAngle" to processParams.perspectiveAngle,

android/src/main/kotlin/com/regula/plugin/documentreader/JSONConstructor.kt

@@ -13,6 +13,7 @@ import android.util.Pair
 import com.regula.common.exception.RegulaException
 import com.regula.documentreader.api.License
 import com.regula.documentreader.api.completions.model.PrepareProgress
+import com.regula.documentreader.api.config.FinalizeConfig
 import com.regula.documentreader.api.config.RecognizeConfig
 import com.regula.documentreader.api.config.ScannerConfig
 import com.regula.documentreader.api.enums.BarcodeType
@@ -1861,6 +1862,7 @@ fun documentReaderResultsFromJSON(input: JSONObject?) = input?.let {
     result.mrzPosition = it.optJSONArray("mrzPosition").toList(::elementPositionFromJSON)!!
     result.imageQuality = it.optJSONArray("imageQuality").toList(::imageQualityGroupFromJSON)!!
     result.rawResult = it.optString("rawResult")
+    result.bsiTr03135Results = it.optString("bsiTr03135Results")
     result.rfidSessionData = rfidSessionDataFromJSON(it.optJSONObject("rfidSessionData"))
     result.authenticityResult = documentReaderAuthenticityResultFromJSON(it.optJSONObject("authenticityResult"))
     result.barcodeResult = documentReaderBarcodeResultFromJSON(it.optJSONObject("barcodeResult"))
@@ -1888,6 +1890,7 @@ fun generateDocumentReaderResults(input: DocumentReaderResults?) = input?.let {
         "mrzPosition" to it.mrzPosition.toJson(::generateElementPosition),
         "imageQuality" to it.imageQuality.toJson(::generateImageQualityGroup),
         "rawResult" to it.rawResult,
+        "bsiTr03135Results" to it.bsiTr03135Results,
         "rfidSessionData" to generateRFIDSessionData(it.rfidSessionData),
         "authenticityResult" to generateDocumentReaderAuthenticityResult(it.authenticityResult),
         "barcodeResult" to generateDocumentReaderBarcodeResult(it.barcodeResult),
@@ -1959,7 +1962,7 @@ fun generateDeviceEngagement(input: DeviceEngagement?) = input?.let {
 fun nameSpaceMDLFromJSON(input: JSONObject?) = input?.let {
     val result = NameSpaceMDL(it.getString("name"))
     it.getJSONObject("map").forEach { key, value ->
-        result.addField(key, eMDLIntentToRetain.values()[value as Int])
+        result.addField(key, eMDLIntentToRetain.values()[value.toInt()])
     }
     result
 }
@@ -1997,8 +2000,8 @@ fun generateDocumentRequestMDL(input: DocumentRequestMDL?): JSONObject? = input?
 fun documentRequest18013MDLFromJSON(input: JSONObject?) = input?.let {
     val result = DocumentRequest18013MDL()
 
-    result.setPrivateProperty("docType", it.getString("docType"))
-    result.setPrivateProperty("nameSpaceMDLs", it.getJSONArray("namespaces").toList(::nameSpaceMDLFromJSON))
+    if (it.has("docType")) result.setPrivateProperty("docType", it.getString("docType"))
+    if (it.has("namespaces")) result.setPrivateProperty("nameSpaceMDLs", it.getJSONArray("namespaces").toList(::nameSpaceMDLFromJSON))
     result.familyName = it.getIntOrNull("familyName")?.let { enm -> eMDLIntentToRetain.values()[enm] }
     result.givenName = it.getIntOrNull("givenName")?.let { enm -> eMDLIntentToRetain.values()[enm] }
     result.birthDate = it.getIntOrNull("birthDate")?.let { enm -> eMDLIntentToRetain.values()[enm] }
@@ -2102,3 +2105,19 @@ fun generateDeviceEngagementCompletion(deviceEngagement: DeviceEngagement?, erro
     "deviceEngagement" to generateDeviceEngagement(deviceEngagement),
     "error" to generateRegulaException(error)
 )
+
+fun finalizeConfigFromJSON(input: JSONObject?) = input?.let {
+    val result = FinalizeConfig.Builder()
+    if (it.has("rawImages")) result.setRawImages(it.getBoolean("rawImages"))
+    if (it.has("video")) result.setVideo(it.getBoolean("video"))
+    if (it.has("rfidSession")) result.setRfidSession(it.getBoolean("rfidSession"))
+    result.build()
+}
+
+fun generateFinalizeConfig(input: FinalizeConfig?) = input?.let {
+    mapOf(
+        "rawImages" to it.getPrivateProperty("rawImages"),
+        "video" to it.getPrivateProperty("video"),
+        "rfidSession" to it.getPrivateProperty("rfidSession")
+    ).toJson()
+}

android/src/main/kotlin/com/regula/plugin/documentreader/Main.kt

@@ -131,6 +131,7 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "containers" -> containers(callback, args(0), args(1))
     "encryptedContainers" -> encryptedContainers(callback, args(0))
     "finalizePackage" -> finalizePackage(callback)
+    "finalizePackageWithFinalizeConfig" -> finalizePackageWithFinalizeConfig(callback, args(0))
     "endBackendTransaction" -> endBackendTransaction()
     "getTranslation" -> getTranslation(callback, args(0), args(1))
     else -> Unit
@@ -321,7 +322,7 @@ fun engageDeviceData(data: String, callback: Callback) {
 
 fun startRetrieveData(dataRetrieval: JSONObject, deviceEngagement: JSONObject, callback: Callback) {
     stopBackgroundRFID()
-    Instance().startRetrieveData(activity, deviceEngagementFromJSON(deviceEngagement)!!, dataRetrievalFromJSON(dataRetrieval)!!){ v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
+    Instance().startRetrieveData(activity, deviceEngagementFromJSON(deviceEngagement)!!, dataRetrievalFromJSON(dataRetrieval)!!) { v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
 }
 
 lateinit var retrieveDataNFCCallback: Callback
@@ -335,7 +336,7 @@ fun retrieveDataNFC(dataRetrieval: JSONObject, callback: Callback) {
 
 fun retrieveDataBLE(dataRetrieval: JSONObject, deviceEngagement: JSONObject, callback: Callback) {
     stopBackgroundRFID()
-    Instance().retrieveDataBLE(context, deviceEngagementFromJSON(deviceEngagement)!!, dataRetrievalFromJSON(dataRetrieval)!!){ v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
+    Instance().retrieveDataBLE(context, deviceEngagementFromJSON(deviceEngagement)!!, dataRetrievalFromJSON(dataRetrieval)!!) { v1, v2, v3 -> callback(generateCompletion(v1, v2, v3)) }
 }
 
 fun setLocalizationDictionary(dictionary: JSONObject) {
@@ -368,6 +369,12 @@ fun finalizePackage(callback: Callback) = Instance().finalizePackage { action, i
     callback(generateFinalizePackageCompletion(action, info, error))
 }
 
+fun finalizePackageWithFinalizeConfig(callback: Callback, config: JSONObject) = Instance().finalizePackage(
+    finalizeConfigFromJSON(config)
+) { action, info, error ->
+    callback(generateFinalizePackageCompletion(action, info, error))
+}
+
 fun endBackendTransaction() = Instance().endBackendTransaction()
 
 fun textFieldValueByType(

android/src/test/kotlin/com/regula/plugin/documentreader/FlutterDocumentReaderApiPlugin.kt

@@ -19,7 +19,7 @@ class FlutterDocumentReaderApiPluginTest {
     @Test
     fun initConfig() = compare(
         "initConfig", ::initConfigFromJSON, ::generateInitConfig,
-        "databasePath",
+        "customDb",
         "useBleDevice"
     )
 
@@ -47,6 +47,9 @@ class FlutterDocumentReaderApiPluginTest {
         "onlineProcessingConfig.requestHeaders"
     )
 
+    @Test
+    fun finalizeConfig() = compare("finalizeConfig", ::finalizeConfigFromJSON, ::generateFinalizeConfig)
+
     // params.process_params
 
     @Test

example/ios/Tests/Tests.swift

@@ -11,8 +11,7 @@ class Tests: XCTestCase {
 
     func test_initConfig() {
         compare(name: "initConfig", fromJson: RGLWJSONConstructor.config, generate: RGLWJSONConstructor.generate,
-                omit: ["databasePath",
-                       "blackList",
+                omit: ["blackList",
                        "customDb",
                        "useBleDevice"])
     }
@@ -49,6 +48,10 @@ class Tests: XCTestCase {
                        "onlineProcessingConfig.requestHeaders"])
     }
 
+    func test_finalizeConfig() {
+        compare(name: "finalizeConfig", fromJson: RGLWJSONConstructor.finalizeConfig, generate: RGLWJSONConstructor.generate)
+    }
+    
     // params.process_params
 
     func test_faceApiSearchParams() {

example/pubspec.yaml

@@ -14,8 +14,8 @@ dependencies:
     sdk: flutter
   flutter_document_reader_api:
     path: ../
-  flutter_document_reader_core_fullauthrfid: 9.1.1498
-  flutter_document_reader_btdevice:  7.6.17
+  flutter_document_reader_core_fullauthrfid: 9.2.1727
+  flutter_document_reader_btdevice:  9.1.42
   cupertino_icons: ^1.0.8
 
 dev_dependencies:

ios/Classes/FlutterDocumentReaderApiPlugin.m

@@ -2,10 +2,14 @@
 
 @implementation FlutterDocumentReaderApiPlugin
 
-UIViewController*(^RGLWRootViewController)(void) = ^UIViewController*(){
-    for (UIWindow *window in UIApplication.sharedApplication.windows)
-        if (window.isKeyWindow)
-            return window.rootViewController;
+UIViewController*(^RGLWRootViewController)(void) = ^UIViewController*() {
+    for (UIScene *scene in UIApplication.sharedApplication.connectedScenes)
+        if ([scene isKindOfClass:[UIWindowScene class]]) {
+            UIWindowScene *windowScene = (UIWindowScene *)scene;
+            for (UIWindow *window in windowScene.windows)
+                if (window.isKeyWindow)
+                    return window.rootViewController;
+        }
     return nil;
 };
 

ios/Classes/RGLWConfig.m

@@ -193,6 +193,11 @@ +(void)setProcessParams:(NSDictionary*)options :(RGLProcessParams*)processParams
     if (options[@"disableAuthResolutionFilter"]) processParams.disableAuthResolutionFilter = options[@"disableAuthResolutionFilter"];
     if (options[@"strictSecurityChecks"]) processParams.strictSecurityChecks = options[@"strictSecurityChecks"];
     if (options[@"returnTransliteratedFields"]) processParams.returnTransliteratedFields = options[@"returnTransliteratedFields"];
+    if (options[@"checkCaptureProcessIntegrity"]) processParams.checkCaptureProcessIntegrity = options[@"checkCaptureProcessIntegrity"];
+    if (options[@"bsiTr03135"]) {
+        processParams.bsiTr03135 = [RGLBsi new];
+        processParams.bsiTr03135.generateResult = options[@"bsiTr03135"][@"generateResult"];
+    }
 
     // Int
     if([options valueForKey:@"measureSystem"] != nil)
@@ -323,6 +328,10 @@ +(NSDictionary*)getProcessParams:(RGLProcessParams*)processParams {
     result[@"disableAuthResolutionFilter"] = processParams.disableAuthResolutionFilter;
     result[@"strictSecurityChecks"] = processParams.strictSecurityChecks;
     result[@"returnTransliteratedFields"] = processParams.returnTransliteratedFields;
+    result[@"checkCaptureProcessIntegrity"] = processParams.checkCaptureProcessIntegrity;
+    if(processParams.bsiTr03135) result[@"bsiTr03135"] = @{
+        @"generateResult": processParams.bsiTr03135.generateResult,
+    };
 
     // Int
     result[@"measureSystem"] = [NSNumber numberWithInteger:processParams.measureSystem];