7.1.578

Author: Jenkins

README.md

@@ -1,7 +1,12 @@
-# Regula Face API (React Native version)
+# Deprecated
+This plugin is deprecated and `7.1` is the last release. We kindly recommend migrating to our new plugin `@regulaforensics/face-sdk`:
+* [github](https://github.com/regulaforensics/npm-face-sdk)
+* [npmjs](https://www.npmjs.com/package/@regulaforensics/face-sdk)
+
+## Regula Face API (React Native version)
 Face API is a framework that is used for face matching, recognition and liveness detection.
 
-# Contents
+## Contents
 * [How to build the demo application](#how-to-build-the-demo-application)
 * [How to use offine match](#how-to-use-offine-match)
 * [Documentation](#documentation)
@@ -27,7 +32,7 @@ $ pod install
 4. iOS:
   * Run `npx react-native run-ios` inside `example` folder - this is just one way to run the app. You can also run it directly from within Xcode.
 
-## How to use offine match
+## How to use offline match
 1. Place a license that supports offline match at `android/app/src/main/assets/regula.license` and `ios/license/regula.license`.
 2. Change android and iOS bundle id if required by your license with the following commands(replace `ANDROID_ID` and `IOS_ID` with actual ids):
 ```bash

RNFaceApi.podspec

@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.source       = { http: "file:#{source}" }
   s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
-  s.dependency 'FaceSDK', '6.4.2494'
+  s.dependency 'FaceSDK', '7.1.2736'
   s.dependency 'React'
 end

android/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.face:api:6.4.3632'){
+    implementation('com.regula.face:api:7.1.3784'){
         transitive = true
     }
 }

android/src/main/java/com/reactlibrary/Config.kt

@@ -21,6 +21,7 @@ fun setFaceCaptureConfig(builder: FaceCaptureConfiguration.Builder, config: JSON
         "torchButtonEnabled" -> builder.setTorchButtonEnabled(v as Boolean)
         "vibrateOnSteps" -> builder.setVibrateOnStep(v as Boolean)
         "detectOcclusion" -> builder.setDetectOcclusion(v as Boolean)
+        "showFaceAnimation" -> builder.setShowFaceAnimation(v as Boolean)
         "cameraPositionAndroid" -> builder.setCameraId(v.toInt())
         "screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
         "timeout" -> builder.setTimeout(v.toFloat())
@@ -35,6 +36,7 @@ fun getFaceCaptureConfig(input: FaceCaptureConfiguration) = mapOf(
     "torchButtonEnabled" to input.isTorchButtonEnabled,
     "vibrateOnSteps" to input.isVibrateOnSteps,
     "detectOcclusion" to input.isDetectOcclusion,
+    "showFaceAnimation" to input.isShowFaceAnimation,
     "cameraPositionAndroid" to input.cameraId,
     "screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
     "timeout" to input.timeout,

android/src/main/java/com/reactlibrary/JSONConstructor.kt

@@ -312,7 +312,7 @@ fun faceCaptureImageFromJSON(input: JSONObject?) = input?.let {
     Image(
         it.getInt("imageType").toImageType(),
         it.getStringOrNull("tag"),
-        it.getString("image").toBitmap(),
+        it.getString("image").toBitmap()!!,
     )
 }
 
@@ -376,7 +376,7 @@ fun generateLivenessNotification(it: LivenessNotification) = mapOf(
 
 fun matchFacesImageFromJSON(input: JSONObject?) = input?.let {
     val result = MatchFacesImage(
-        it.getString("image").toBitmap(),
+        it.getString("image").toBitmap()!!,
         it.getInt("imageType").toImageType(),
         it.optBoolean("detectAll", false)
     )
@@ -635,7 +635,7 @@ fun generateDetectFacesConfig(input: DetectFacesConfiguration?) = input?.let {
 fun detectFacesRequestFromJSON(input: JSONObject) = input.let {
     val image = it.getString("image").toBitmap()!!
     it.getStringOrNull("scenario")?.let { scenario ->
-        DetectFacesRequest::class.constructor(Bitmap::class, String::class).instantiate(image, scenario)
+        DetectFacesRequest::class.java.getDeclaredConstructor(Bitmap::class.java, String::class.java).instantiate(image, scenario)
     } ?: DetectFacesRequest(
         image,
         detectFacesConfigFromJSON(it.getJSONObjectOrNull("configuration")),
@@ -674,7 +674,7 @@ fun detectFacesAttributeResultFromJSON(it: JSONObject) = DetectFacesAttributeRes
 )
 
 fun generateDetectFacesAttributeResult(it: DetectFacesAttributeResult) = mapOf(
-    "attribute" to it.attribute.value,
+    "attribute" to it.attribute?.value,
     "value" to it.value,
     "confidence" to it.confidence,
     "range" to generateImageQualityRange(it.range)

android/src/main/java/com/reactlibrary/RNFaceApiModule.kt

@@ -15,12 +15,13 @@ import com.regula.facesdk.callback.DetectFacesCompletion
 import com.regula.facesdk.callback.FaceCaptureCallback
 import com.regula.facesdk.callback.FaceCaptureNotificationCallback
 import com.regula.facesdk.callback.FaceInitializationCompletion
-import com.regula.facesdk.callback.ICameraSwitchCallback
 import com.regula.facesdk.callback.LivenessCallback
 import com.regula.facesdk.callback.LivenessNotificationCallback
 import com.regula.facesdk.callback.MatchFaceCallback
-import com.regula.facesdk.callback.NotificationCallback
 import com.regula.facesdk.callback.PersonDBCallback
+import com.regula.facesdk.configuration.InitializationBleDeviceConfiguration
+import com.regula.facesdk.enums.InitErrorCode
+import com.regula.facesdk.exception.InitException
 import com.regula.facesdk.listener.NetworkInterceptorListener
 import com.regula.facesdk.model.LivenessNotification
 import com.regula.facesdk.model.results.matchfaces.MatchFacesSimilarityThresholdSplit
@@ -149,9 +150,16 @@ fun setCustomization(config: JSONObject) = setCustomization(Instance().customiza
 
 fun isInitialized(callback: Callback) = callback(Instance().isInitialized)
 
-fun initialize(callback: Callback, config: JSONObject?) = config?.let {
-    Instance().initialize(context, initConfigFromJSON(it), initCompletion(callback))
-} ?: Instance().initialize(context, initCompletion(callback))
+@SuppressLint("MissingPermission")
+fun initialize(callback: Callback, config: JSONObject?) =
+    if (config == null)
+        Instance().initialize(context, initCompletion(callback))
+    else if (config.getBooleanOrNull("useBleDevice") != true)
+        Instance().initialize(context, initConfigFromJSON(config), initCompletion(callback))
+    else
+        getBleWrapper()?.let {
+            Instance().initialize(context, InitializationBleDeviceConfiguration(it), initCompletion(callback))
+        } ?: callback(generateInitCompletion(false, InitException(InitErrorCode.LICENSE_IS_NULL)))
 
 fun deinitialize() = Instance().deinitialize()
 
@@ -187,11 +195,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)
 )
@@ -203,55 +213,58 @@ fun splitComparedFaces(callback: Callback, faces: JSONArray, similarity: Double)
 }
 
 fun detectFaces(callback: Callback, request: JSONObject) = Instance().detectFaces(
+    context,
     detectFacesRequestFromJSON(request),
     detectFacesCompletion(callback)
 )
 
+val db get() = Instance().personDatabase(context)!!
+
 fun createPerson(
     callback: Callback,
     name: String,
     groupIds: JSONArray?,
     metadata: JSONObject?
-) = Instance().personDatabase().createPerson(
+) = db.createPerson(
     name,
     metadata,
     groupIds.toArray(),
     databaseItemCompletion(callback, ::generatePerson)
 )
 
 fun updatePerson(callback: Callback, personJson: JSONObject) =
-    Instance().personDatabase().getPerson(idFromJSON(personJson), object : PersonDBCallback<Person?> {
-        override fun onSuccess(person: Person?) = Instance().personDatabase().updatePerson(
+    db.getPerson(idFromJSON(personJson), object : PersonDBCallback<Person?> {
+        override fun onSuccess(person: Person?) = db.updatePerson(
             updatePersonFromJSON(person!!, personJson),
             databaseItemCompletion(callback, null)
         )
 
         override fun onFailure(error: String) = callback(generatePersonDBResponse(null, error))
     })
 
-fun deletePerson(callback: Callback, personId: String) = Instance().personDatabase().deletePerson(
+fun deletePerson(callback: Callback, personId: String) = db.deletePerson(
     personId,
     databaseItemCompletion(callback, null)
 )
 
-fun getPerson(callback: Callback, personId: String) = Instance().personDatabase().getPerson(
+fun getPerson(callback: Callback, personId: String) = db.getPerson(
     personId,
     databaseItemCompletion(callback, ::generatePerson)
 )
 
-fun addPersonImage(callback: Callback, personId: String, image: JSONObject) = Instance().personDatabase().addPersonImage(
+fun addPersonImage(callback: Callback, personId: String, image: JSONObject) = db.addPersonImage(
     personId,
     imageUploadFromJSON(image),
     databaseItemCompletion(callback, ::generatePersonImage)
 )
 
-fun deletePersonImage(callback: Callback, personId: String, imageId: String) = Instance().personDatabase().deletePersonImage(
+fun deletePersonImage(callback: Callback, personId: String, imageId: String) = db.deletePersonImage(
     personId,
     imageId,
     databaseItemCompletion(callback, null)
 )
 
-fun getPersonImage(callback: Callback, personId: String, imageId: String) = Instance().personDatabase().getPersonImageById(
+fun getPersonImage(callback: Callback, personId: String, imageId: String) = db.getPersonImageById(
     personId,
     imageId,
     object : PersonDBCallback<ByteArray> {
@@ -260,7 +273,7 @@ fun getPersonImage(callback: Callback, personId: String, imageId: String) = Inst
     }
 )
 
-fun getPersonImages(callback: Callback, personId: String) = Instance().personDatabase().getPersonImages(
+fun getPersonImages(callback: Callback, personId: String) = db.getPersonImages(
     personId,
     databasePageCompletion(callback, ::generatePersonImage)
 )
@@ -270,22 +283,22 @@ fun getPersonImagesForPage(
     personId: String,
     page: Int,
     size: Int
-) = Instance().personDatabase().getPersonImagesForPage(
+) = db.getPersonImagesForPage(
     personId,
     page,
     size,
     databasePageCompletion(callback, ::generatePersonImage)
 )
 
-fun createGroup(callback: Callback, name: String, metadata: JSONObject?) = Instance().personDatabase().createGroup(
+fun createGroup(callback: Callback, name: String, metadata: JSONObject?) = db.createGroup(
     name,
     metadata,
     databaseItemCompletion(callback, ::generatePersonGroup)
 )
 
 fun updateGroup(callback: Callback, groupJson: JSONObject) =
-    Instance().personDatabase().getGroup(idFromJSON(groupJson), object : PersonDBCallback<PersonGroup?> {
-        override fun onSuccess(group: PersonGroup?) = Instance().personDatabase().updateGroup(
+    db.getGroup(idFromJSON(groupJson), object : PersonDBCallback<PersonGroup?> {
+        override fun onSuccess(group: PersonGroup?) = db.updateGroup(
             updatePersonGroupFromJSON(group!!, groupJson),
             databaseItemCompletion(callback, null)
         )
@@ -294,32 +307,31 @@ fun updateGroup(callback: Callback, groupJson: JSONObject) =
     })
 
 fun editPersonsInGroup(callback: Callback, groupId: String, editGroupPersonsRequest: JSONObject) =
-    Instance().personDatabase().editPersonsInGroup(
+    db.editPersonsInGroup(
         groupId,
         editGroupPersonsRequestFromJSON(editGroupPersonsRequest),
         databaseItemCompletion(callback, null)
     )
 
-fun deleteGroup(callback: Callback, groupId: String) = Instance().personDatabase().deleteGroup(
+fun deleteGroup(callback: Callback, groupId: String) = db.deleteGroup(
     groupId,
     databaseItemCompletion(callback, null)
 )
 
-fun getGroup(callback: Callback, groupId: String) = Instance().personDatabase().getGroup(
+fun getGroup(callback: Callback, groupId: String) = db.getGroup(
     groupId,
     databaseItemCompletion(callback, ::generatePersonGroup)
 )
 
-fun getGroups(callback: Callback) =
-    Instance().personDatabase().getGroups(databasePageCompletion(callback, ::generatePersonGroup))
+fun getGroups(callback: Callback) = db.getGroups(databasePageCompletion(callback, ::generatePersonGroup))
 
-fun getGroupsForPage(callback: Callback, page: Int, size: Int) = Instance().personDatabase().getGroupsForPage(
+fun getGroupsForPage(callback: Callback, page: Int, size: Int) = db.getGroupsForPage(
     page,
     size,
     databasePageCompletion(callback, ::generatePersonGroup)
 )
 
-fun getPersonGroups(callback: Callback, personId: String) = Instance().personDatabase().getPersonGroups(
+fun getPersonGroups(callback: Callback, personId: String) = db.getPersonGroups(
     personId,
     databasePageCompletion(callback, ::generatePersonGroup)
 )
@@ -329,14 +341,14 @@ fun getPersonGroupsForPage(
     personId: String,
     page: Int,
     size: Int
-) = Instance().personDatabase().getPersonGroupsForPage(
+) = db.getPersonGroupsForPage(
     personId,
     page,
     size,
     databasePageCompletion(callback, ::generatePersonGroup)
 )
 
-fun getPersonsInGroup(callback: Callback, groupId: String) = Instance().personDatabase().getPersonsInGroup(
+fun getPersonsInGroup(callback: Callback, groupId: String) = db.getPersonsInGroup(
     groupId,
     databasePageCompletion(callback, ::generatePerson)
 )
@@ -346,14 +358,14 @@ fun getPersonsInGroupForPage(
     groupId: String,
     page: Int,
     size: Int
-) = Instance().personDatabase().getPersonsInGroupForPage(
+) = db.getPersonsInGroupForPage(
     groupId,
     page,
     size,
     databasePageCompletion(callback, ::generatePerson)
 )
 
-fun searchPerson(callback: Callback, searchPersonRequest: JSONObject) = Instance().personDatabase().searchPerson(
+fun searchPerson(callback: Callback, searchPersonRequest: JSONObject) = db.searchPerson(
     searchPersonRequestFromJSON(searchPersonRequest),
     object : PersonDBCallback<List<SearchPerson>> {
         override fun onSuccess(data: List<SearchPerson>?) = callback(generatePersonDBResponse(data.toJsonNullable(::generateSearchPerson)!!, null))
@@ -418,4 +430,4 @@ fun <T : DbBaseItem?> databasePageCompletion(callback: Callback, toJson: (T?) ->
 
 // Weak references
 var localizationCallbacks: LocalizationCallbacks? = null
-var networkInterceptorListener: NetworkInterceptorListener? = null
+var networkInterceptorListener: NetworkInterceptorListener? = null

android/src/main/java/com/reactlibrary/Utils.kt

@@ -1,4 +1,4 @@
-@file:Suppress("UNCHECKED_CAST")
+@file:Suppress("UNCHECKED_CAST", "EnumValuesSoftDeprecate", "UseKtx")
 
 package com.reactlibrary
 
@@ -10,6 +10,8 @@ import android.graphics.Typeface
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.util.Base64
+import android.util.Log
+import com.regula.common.ble.BLEWrapper
 import com.regula.facesdk.configuration.Customization
 import com.regula.facesdk.enums.CustomizationColor
 import com.regula.facesdk.enums.CustomizationFont
@@ -248,7 +250,12 @@ fun <T : Any> T.setPrivateProperty(clazz: Class<T>, varName: String, data: Any?)
 //}
 
 internal object Convert {
-    fun String?.toByteArray() = this?.let { Base64.decode(it, Base64.NO_WRAP) }
+    fun String?.toByteArray(): ByteArray? {
+        var str = this ?: return null
+        if (str.startsWith("data")) str = str.substring(str.indexOf(",") + 1)
+        return Base64.decode(str, Base64.NO_WRAP)
+    }
+
     fun ByteArray?.toBase64() = this?.let { Base64.encodeToString(it, Base64.NO_WRAP) }
 
     fun String?.toBitmap() = this?.let {
@@ -279,4 +286,32 @@ internal object Convert {
         val height = (bitmap.height * density).toInt()
         BitmapDrawable(context.resources, Bitmap.createScaledBitmap(bitmap, width, height, false))
     }
-}
+}
+
+fun getBleWrapper(): BLEWrapper? {
+    listOf(
+        "io.flutter.plugins.regula.documentreader.flutter_document_reader_api",
+        "cordova.plugin.documentreader",
+        "com.regula.documentreader"
+    ).forEach { packageName ->
+        getVarFromClass<BLEWrapper>(
+            packageName,
+            "BluetoothUtilKt",
+            "bluetooth"
+        )?.let { return it }
+    }
+    Log.e("REGULA", "Failed to get BLEWrapper from DocumentReader plugin")
+    return null
+}
+
+fun <T> getVarFromClass(packageName: String, className: String, varName: String): T? {
+    try {
+        val targetClass = Class.forName("$packageName.$className")
+        val field = targetClass.getDeclaredField(varName)
+        field.isAccessible = true
+        val result = field.get(null) as BLEWrapper?
+        return result as T?
+    } catch (_: Exception) {
+        return null
+    }
+}