@regulaforensics/face-sdk 6.4.310-rc → 6.4.315-nightly

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '6.4.310-rc'
+  s.version      = '6.4.315-nightly'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDFaceSDK.h', 'ios/CVDFaceSDK.m' ]
-  s.dependency 'FaceSDKStage', '7.1.2706'
+  s.dependency 'FaceSDKNightly', '6.4.2729'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -32,7 +32,7 @@ android {
 rootProject.allprojects {
     repositories {
         maven {
-            url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
+            url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
         }
     }
 }
@@ -41,7 +41,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.face:api:6.4.3778'){
+    implementation('com.regula.face:api:6.4.3781'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -6,13 +6,13 @@ android {
 
 repositories {
     maven {
-        url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
+        url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
     }
 }
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.face:api:6.4.3778'){
+    implementation('com.regula.face:api:6.4.3781'){
         transitive = true
     }
 }

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

@@ -314,7 +314,7 @@ fun faceCaptureImageFromJSON(input: JSONObject?) = input?.let {
     Image(
         it.getInt("imageType").toImageType(),
         it.getStringOrNull("tag"),
-        it.getString("image").toBitmap(),
+        it.getString("image").toBitmap()!!,
     )
 }
 
@@ -378,7 +378,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)
     )
@@ -676,7 +676,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)

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

@@ -3,7 +3,6 @@ package com.regula.plugin.facesdk
 import android.annotation.SuppressLint
 import com.regula.plugin.facesdk.Convert.toBase64
 import com.regula.common.LocalizationCallbacks
-import com.regula.common.ble.BLEWrapper
 import com.regula.facesdk.FaceSDK.Instance
 import com.regula.facesdk.callback.DetectFacesCompletion
 import com.regula.facesdk.callback.FaceCaptureCallback
@@ -14,6 +13,8 @@ import com.regula.facesdk.callback.LivenessNotificationCallback
 import com.regula.facesdk.callback.MatchFaceCallback
 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
@@ -103,8 +104,7 @@ fun initialize(callback: Callback, config: JSONObject?) =
     else
         getBleWrapper()?.let {
             Instance().initialize(context, InitializationBleDeviceConfiguration(it), initCompletion(callback))
-        } ?: callback(false)
-// TODO return an exception telling that btDevice is not connected
+        } ?: callback(generateInitCompletion(false, InitException(InitErrorCode.LICENSE_IS_NULL)))
 
 fun deinitialize() = Instance().deinitialize()
 
@@ -158,16 +158,19 @@ 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(),
@@ -175,8 +178,8 @@ fun createPerson(
 )
 
 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)
         )
@@ -184,29 +187,29 @@ fun updatePerson(callback: Callback, personJson: JSONObject) =
         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> {
@@ -215,7 +218,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)
 )
@@ -225,22 +228,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)
         )
@@ -249,32 +252,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)
 )
@@ -284,14 +286,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)
 )
@@ -301,14 +303,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))

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

@@ -37,8 +37,8 @@ fun <T> argsNullable(index: Int): T? {
 
 @Suppress("unused")
 class RNFaceSDKPackage : ReactPackage {
-    override fun createNativeModules(rc: ReactApplicationContext) = listOf(RNFaceSDKModule(rc))
-    override fun createViewManagers(rc: ReactApplicationContext) = emptyList<ViewManager<*, *>>()
+    override fun createNativeModules(reactContext: ReactApplicationContext) = listOf(RNFaceSDKModule(reactContext))
+    override fun createViewManagers(reactContext: ReactApplicationContext) = emptyList<ViewManager<*, *>>()
 }
 
 @Suppress("unused", "UNUSED_PARAMETER")

package/examples/capacitor/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
@@ -6,16 +5,15 @@
         android:icon="@drawable/ic_launcher"
         android:label="FaceSDK"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
         <activity
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
             android:name=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
+            android:exported="true"
             android:launchMode="singleTask"
-            android:exported="true">
-
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -23,8 +21,5 @@
 
         </activity>
     </application>
-
-    <!-- Permissions -->
-
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

package/examples/capacitor/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.4.310-rc",
-    "@regulaforensics/face-core-basic": "7.1.163-rc",
+    "@regulaforensics/face-sdk": "6.4.315-nightly",
+    "@regulaforensics/face-core-basic": "6.4.171-nightly",
     "@awesome-cordova-plugins/file": "6.6.0",
     "@awesome-cordova-plugins/camera": "6.6.0",
     "cordova-plugin-file": "8.1.3",

package/examples/cordova/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.4.310-rc",
-    "@regulaforensics/face-core-basic": "7.1.163-rc",
+    "@regulaforensics/face-sdk": "6.4.315-nightly",
+    "@regulaforensics/face-core-basic": "6.4.171-nightly",
     "cordova-ios": "7.1.1",
     "cordova-android": "13.0.0",
     "cordova-plugin-file": "8.1.3",

package/examples/ionic/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.4.310-rc",
-    "@regulaforensics/face-core-basic": "7.1.163-rc",
+    "@regulaforensics/face-sdk": "6.4.315-nightly",
+    "@regulaforensics/face-core-basic": "6.4.171-nightly",
     "@awesome-cordova-plugins/file": "6.16.0",
     "@awesome-cordova-plugins/camera": "6.16.0",
     "@awesome-cordova-plugins/dialogs": "6.16.0",

package/examples/react_native/app.config.ts

@@ -32,7 +32,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
           { url: 'https://maven.regulaforensics.com/RegulaDocumentReader/Nightly' },
           { url: 'https://maven.regulaforensics.com/RegulaDocumentReader/Stage' }
         ]
