8.1.738

Author: Jenkins

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Flutter",
+            "cwd": "example",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        }
+    ]
+}

android/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     dependencies {
-        implementation('com.regula.face:api:7.2.4426') {
+        implementation('com.regula.face:api:8.1.4451') {
             transitive = true
         }
 

android/src/main/kotlin/com/regula/plugin/facesdk/FlutterFaceApiPlugin.kt

@@ -1,11 +1,14 @@
 package com.regula.plugin.facesdk
 
+import android.app.Activity
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.EventChannel.EventSink
 import io.flutter.plugin.common.EventChannel.StreamHandler
@@ -18,8 +21,11 @@ val eventSinks = mutableMapOf<String, EventSink?>()
 
 lateinit var args: List<Any?>
 lateinit var binding: FlutterPluginBinding
+lateinit var activityBinding: ActivityPluginBinding
 val context: Context
     get() = binding.applicationContext
+val activity: Activity
+    get() = activityBinding.activity
 
 fun sendEvent(id: String, data: Any? = "") {
     eventSinks[id]?.let { Handler(Looper.getMainLooper()).post { it.success(data.toSendable()) } }
@@ -37,7 +43,10 @@ fun setupEventChannel(id: String) = EventChannel(binding.binaryMessenger, "$chan
     override fun onCancel(arguments: Any?) = Unit
 })
 
-class FlutterFaceApiPlugin : FlutterPlugin, MethodCallHandler {
+class FlutterFaceApiPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
+    override fun onDetachedFromActivityForConfigChanges() = Unit
+    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) = Unit
+    override fun onDetachedFromActivity() = Unit
     override fun onDetachedFromEngine(binding: FlutterPluginBinding) = Unit
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         args = call.arguments as List<*>
@@ -48,6 +57,10 @@ class FlutterFaceApiPlugin : FlutterPlugin, MethodCallHandler {
         }
     }
 
+    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+        activityBinding = binding
+    }
+
     override fun onAttachedToEngine(flutterBinding: FlutterPluginBinding) {
         binding = flutterBinding
         for (event in arrayOf(

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

@@ -36,8 +36,8 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "setEnv" -> setEnv(argsNullable(0))
     "getLocale" -> getLocale(callback)
     "setLocale" -> setLocale(argsNullable(0))
-    "setLocalizationDictionary" -> setLocalizationDictionary(args(0))
-    "setRequestHeaders" -> setRequestHeaders(args(0))
+    "setLocalizationDictionary" -> setLocalizationDictionary(argsNullable(0))
+    "setRequestHeaders" -> setRequestHeaders(argsNullable(0))
     "setCustomization" -> setCustomization(args(0))
     "isInitialized" -> isInitialized(callback)
     "initialize" -> initialize(callback, argsNullable(0))
@@ -99,13 +99,13 @@ fun getLocale(callback: Callback) = callback(Instance().locale)
 
 fun setLocale(locale: String?) = locale.let { Instance().locale = it }
 
-fun setLocalizationDictionary(dictionary: JSONObject) {
-    localizationCallbacks = LocalizationCallbacks { if (dictionary.has(it)) dictionary.getString(it) else null }
+fun setLocalizationDictionary(dictionary: JSONObject?) {
+    localizationCallbacks = LocalizationCallbacks { if (dictionary?.has(it) == true) dictionary.getString(it) else null }
     Instance().setLocalizationCallback(localizationCallbacks!!)
 }
 
-fun setRequestHeaders(headers: JSONObject) {
-    networkInterceptorListener = NetworkInterceptorListener { headers.forEach { k, v -> it.header(k, v as String) } }
+fun setRequestHeaders(headers: JSONObject?) {
+    networkInterceptorListener = NetworkInterceptorListener { headers?.forEach { k, v -> it.header(k, v as String) } }
     Instance().setNetworkInterceptorListener(networkInterceptorListener)
 }
 
@@ -128,13 +128,13 @@ fun deinitialize() = Instance().deinitialize()
 
 fun startFaceCapture(callback: Callback, config: JSONObject?) = config?.let {
     Instance().presentFaceCaptureActivity(
-        context,
+        activity,
         faceCaptureConfigFromJSON(it),
         faceCaptureCompletion(callback),
         faceCaptureNotificationCompletion()
     )
 } ?: Instance().presentFaceCaptureActivity(
-    context,
+    activity,
     faceCaptureCompletion(callback),
     faceCaptureNotificationCompletion()
 )
@@ -143,13 +143,13 @@ fun stopFaceCapture() = Instance().stopFaceCaptureActivity(context)
 
 fun startLiveness(callback: Callback, config: JSONObject?) = config?.let {
     Instance().startLiveness(
-        context,
+        activity,
         livenessConfigFromJSON(it),
         livenessCompletion(callback),
         livenessNotificationCompletion()
     )
 } ?: Instance().startLiveness(
-    context,
+    activity,
     livenessCompletion(callback),
     livenessNotificationCompletion()
 )

example/.vscode/launch.json

@@ -0,0 +1,10 @@
+{
+    "configurations": [
+      {
+        "name": "Flutter",
+        "request": "launch",
+        "type": "dart",
+        "flutterMode": "profile"
+      }
+    ]
+  }

example/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "dart.flutterRunAdditionalArgs": [
+        "--profile"
+    ]
+}

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Profile"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

example/lib/main.dart

@@ -4,6 +4,7 @@ import 'dart:async';
 import 'package:flutter_face_api/flutter_face_api.dart';
 import 'package:image_picker/image_picker.dart';
 
+void main() => runApp(new MaterialApp(home: new MyApp()));
 var faceSdk = FaceSDK.instance;
 MatchFacesImage? image1;
 MatchFacesImage? image2;
@@ -270,5 +271,3 @@ class MyApp extends StatefulWidget {
     return MyAppState();
   }
 }
-
-void main() => runApp(new MaterialApp(home: new MyApp()));

example/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   flutter_face_api:
     path: ../
-  flutter_face_core_basic: 7.2.235
+  flutter_face_core_basic: 8.1.365
   cupertino_icons: ^1.0.8
 
 dev_dependencies:

ios/Classes/FlutterFaceApiPlugin.m

@@ -2,10 +2,14 @@
 
 @implementation FlutterFaceApiPlugin
 
-UIViewController*(^RFSWRootViewController)(void) = ^UIViewController*(){
-    for (UIWindow *window in UIApplication.sharedApplication.windows)
-        if (window.isKeyWindow)
-            return window.rootViewController;
+UIViewController*(^RFSWRootViewController)(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;
 };