@regulaforensics/cordova-plugin-document-reader-api 8.1.120-nightly → 8.1.121-rc

package/example/package.json

@@ -13,8 +13,8 @@
   "author": "Regula Forensics Inc.",
   "license": "commercial",
   "dependencies": {
-    "@regulaforensics/cordova-plugin-document-reader-api": "8.1.120-nightly",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "8.1.307-nightly",
+    "@regulaforensics/cordova-plugin-document-reader-api": "8.1.121-rc",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "8.1.308-rc",
     "cordova-android": "13.0.0",
     "cordova-ios": "7.1.1",
     "cordova-plugin-add-swift-support": "2.0.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "8.1.120-nightly",
+  "version": "8.1.121-rc",
   "description": "Cordova plugin for reading and validation of identification documents (API framework)",
   "cordova": {
     "id": "@regulaforensics/cordova-plugin-document-reader-api",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/cordova-plugin-document-reader-api" version="8.1.120-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/cordova-plugin-document-reader-api" version="8.1.121-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
   <license>commercial</license>
@@ -27,7 +27,7 @@
         <source url="https://github.com/CocoaPods/Specs.git"/>
       </config>
       <pods>
-        <pod name="DocumentReaderNightly" spec="8.1.4609" />
+        <pod name="DocumentReaderStage" spec="8.1.4610" />
       </pods>
     </podspec>
   </platform>

package/src/android/BluetoothUtil.kt

@@ -22,7 +22,6 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
-import android.util.Log
 import androidx.core.content.ContextCompat.checkSelfPermission
 import com.regula.common.ble.BLEWrapper
 import com.regula.common.ble.BleWrapperCallback
@@ -39,40 +38,44 @@ const val INTENT_REQUEST_ENABLE_LOCATION = 196
 const val INTENT_REQUEST_ENABLE_BLUETOOTH = 197
 
 @SuppressLint("StaticFieldLeak")
-var bluetooth: BLEWrapper? = null
+lateinit var bluetooth: BLEWrapper
 lateinit var savedCallbackForPermissionResult: Callback
+var deviceConnected = false
 
 fun connectBluetoothDevice(callback: Callback) {
-    if (bluetooth?.isConnected == true) {
-        Log.e("REGULA", "Bluetooth device already connected, returning false")
-        callback.success(false)
-        return
-    }
+    // return if already connected
+    if (deviceConnected) return
 
+    // If some of the bluetooth permissions/settings don't match the requirements,
+    // save callback for later and request the permissions/settings.
+    // Callback will then be used in onRequestPermissionsResult for permission requests
+    // and in onActivityResult for settings change requests.
     if (!isBluetoothSettingsReady(activity)) {
         savedCallbackForPermissionResult = callback
         return
     }
 
-    val timeout = object : TimerTask() {
+    // set searching timeout
+    val timer = object : TimerTask() {
         override fun run() {
             callback.success(false)
-            bluetooth?.stopDeviceScan()
-            bluetooth?.disconnect()
+            bluetooth.stopDeviceScan()
+            bluetooth.disconnect()
         }
     }
-    Timer().schedule(timeout, SEARCHING_TIMEOUT)
+    Timer().schedule(timer, SEARCHING_TIMEOUT)
 
+    // start searching devices
     val bleIntent = Intent(context, RegulaBleService::class.java)
     context.startService(bleIntent)
     context.bindService(bleIntent, object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, service: IBinder) {
             bluetooth = (service as RegulaBleService.LocalBinder).service.bleManager
-            if (bluetooth!!.isConnected) callback.success(true)
-            else bluetooth!!.addCallback(object : BleWrapperCallback() {
+            bluetooth.addCallback(object : BleWrapperCallback() {
                 override fun onDeviceReady() {
-                    timeout.cancel()
-                    bluetooth!!.removeCallback(this)
+                    timer.cancel()
+                    bluetooth.removeCallback(this)
+                    deviceConnected = true
                     callback.success(true)
                 }
             })

package/src/android/JSONConstructor.kt

@@ -250,9 +250,9 @@ fun generateDocReaderConfig(temp: DocReaderConfig?): JSONObject? {
 }
 
 fun bleDeviceConfigFromJSON(input: JSONObject): BleDeviceConfig {
-    var result = BleDeviceConfig(bluetooth!!)
+    var result = BleDeviceConfig(bluetooth)
 
-    if (input.has("customDb")) result = BleDeviceConfig(bluetooth!!, byteArrayFromBase64(input.getString("customDb")))
+    if (input.has("customDb")) result = BleDeviceConfig(bluetooth, byteArrayFromBase64(input.getString("customDb")))
     if (input.has("licenseUpdate")) result.setLicenseUpdate(input.getBoolean("licenseUpdate"))
     if (input.has("delayedNNLoad")) result.isDelayedNNLoad = input.getBoolean("delayedNNLoad")
     if (input.has("blackList")) result.blackList = input.getJSONObject("blackList")

package/src/android/build.gradle

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

package/src/ios/RGLWJSONConstructor.m

@@ -928,19 +928,17 @@ static NSMutableArray* weakReferencesHolder;
 +(NSDictionary*)generateImageQuality:(RGLImageQuality*)input {
     if(input == nil) return nil;
     NSMutableDictionary* result = [NSMutableDictionary new];
-
+    
     result[@"type"] = [RGLWConfig generateImageQualityCheckType:input.type];
     result[@"result"] = @(input.result);
     result[@"featureType"] = @(input.featureType);
     if(input.boundRects != nil){
         NSMutableArray *array = [NSMutableArray new];
-        for(NSValue* item in input.boundRects) {
-            id rect = [self generateRect:[item CGRectValue]];
-            if(rect) [array addObject:rect];
-        }
+        for(NSValue* item in input.boundRects)
+            [array addObject:[self generateRect:[item CGRectValue]]];
         result[@"boundRects"] = array;
     }
-
+    
     return result;
 }
 
@@ -1909,7 +1907,7 @@ static NSMutableArray* weakReferencesHolder;
 +(RGLTAChallenge*)taChallengeFromJson:(NSDictionary*)input {
     NSMutableDictionary* json = input.mutableCopy;
     
-    json[@"#text"] = [input valueForKey:@"data"];
+    json[@"#text"] = [self base64Decode:[input valueForKey:@"data"]];
     json[@"@auxPCD"] = [input valueForKey:@"auxPCD"];
     json[@"@challengePICC"] = [input valueForKey: @"challengePICC"];
     json[@"@hashPK"] = [input valueForKey:@"hashPK"];