-      }
+      },
+       // This fixes a bug in expo v53. https://github.com/expo/expo/issues/36908
+      ios: { networkInspector: false }
     }]
   ]
 })

package/examples/react_native/package.json

@@ -8,8 +8,8 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.4.310-rc",
-    "@regulaforensics/face-core-basic": "7.1.163-rc",
+    "@regulaforensics/face-sdk": "6.4.315-nightly",
+    "@regulaforensics/face-core-basic": "6.4.171-nightly",
     "react-native": "0.79.2",
     "react-native-fs": "2.20.0",
     "react-native-image-picker": "8.2.1",

package/ios/CVDFaceSDK.m

@@ -8,6 +8,13 @@ static NSMutableDictionary<NSString*, NSString*>* _eventCallbackIds = nil;
     return _eventCallbackIds;
 }
 
+UIViewController*(^rootViewController)(void) = ^UIViewController*(){
+    for (UIWindow *window in UIApplication.sharedApplication.windows)
+        if (window.isKeyWindow)
+            return window.rootViewController;
+    return nil;
+};
+
 - (void) exec:(CDVInvokedUrlCommand*)command {
     NSString* method = command.arguments[0];
     NSMutableArray* args = [NSMutableArray new];

package/ios/RFSWMain.h

@@ -3,6 +3,7 @@
 
 typedef void (^RFSWCallback)(id _Nullable response);
 typedef void (^RFSWEventSender)(NSString* _Nonnull event, id _Nullable data);
+extern UIViewController*_Nonnull(^ _Nonnull rootViewController)(void);
 
 @interface RFSWMain: NSObject<RFSURLRequestInterceptingDelegate,
                               RFSVideoUploadingDelegate,

package/ios/RFSWMain.m

@@ -49,16 +49,8 @@
 
 static RFSWMain* this;
 static RFSWEventSender sendEvent;
-
 static NSDictionary* headers;
 
-static UIViewController*(^rootViewController)(void) = ^UIViewController*(){
-    for (UIWindow *window in UIApplication.sharedApplication.windows)
-        if (window.isKeyWindow)
-            return window.rootViewController;
-    return nil;
-};
-
 +(void)getVersion:(RFSWCallback)callback {
     callback([RFSWJSONConstructor generateFaceSDKVersion:RFSFaceSDK.service.version]);
 }

package/ios/RNFaceSDK.h

@@ -1,5 +1,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
+#import <React/RCTUtils.h>
 #import "RFSWMain.h"
 @import UIKit;
 

package/ios/RNFaceSDK.m

@@ -20,6 +20,10 @@ static bool hasListeners;
 - (void)startObserving { hasListeners = YES; }
 - (void)stopObserving { hasListeners = NO; }
 
+UIViewController*(^rootViewController)(void) = ^UIViewController*(){
+    return RCTPresentedViewController();
+};
+
 RCT_EXPORT_METHOD(exec:(NSString*)method:(NSArray*)args:(RCTPromiseResolveBlock)resolve:(RCTPromiseRejectBlock)reject) {
     RFSWCallback callback = ^(id _Nullable data) {
         if ([self.firedCallbacks containsObject:resolve]) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "6.4.310-rc",
+  "version": "6.4.315-nightly",
   "description": "This is an npm module for Regula Face SDK. It allows you to easily compaire faces using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/face-sdk" version="6.4.310-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="6.4.315-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git" />
       </config>
       <pods>
-        <pod name="FaceSDKStage" spec="7.1.2706" />
+        <pod name="FaceSDKNightly" spec="6.4.2729" />
       </pods>
     </podspec>
   </platform>