@regulaforensics/face-sdk 7.1.196-nightly → 7.1.201-nightly

package/README.md

@@ -3,7 +3,7 @@ Face SDK is a framework that is used for face matching, recognition and liveness
 This plugin makes possible to use it with react-native, cordova and ionic applications.
 
 ## Demo applications
-In the [examples](examples/) folder you can find demo 4 applications:
+In the [examples](examples/) folder you can find 4 demo applications:
 * [React-native](examples/react-native)
 * [Cordova](examples/cordova)
 * [Ionic(ionic app with cordova, angular)](examples/ionic)

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '7.1.196-nightly'
+  s.version      = '7.1.201-nightly'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.homepage     = 'https://regulaforensics.com'
 
   s.source       = { http: "file:#{source}" }
-  s.ios.deployment_target = '12.0'
+  s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDFaceSDK.h', 'ios/CVDFaceSDK.m' ]
   s.dependency 'FaceSDKNightly', '7.1.2555'

package/android/CVDFaceSDK.kt

@@ -1,19 +1,27 @@
 package com.regula.plugin.facesdk
 
+import android.content.Context
+import android.util.Log
 import org.apache.cordova.CallbackContext
 import org.apache.cordova.CordovaPlugin
-import org.apache.cordova.CordovaWebView
 import org.apache.cordova.PluginResult
 import org.json.JSONArray
 
-lateinit var args: JSONArray
-lateinit var eventSender: CordovaWebView
 val eventCallbackIds = mutableMapOf<String, String>()
 
+lateinit var args: JSONArray
+lateinit var binding: CordovaPlugin
+val context: Context
+    get() = binding.cordova.context
+
 fun sendEvent(callbackId: String, data: Any? = "") {
-    val pluginResult = PluginResult(PluginResult.Status.OK, data.toSendable() as String?)
+    val pluginResult = when (data) {
+        is Int -> PluginResult(PluginResult.Status.OK, data)
+        is Boolean -> PluginResult(PluginResult.Status.OK, data)
+        else -> PluginResult(PluginResult.Status.OK, data.toSendable() as String?)
+    }
     pluginResult.keepCallback = true
-    eventSender.sendPluginResult(pluginResult, eventCallbackIds[callbackId] ?: callbackId)
+    binding.webView.sendPluginResult(pluginResult, eventCallbackIds[callbackId] ?: callbackId)
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -22,13 +30,19 @@ fun <T> argsNullable(index: Int): T? = if (args.get(index).toString() != "null")
 } else null
 
 class CVDFaceSDK : CordovaPlugin() {
+    init {
+        binding = this
+    }
+
     override fun execute(action: String, arguments: JSONArray, callbackContext: CallbackContext): Boolean {
-        activity = cordova.activity
-        eventSender = webView
         args = arguments
         val method = args.remove(0) as String
         if (method == "setEvent") eventCallbackIds[args(0)] = callbackContext.callbackId
-        methodCall(method) { data: Any? -> sendEvent(callbackContext.callbackId, data) }
+        try {
+            methodCall(method) { data: Any? -> sendEvent(callbackContext.callbackId, data) }
+        } catch (error: Exception) {
+            Log.e("REGULA", "Caught exception in \"$method\" function:", error)
+        }
         return true
     }
 }

package/android/src/main/java/com/regula/plugin/facesdk/Config.kt

@@ -1,3 +1,5 @@
+@file:Suppress("EnumValuesSoftDeprecate")
+
 package com.regula.plugin.facesdk
 
 import com.regula.facesdk.configuration.Customization
