Release 5.0.0

Author: fernando-iproov

CHANGELOG.md

@@ -1,5 +1,20 @@
 # iProov Biometrics Flutter SDK
 
+## 5.0.0
+
+iProov Biometrics Flutter SDK v5.0.0 includes the following changes
+
+### iOS
+
+* Upgraded SDK to [v12.0.0](https://github.com/iProov/ios/releases/tag/12.0.0).
+* Requires iOS 13 and above
+
+### Android
+
+* Upgraded SDK to [v10.0.0](https://github.com/iProov/android/releases/tag/v10.0.0).
+* Requires Android API Level 26 (Android 8 Oreo) and above
+
+
 ## 4.0.4
 
 * Added `additionalOptions` parameter to `getToken()` in the Dart API client.

README.md

@@ -11,8 +11,8 @@ We also provide an API Client written in Dart to call our [REST API v2](https://
 
 - Dart SDK 2.15 and above
 - Flutter SDK 1.20 and above
-- iOS 12 and above
-- Android API Level 21 (Android 5 Lollipop) and above
+- iOS 13 and above
+- Android API Level 26 (Android 8 Oreo) and above
 
 ## Repository contents
 
@@ -35,7 +35,7 @@ Add the following to your project's `pubspec.yaml` file:
 
 ```yaml
 dependencies:
-  iproov_flutter: ^4.0.3
+  iproov_flutter: ^5.0.0
 ```
 
 You can then install it with:

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.iproov.flutter_sdk_plugin'
-version '4.0.3'
+version '5.0.0'
 
 buildscript {
     ext.kotlin_version = '1.5.30'
@@ -32,7 +32,7 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -41,5 +41,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.iproov.sdk:iproov:9.1.1"
+    implementation "com.iproov.sdk:iproov:10.0.0"
 }

android/src/main/kotlin/com/iproov/sdk/IProovSDKPlugin.kt

@@ -2,8 +2,9 @@ package com.iproov.sdk
 
 import android.content.Context
 import android.graphics.Bitmap
-import com.iproov.sdk.bridge.OptionsBridge
-import com.iproov.sdk.core.exception.*
+import com.iproov.sdk.api.OptionsBridge
+import com.iproov.sdk.api.IProov
+import com.iproov.sdk.api.exception.*
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.EventChannel
@@ -15,6 +16,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.onSubscription
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.withContext
@@ -35,30 +38,29 @@ class IProovSDKPlugin : FlutterPlugin {
     private var eventSink: EventChannel.EventSink? = null
     private var uiEventSink: EventChannel.EventSink? = null
     private var flutterPluginBinding: FlutterPlugin.FlutterPluginBinding? = null
-    private val launcher = IProovFlowLauncher()
-    private var pendingException: IProovException? = null
 
-    init {
-        sessionStateListener()
-        sessionUIStateListener()
-    }
+    private var sessionStateJob: Job? = null
+    private var sessionUIStateJob: Job? = null
+    private var pendingException: IProovException? = null
 
-    private fun sessionStateListener() {
-        coroutineScope.launch {
-            launcher.sessionsStates.collect { sessionState ->
-                sessionState?.let {
-                    sessionState.state.let { state ->
+    private fun observeSessionState(session: IProov.Session, whenReady: (() -> Unit)? = null) {
+        sessionStateJob?.cancel()
+        sessionStateJob = coroutineScope.launch(Dispatchers.IO) {
+            kotlin.runCatching {
+                session.state
+                    .onSubscription { whenReady?.invoke() }
+                    .collect { state ->
                         withContext(Dispatchers.Main) {
                             when (state) {
-                                is IProov.IProovState.Connecting -> {
+                                is IProov.State.Connecting -> {
                                     eventSink?.success(hashMapOf("event" to "connecting"))
                                 }
 
-                                is IProov.IProovState.Connected -> {
+                                is IProov.State.Connected -> {
                                     eventSink?.success(hashMapOf("event" to "connected"))
                                 }
 
-                                is IProov.IProovState.Processing -> {
+                                is IProov.State.Processing -> {
                                     eventSink?.success(
                                         hashMapOf(
                                             "event" to "processing",
@@ -68,7 +70,7 @@ class IProovSDKPlugin : FlutterPlugin {
                                     )
                                 }
 
-                                is IProov.IProovState.Success -> {
+                                is IProov.State.Success -> {
                                     val frameArray = state.successResult.frame?.let { bmp ->
                                         val stream = ByteArrayOutputStream()
                                         bmp.compress(Bitmap.CompressFormat.PNG, 100, stream)
@@ -86,7 +88,7 @@ class IProovSDKPlugin : FlutterPlugin {
                                     eventSink?.endOfStream()
                                 }
 
-                                is IProov.IProovState.Failure -> {
+                                is IProov.State.Failure -> {
                                     val context = flutterPluginBinding!!.applicationContext
 
                                     val frameArray = state.failureResult.frame?.let { bmp ->
@@ -108,12 +110,12 @@ class IProovSDKPlugin : FlutterPlugin {
                                     eventSink?.endOfStream()
                                 }
 
-                                is IProov.IProovState.Error -> {
+                                is IProov.State.Error -> {
                                     eventSink?.success(state.exception.serialize())
                                     eventSink?.endOfStream()
                                 }
 
-                                is IProov.IProovState.Canceled -> {
+                                is IProov.State.Canceled -> {
                                     eventSink?.success(
                                         hashMapOf(
                                             "event" to "canceled",
@@ -125,32 +127,33 @@ class IProovSDKPlugin : FlutterPlugin {
                             }
                         }
                     }
-                }
             }
         }
     }
 
-    private fun sessionUIStateListener() {
-        coroutineScope.launch {
-            launcher.sessionsUIStates.collect { sessionUIState ->
-                sessionUIState?.let {
-                    withContext(Dispatchers.Main) {
-                        when (sessionUIState.state) {
-                            IProov.IProovUIState.NotStarted -> {
-                                uiEventSink?.success(hashMapOf("uiEvent" to "not_started"))
-                            }
+    private fun observeSessionUIState(session: IProov.Session) {
+        sessionUIStateJob?.cancel()
+        sessionUIStateJob = coroutineScope.launch(Dispatchers.IO) {
+            kotlin.runCatching {
+                session.uiState
+                    .collect { sessionUIState ->
+                        withContext(Dispatchers.Main) {
+                            when (sessionUIState) {
+                                IProov.UIState.NotStarted -> {
+                                    uiEventSink?.success(hashMapOf("uiEvent" to "not_started"))
+                                }
 
-                            IProov.IProovUIState.Started -> {
-                                uiEventSink?.success(hashMapOf("uiEvent" to "started"))
-                            }
+                                IProov.UIState.Started -> {
+                                    uiEventSink?.success(hashMapOf("uiEvent" to "started"))
+                                }
 
-                            IProov.IProovUIState.Ended -> {
-                                uiEventSink?.success(hashMapOf("uiEvent" to "ended"))
-                                uiEventSink?.endOfStream()
+                                IProov.UIState.Ended -> {
+                                    uiEventSink?.success(hashMapOf("uiEvent" to "ended"))
+                                    uiEventSink?.endOfStream()
+                                }
                             }
                         }
                     }
-                }
             }
         }
     }
@@ -171,23 +174,23 @@ class IProovSDKPlugin : FlutterPlugin {
                 "keyPair.sign" -> {
                     val data = call.arguments
                     if (data is ByteArray) {
-                        val signature = launcher.getKeyPair(context!!).sign(data)
+                        val signature = IProov.getKeyPair(context!!).sign(data)
                         result.success(signature)
                     } else {
                         result.error("INVALID", "Invalid argument passed", null)
                     }
                 }
 
-                "keyPair.publicKey.getPem" -> result.success(launcher.getKeyPair(context!!).publicKey.pem)
-                "keyPair.publicKey.getDer" -> result.success(launcher.getKeyPair(context!!).publicKey.der)
+                "keyPair.publicKey.getPem" -> result.success(IProov.getKeyPair(context!!).publicKey.pem)
+                "keyPair.publicKey.getDer" -> result.success(IProov.getKeyPair(context!!).publicKey.der)
                 "cancel" -> cancelSession()
                 else -> result.notImplemented()
             }
         }
 
         private fun cancelSession() {
             coroutineScope.launch {
-                launcher.currentSession()?.cancel()
+                IProov.session?.cancel()
             }
         }
 
@@ -227,13 +230,23 @@ class IProovSDKPlugin : FlutterPlugin {
                     }
 
                     coroutineScope.launch {
-                        launcher.launch(context, streamingUrl, token, options)
+                        IProov.createSession(context, streamingUrl, token, options).let { session ->
+                            // Observe first, then start
+                            observeSession(session) {
+                                session.start()
+                            }
+                        }
                     }
                 }
             }
         }
     }
 
+    private fun observeSession(session: IProov.Session, whenReady: (() -> Unit)? = null) {
+        observeSessionState(session, whenReady)
+        observeSessionUIState(session)
+    }
+
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         this.flutterPluginBinding = flutterPluginBinding
 
@@ -255,7 +268,7 @@ class IProovSDKPlugin : FlutterPlugin {
 
             override fun onCancel(arguments: Any?) {
                 coroutineScope.launch {
-                    launcher.currentSession()?.cancel()
+                    IProov.session?.cancel()
                 }
                 eventSink = null
             }

example/android/app/build.gradle

@@ -40,7 +40,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.iproov.flutter.example"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example/android/build.gradle

@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/ios/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '12.0'
+platform :ios, '13.0'
 source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 

example/ios/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - iProov (11.1.1)
-  - iproov_flutter (4.0.4):
+  - iProov (12.0.0)
+  - iproov_flutter (5.0.0):
     - Flutter
-    - iProov (= 11.1.1)
+    - iProov (= 12.0.0)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -21,9 +21,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  iProov: 14fa45ff813bccd32274ecce2694445aba4956e4
-  iproov_flutter: 4cdb91308e413eb8fdcfcb8f4cf282d76a13be01
+  iProov: 1921d2fdbd8f8fa24d4694c2150c2c0bac0371a6
+  iproov_flutter: 46b6252fff2a552174ee56ce91d92d22434ef729
 
-PODFILE CHECKSUM: 3b63cf14198dad73e5eaccaa94ed2fb1260f5b72
+PODFILE CHECKSUM: 61e432a29a6cfb9fc7ca7cacd9dce49cb7fb3466
 
 COCOAPODS: 1.15.2

example/ios/Runner.xcodeproj/project.pbxproj

@@ -365,7 +365,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -503,7 +503,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -535,7 +535,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ios/iproov_flutter.podspec

@@ -14,9 +14,9 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
 
   s.dependency 'Flutter'
-  s.dependency 'iProov', '11.1.1'
+  s.dependency 'iProov', '12.0.0'
 
   s.swift_version = '5.5'
-  s.platform = :ios, '12.0'
+  s.platform = :ios, '13.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
 end