@regulaforensics/cordova-plugin-document-reader-api 8.3.243-nightly → 8.3.263-rc

package/example/package.json

@@ -13,8 +13,8 @@
   "author": "Regula Forensics Inc.",
   "license": "commercial",
   "dependencies": {
-    "@regulaforensics/cordova-plugin-document-reader-api": "8.3.243-nightly",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "8.3.815-nightly",
+    "@regulaforensics/cordova-plugin-document-reader-api": "8.3.263-rc",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "8.4.942-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.3.243-nightly",
+  "version": "8.3.263-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.3.243-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/cordova-plugin-document-reader-api" version="8.3.263-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git"/>
       </config>
       <pods>
-        <pod name="DocumentReaderNightly" spec="8.3.5097" />
+        <pod name="DocumentReaderStage" spec="8.4.5263" />
       </pods>
     </podspec>
   </platform>

package/src/android/BluetoothUtil.kt

@@ -7,6 +7,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter
 import android.content.ComponentName
+import android.content.Context.BIND_AUTO_CREATE
 import android.content.Intent
 import android.content.ServiceConnection
 import android.content.pm.PackageManager.PERMISSION_GRANTED
@@ -31,9 +32,10 @@ const val INTENT_REQUEST_ENABLE_BLUETOOTH = 197
 
 @SuppressLint("StaticFieldLeak")
 var bluetooth: BLEWrapper? = null
+lateinit var savedDeviceNameForPermissionResult: String
 lateinit var savedCallbackForPermissionResult: Callback
 
-fun connectBluetoothDevice(callback: Callback) {
+fun connectBluetoothDevice(deviceName: String, callback: Callback) {
     if (bluetooth?.isConnected == true) {
         Log.e("REGULA", "Bluetooth device already connected, returning false")
         callback(false)
@@ -41,6 +43,7 @@ fun connectBluetoothDevice(callback: Callback) {
     }
 
     if (!isBluetoothSettingsReady(activity)) {
+        savedDeviceNameForPermissionResult = deviceName
         savedCallbackForPermissionResult = callback
         return
     }
@@ -55,6 +58,7 @@ fun connectBluetoothDevice(callback: Callback) {
     Timer().schedule(timeout, SEARCHING_TIMEOUT)
 
     val bleIntent = Intent(context, RegulaBleService::class.java)
+    bleIntent.putExtra(RegulaBleService.DEVICE_NAME, deviceName)
     context.startService(bleIntent)
     context.bindService(bleIntent, object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, service: IBinder) {
@@ -70,7 +74,7 @@ fun connectBluetoothDevice(callback: Callback) {
         }
 
         override fun onServiceDisconnected(name: ComponentName) {}
-    }, 0)
+    }, BIND_AUTO_CREATE)
 }
 
 fun onRequestPermissionsResult(
@@ -83,7 +87,7 @@ fun onRequestPermissionsResult(
         savedCallbackForPermissionResult(false)
         return true
     }
-    connectBluetoothDevice(savedCallbackForPermissionResult)
+    connectBluetoothDevice(savedDeviceNameForPermissionResult, savedCallbackForPermissionResult)
     return true
 }
 
@@ -95,7 +99,7 @@ fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") da
 
     if (requestCode == INTENT_REQUEST_ENABLE_BLUETOOTH || requestCode == INTENT_REQUEST_ENABLE_LOCATION) {
         if (resultCode == Activity.RESULT_OK)
-            connectBluetoothDevice(savedCallbackForPermissionResult)
+            connectBluetoothDevice(savedDeviceNameForPermissionResult, savedCallbackForPermissionResult)
         else
             savedCallbackForPermissionResult(false)
         return true
@@ -126,7 +130,7 @@ fun deniedBluetoothPermissions(): Array<String>? {
         result.addAll(deniedBluetoothPermission(BLUETOOTH_CONNECT))
     } else
         result.addAll(deniedBluetoothPermission(ACCESS_FINE_LOCATION))
-    return result.let { if (it.size > 0) it.toTypedArray() else null }
+    return result.let { if (it.isNotEmpty()) it.toTypedArray() else null }
 }
 
 fun deniedBluetoothPermission(permission: String): Array<String> {

package/src/android/Main.kt

@@ -48,7 +48,7 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "getDocumentReaderIsReady" -> getDocumentReaderIsReady(callback)
     "getDocumentReaderStatus" -> getDocumentReaderStatus(callback)
     "getRfidSessionStatus" -> getRfidSessionStatus(callback)
-    "setRfidSessionStatus" -> setRfidSessionStatus(argsNullable(0))
+    "setRfidSessionStatus" -> setRfidSessionStatus()
     "getTag" -> getTag(callback)
     "setTag" -> setTag(argsNullable(0))
     "getTenant" -> getTenant(callback)
@@ -90,7 +90,7 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "addPKDCertificates" -> addPKDCertificates(args(0))
     "clearPKDCertificates" -> clearPKDCertificates()
     "startNewSession" -> startNewSession()
-    "connectBluetoothDevice" -> connectBluetoothDevice(callback)
+    "connectBluetoothDevice" -> connectBluetoothDevice(args(0), callback)
     "btDeviceRequestFlashing" -> btDeviceRequestFlashing()
     "btDeviceRequestFlashingFullIR" -> btDeviceRequestFlashingFullIR()
     "btDeviceRequestTurnOffAll" -> btDeviceRequestTurnOffAll()
@@ -148,7 +148,7 @@ fun getDocumentReaderStatus(callback: Callback) = callback(Instance().status)
 
 fun getRfidSessionStatus(iosOnly: Callback) = iosOnly(null)
 
-fun setRfidSessionStatus(iosOnly: String?) = Unit
+fun setRfidSessionStatus() = Unit
 
 fun getTag(callback: Callback) = callback(Instance().tag)
 

package/src/android/build.gradle

@@ -1,12 +1,12 @@
 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.3.11885'){
+	implementation ('com.regula.documentreader:api:8.3.11952'){
         transitive = true
     }
 }