@@ -20,6 +22,7 @@ fun setFaceCaptureConfig(builder: FaceCaptureConfiguration.Builder, config: JSON
         "closeButtonEnabled" -> builder.setCloseButtonEnabled(v as Boolean)
         "torchButtonEnabled" -> builder.setTorchButtonEnabled(v as Boolean)
         "vibrateOnSteps" -> builder.setVibrateOnStep(v as Boolean)
+        "detectOcclusion" -> builder.setDetectOcclusion(v as Boolean)
         "cameraPositionAndroid" -> builder.setCameraId(v.toInt())
         "screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
         "timeout" -> builder.setTimeout(v.toFloat())
@@ -33,6 +36,7 @@ fun getFaceCaptureConfig(input: FaceCaptureConfiguration) = mapOf(
     "closeButtonEnabled" to input.isCloseButtonEnabled,
     "torchButtonEnabled" to input.isTorchButtonEnabled,
     "vibrateOnSteps" to input.isVibrateOnSteps,
+    "detectOcclusion" to input.isDetectOcclusion,
     "cameraPositionAndroid" to input.cameraId,
     "screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
     "timeout" to input.timeout,
@@ -78,11 +82,13 @@ fun getLivenessConfig(input: LivenessConfiguration) = mapOf(
 fun setMatchFacesConfig(builder: MatchFacesConfiguration.Builder, config: JSONObject) = config.forEach { k, v ->
     when (k) {
         "processingMode" -> builder.setProcessingMode(ProcessingMode.values()[v.toInt()])
+        "locationTrackingEnabled" -> builder.setLocationTrackingEnabled(v as Boolean)
     }
 }
 
 fun getMatchFacesConfig(input: MatchFacesConfiguration) = mapOf(
-    "processingMode" to input.processingMode.ordinal
+    "processingMode" to input.processingMode.ordinal,
+    "locationTrackingEnabled" to input.isLocationTrackingEnabled
 ).toJson()
 
 fun setCustomization(input: Customization, config: JSONObject) = config.forEach { key, value ->

package/android/src/main/java/com/regula/plugin/facesdk/JSONConstructor.kt

@@ -1,3 +1,5 @@
+@file:Suppress("EnumValuesSoftDeprecate", "unused")
+
 package com.regula.plugin.facesdk
 
 import android.annotation.SuppressLint

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

@@ -1,7 +1,5 @@
 package com.regula.plugin.facesdk
 
-import android.annotation.SuppressLint
-import android.app.Activity
 import com.regula.plugin.facesdk.Convert.toBase64
 import com.regula.common.LocalizationCallbacks
 import com.regula.facesdk.FaceSDK.Instance
@@ -68,11 +66,6 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
 inline fun <reified T> args(index: Int) = argsNullable<T>(index)!!
 typealias Callback = (Any?) -> Unit
 
-@SuppressLint("StaticFieldLeak")
-lateinit var activity: Activity
-val context
-    get() = activity
-
 const val cameraSwitchEvent = "cameraSwitchEvent"
 const val livenessNotificationEvent = "livenessNotificationEvent"
 const val videoEncoderCompletionEvent = "video_encoder_completion"
@@ -136,11 +129,13 @@ fun stopLiveness() = Instance().stopLivenessProcessing(context)
 
 fun matchFaces(callback: Callback, request: JSONObject, config: JSONObject?) = config?.let {
     Instance().matchFaces(
+        context,
         matchFacesRequestFromJSON(request),
         matchFacesConfigFromJSON(it),
         matchFacesCompletion(callback)
     )
 } ?: Instance().matchFaces(
+    context,
     matchFacesRequestFromJSON(request),
     matchFacesCompletion(callback)
 )

package/android/src/main/java/com/regula/plugin/facesdk/RNFaceApiModule.kt

@@ -1,5 +1,7 @@
 package com.regula.plugin.facesdk
 
+import android.content.Context
+import android.util.Log
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -13,13 +15,16 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 var listenerCount = 0
+
 lateinit var args: JSONArray
-lateinit var reactContext: ReactContext
+lateinit var binding: ReactContext
+val context: Context
+    get() = binding.applicationContext
 
 fun sendEvent(event: String, data: Any? = "") {
     if (listenerCount <= 0) return
     val result = if (data is JSONObject || data is JSONArray) data.toString() else data.toString() + ""
-    reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(event, result)
+    binding.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(event, result)
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -30,15 +35,16 @@ fun <T> argsNullable(index: Int): T? {
     return value as T
 }
 
+@Suppress("unused")
 class RNFaceSDKPackage : ReactPackage {
     override fun createNativeModules(rc: ReactApplicationContext) = listOf(RNFaceSDKModule(rc))
     override fun createViewManagers(rc: ReactApplicationContext) = emptyList<ViewManager<*, *>>()
 }
 
 @Suppress("unused", "UNUSED_PARAMETER")
-class RNFaceSDKModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(rc) {
+class RNFaceSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     init {
-        reactContext = rc
+        binding = reactContext
     }
 
     @ReactMethod
@@ -54,8 +60,12 @@ class RNFaceSDKModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(
     @ReactMethod
     fun exec(method: String, arguments: ReadableArray, promise: Promise) {
         args = JSONArray(arguments.toArrayList())
-        reactContext.currentActivity?.let { activity = it }
-        methodCall(method) { data -> promise.resolve(data.toSendable()) }
+        try {
+            methodCall(method) { data -> promise.resolve(data.toSendable()) }
+        } catch (error: Exception) {
+            Log.e("REGULA", "Caught exception in \"$method\" function:", error)
+        }
     }
+
     override fun getName() = "RNFaceSDK"
 }

package/android/src/main/java/com/regula/plugin/facesdk/Utils.kt

@@ -1,4 +1,4 @@
-@file:Suppress("UNCHECKED_CAST")
+@file:Suppress("UNCHECKED_CAST", "EnumValuesSoftDeprecate")
 
 package com.regula.plugin.facesdk
 

package/examples/capacitor/README.md

@@ -23,7 +23,7 @@
 ```bash
 npm uninstall @regulaforensics/face-core-basic
 npm install @regulaforensics/face-core-match
-ionic cap sync
+npm run setup
 ```
 
 4. Turn off the internet and run the app.

package/examples/capacitor/android/app/capacitor.build.gradle

@@ -2,21 +2,22 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
   }
 }
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-app')
+    implementation project(':capacitor-dialog')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-status-bar')
-
+    implementation "androidx.core:core:1.6.+"
+    implementation "androidx.webkit:webkit:1.4.0"
 }
 
-
 if (hasProperty('postBuildExtras')) {
   postBuildExtras()
 }

package/examples/capacitor/android/capacitor.settings.gradle

@@ -5,6 +5,9 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 
+include ':capacitor-dialog'
+project(':capacitor-dialog').projectDir = new File('../node_modules/@capacitor/dialog/android')
+
 include ':capacitor-haptics'
 project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
 

package/examples/capacitor/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/examples/capacitor/android/variables.gradle

@@ -1,16 +1,16 @@
 ext {
-    minSdkVersion = 24
-    compileSdkVersion = 34
-    targetSdkVersion = 34
-    androidxActivityVersion = '1.8.2'
-    androidxAppCompatVersion = '1.6.1'
+    minSdkVersion = 23
+    compileSdkVersion = 35
+    targetSdkVersion = 35
+    androidxActivityVersion = '1.9.2'
+    androidxAppCompatVersion = '1.7.0'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.12.0'
-    androidxFragmentVersion = '1.5.6'
-    coreSplashScreenVersion = '1.0.0'
-    androidxWebkitVersion = '1.6.1'
+    androidxCoreVersion = '1.15.0'
+    androidxFragmentVersion = '1.8.4'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.12.1'
     junitVersion = '4.13.2'
-    androidxJunitVersion = '1.1.5'
-    androidxEspressoCoreVersion = '3.5.1'
-    cordovaAndroidVersion = '12.0.1'
+    androidxJunitVersion = '1.2.1'
+    androidxEspressoCoreVersion = '3.6.1'
+    cordovaAndroidVersion = '10.1.1'
 }

package/examples/capacitor/ios/App/Podfile

@@ -1,3 +1,5 @@
+source "https://github.com/CocoaPods/Specs.git"
+
 require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '14.0'
@@ -12,6 +14,7 @@ def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
+  pod 'CapacitorDialog', :path => '../../node_modules/@capacitor/dialog'
   pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
   pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'

package/examples/capacitor/ios/App/Podfile.lock

@@ -0,0 +1,72 @@
+PODS:
+  - Capacitor (7.0.1):
+    - CapacitorCordova
+  - CapacitorApp (7.0.0):
+    - Capacitor
+  - CapacitorCordova (7.0.1)
+  - CapacitorDialog (7.0.0):
+    - Capacitor
+  - CapacitorHaptics (7.0.0):
+    - Capacitor
+  - CapacitorKeyboard (7.0.0):
+    - Capacitor
+  - CapacitorStatusBar (7.0.0):
+    - Capacitor
+  - CordovaPlugins (7.0.1):
+    - CapacitorCordova
+  - CordovaPluginsResources (0.0.105)
+
+DEPENDENCIES:
+  - "Capacitor (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
+  - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorDialog (from `../../node_modules/@capacitor/dialog`)"
+  - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)"
+  - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)"
+  - "CapacitorStatusBar (from `../../node_modules/@capacitor/status-bar`)"
+  - CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
+  - CordovaPluginsResources (from `../capacitor-cordova-ios-plugins`)
+
+SPEC REPOS:
+  https://github.com/CocoaPods/Specs.git:
+    - FaceCoreBasic
+    - FaceSDK
+    - RegulaCommon
+
+EXTERNAL SOURCES:
+  Capacitor:
+    :path: "../../node_modules/@capacitor/ios"
+  CapacitorApp:
+    :path: "../../node_modules/@capacitor/app"
+  CapacitorCordova:
+    :path: "../../node_modules/@capacitor/ios"
+  CapacitorDialog:
+    :path: "../../node_modules/@capacitor/dialog"
+  CapacitorHaptics:
+    :path: "../../node_modules/@capacitor/haptics"
+  CapacitorKeyboard:
+    :path: "../../node_modules/@capacitor/keyboard"
+  CapacitorStatusBar:
+    :path: "../../node_modules/@capacitor/status-bar"
+  CordovaPlugins:
+    :path: "../capacitor-cordova-ios-plugins"
+  CordovaPluginsResources:
+    :path: "../capacitor-cordova-ios-plugins"
+
+SPEC CHECKSUMS:
+  Capacitor: de199cba6c8b20995428ad0b7cb0bc6ca625ffd4
+  CapacitorApp: 9cb31064a6c6bb2b1438583733a7bf45557fc1da
+  CapacitorCordova: 63d476958d5022d76f197031e8b7ea3519988c64
+  CapacitorDialog: 6dc6bdd5d285118ff3732470b9f169c14fc564a7
+  CapacitorHaptics: 7be406a91e4eb87287f321c6c68e1709d6837b3a
+  CapacitorKeyboard: 4db71e694e7afb5d7c0be09b05495c19f7d6c914
+  CapacitorStatusBar: a8c4c83ed2e973bdafb979e80e4b00d027832cb7
+  CordovaPlugins: a27ffb01883b6395654b17c5bf6efdeb74bcb275
+  CordovaPluginsResources: 0c211f770ed91763a179ebcd9b9346e120b70662
+  FaceCoreBasic: a2ff9ed108c4d9d67e892df6be5ccc4729f3cda5
+  FaceSDK: e96016e36d5507ad9d9ee3b011d735f5fe51829f
+  RegulaCommon: 2a6406d2d3ebbd720b66a9cfa5b9631701d343eb
+
+PODFILE CHECKSUM: fad7821e0f76a12156270cf41a925118bf54bbe3
+
+COCOAPODS: 1.16.2