@regulaforensics/cordova-plugin-document-reader-api 7.4.620 → 7.5.19-rc

package/README.md

@@ -8,7 +8,7 @@ This repository contains the source code of the Document Reader API, and the sam
 
 ## Documentation
 
-You can find documentation [here](https://docs.regulaforensics.com/develop/doc-reader-sdk/mobile/cordova).
+You can find documentation [here](https://docs.regulaforensics.com/develop/doc-reader-sdk/mobile).
 
 ## License
 

package/example/config.xml

@@ -16,7 +16,7 @@
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
     <platform name="android">
-        <resource-file src="www/db.dat" target="app/src/main/assets/Regula/db.dat"/>
+        <resource-file src="www/db.dat" target="app/src/main/assets/Regula/db.dat" />
         <preference name="android-minSdkVersion" value="23" />
         <preference name="android-targetSdkVersion" value="34" />
         <allow-intent href="market:*" />
@@ -26,11 +26,13 @@
             <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
             <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
         </config-file>
+        <preference name="orientation" value="portrait" />
     </platform>
     <platform name="ios">
         <resource-file src="www/db.dat" />
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
+        <preference name="orientation" value="portrait" />
         <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
             <string>To use camera</string>
         </config-file>
@@ -42,26 +44,26 @@
         </config-file>
         <config-file target="*-Info.plist" parent="com.apple.developer.nfc.readersession.iso7816.select-identifiers">
             <array>
-		        <string>A0000002471001</string>
-		        <string>E80704007F00070302</string>
-		        <string>A000000167455349474E</string>
-		        <string>A0000002480100</string>
-		        <string>A0000002480200</string>
-		        <string>A0000002480300</string>
-		        <string>A00000045645444C2D3031</string>
-	        </array>
+                <string>A0000002471001</string>
+                <string>E80704007F00070302</string>
+                <string>A000000167455349474E</string>
+                <string>A0000002480100</string>
+                <string>A0000002480200</string>
+                <string>A0000002480300</string>
+                <string>A00000045645444C2D3031</string>
+            </array>
         </config-file>
         <config-file target="*-Debug.plist" parent="com.apple.developer.nfc.readersession.formats">
             <array>
                 <string>NDEF</string>
-		        <string>TAG</string>
+                <string>TAG</string>
             </array>
         </config-file>
         <config-file target="*-Release.plist" parent="com.apple.developer.nfc.readersession.formats">
             <array>
                 <string>NDEF</string>
-		        <string>TAG</string>
+                <string>TAG</string>
             </array>
         </config-file>
     </platform>
-</widget>
+</widget>

package/example/package.json

@@ -13,10 +13,10 @@
   "author": "Regula Forensics Inc.",
   "license": "commercial",
   "dependencies": {
-    "@regulaforensics/cordova-plugin-document-reader-api": "7.4.620",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "7.4.623",
-    "cordova-android": "12.0.1",
-    "cordova-ios": "7.0.1",
+    "@regulaforensics/cordova-plugin-document-reader-api": "7.5.19-rc",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "7.5.15-beta",
+    "cordova-android": "13.0.0",
+    "cordova-ios": "7.1.1",
     "cordova-plugin-add-swift-support": "2.0.2",
     "cordova-plugin-advanced-http": "3.3.1",
     "cordova-plugin-camera": "7.0.0",

package/example/www/js/index.js

@@ -238,6 +238,11 @@ var app = {
                 if (value != null)
                     document.getElementById("portraitImage").src = "data:image/png;base64," + value
             }, function (error) { console.log(error) })
+
+            DocumentReader.graphicFieldImageByTypeSource(results, Enum.eGraphicFieldType.GF_PORTRAIT, Enum.eRPRM_ResultType.RFID_RESULT_TYPE_RFID_IMAGE_DATA, function (value) {
+                if (value != null)
+                    document.getElementById("portraitImage").src = "data:image/png;base64," + value
+            }, function (error) { console.log(error) })
         }
 
         function clearResults() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "7.4.620",
+  "version": "7.5.19-rc",
   "description": "Cordova plugin for reading and validation of identification documents (API framework)",
   "cordova": {
     "id": "@regulaforensics/cordova-plugin-document-reader-api",
@@ -11,17 +11,13 @@
   },
   "max_body_size": "1000mb",
   "keywords": [
-    "cordova",
-    "documentreader",
-    "reader",
-    "scanner",
-    "regula"
+    "cordova", "documentreader", "reader", "scanner", "regula"
   ],
   "author": "RegulaForensics",
   "license": "commercial",
   "repository": {
-    "type": "git",
-    "url": "https://github.com/regulaforensics/DocumentReader-Cordova-Plugin.git"
+      "type": "git",
+      "url": "https://github.com/regulaforensics/DocumentReader-Cordova-Plugin.git"
   },
   "homepage": "https://mobile.regulaforensics.com",
   "publishConfig": {

package/plugin.xml

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-document-reader-api" version="7.4.620"
-  xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/cordova-plugin-document-reader-api" version="7.5.19-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
   <license>commercial</license>
@@ -15,6 +14,7 @@
       <feature name="DocumentReader">
         <param name="ios-package" value="RGLWDocumentReader" />
       </feature>
+      <preference name="deployment-target" value="12.0" />
     </config-file>
     <header-file src="src/ios/RGLWDocumentReader.h" />
     <source-file src="src/ios/RGLWDocumentReader.m" />
@@ -23,16 +23,17 @@
     <header-file src="src/ios/RGLWConfig.h" />
     <source-file src="src/ios/RGLWConfig.m" />
     <podspec>
-        <config>
-        </config>
+      <config>
+      </config>
       <pods>
-        <pod name="DocumentReader" spec="7.4.3900" />
+        <pod name="DocumentReaderStage" spec="7.5.4216" />
       </pods>
     </podspec>
   </platform>
 
   <platform name="android">
     <config-file parent="/*" target="res/xml/config.xml">
+      <preference name="GradlePluginKotlinEnabled" value="true" />
       <feature name="DocumentReader">
         <param name="android-package" value="cordova.plugin.documentreader.DocumentReader" />
       </feature>

package/src/android/BluetoothUtil.kt

@@ -5,10 +5,13 @@
 //  Created by Pavel Masiuk on 21.09.2023.
 //  Copyright © 2023 Regula. All rights reserved.
 //
+@file:SuppressLint("MissingPermission")
 
 package cordova.plugin.documentreader
 
-import android.Manifest.permission.*
+import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.Manifest.permission.BLUETOOTH_CONNECT
+import android.Manifest.permission.BLUETOOTH_SCAN
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter
@@ -19,7 +22,6 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
-import androidx.annotation.RequiresPermission
 import androidx.core.app.ActivityCompat.requestPermissions
 import androidx.core.content.ContextCompat.checkSelfPermission
 import com.regula.documentreader.api.ble.BLEWrapper
@@ -28,37 +30,103 @@ import com.regula.documentreader.api.ble.RegulaBleService
 import com.regula.documentreader.api.internal.permission.BluetoothPermissionHelper.BLE_ACCESS_PERMISSION
 import com.regula.documentreader.api.internal.permission.BluetoothSettingsHelper.isBluetoothEnabled
 import com.regula.documentreader.api.internal.permission.BluetoothSettingsHelper.isLocationServiceEnabled
+import java.util.Timer
+import java.util.TimerTask
 
-const val REQUEST_ENABLE_LOCATION = 196
-const val REQUEST_ENABLE_BT = 197
+const val SEARCHING_TIMEOUT: Long = 7000
+
+const val INTENT_REQUEST_ENABLE_LOCATION = 196
+const val INTENT_REQUEST_ENABLE_BLUETOOTH = 197
 
 @SuppressLint("StaticFieldLeak")
-var bleManager: BLEWrapper? = null
+lateinit var bluetooth: BLEWrapper
+lateinit var savedCallbackForPermissionResult: Callback
+var deviceConnected = false
 
-@RequiresPermission("android.permission.BLUETOOTH_CONNECT")
-fun requestEnableBle(activity: Activity) {
-    val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-    activity.startActivityForResult(enableIntent, REQUEST_ENABLE_BT)
+fun connectBluetoothDevice(callback: Callback) {
+    // 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
+    }
+
+    // set searching timeout
+    val timer = object : TimerTask() {
+        override fun run() {
+            callback.success(false)
+            bluetooth.stopDeviceScan()
+            bluetooth.disconnect()
+        }
+    }
+    Timer().schedule(timer, SEARCHING_TIMEOUT)
+
+    // start searching devices
+    val bleIntent = Intent(activity, RegulaBleService::class.java)
+    activity.startService(bleIntent)
+    activity.bindService(bleIntent, object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            bluetooth = (service as RegulaBleService.LocalBinder).service.bleManager
+            bluetooth.addCallback(object : BleWrapperCallback() {
+                override fun onDeviceReady() {
+                    timer.cancel()
+                    bluetooth.removeCallback(this)
+                    deviceConnected = true
+                    callback.success(true)
+                }
+            })
+        }
+
+        override fun onServiceDisconnected(name: ComponentName) {}
+    }, 0)
 }
 
-fun requestEnableLocationService(activity: Activity) {
-    val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-    activity.startActivityForResult(myIntent, REQUEST_ENABLE_LOCATION)
+fun onRequestPermissionsResult(
+    requestCode: Int,
+    permissions: Array<out String>,
+    grantResults: IntArray
+): Boolean {
+    if (requestCode != BLE_ACCESS_PERMISSION || permissions.isEmpty()) return false
+    if (grantResults.isEmpty() || grantResults[0] != PERMISSION_GRANTED) {
+        savedCallbackForPermissionResult.success(false)
+        return true
+    }
+    connectBluetoothDevice(savedCallbackForPermissionResult)
+    return true
 }
 
-// requestEnableBle() is called after a check for permission
-@SuppressLint("MissingPermission")
-fun isBlePermissionsGranted(activity: Activity): Boolean {
-    if (!isLocationServiceEnabled(activity)) {
-        requestEnableLocationService(activity)
-        return false
+fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") data: Intent?): Boolean {
+    var resultCode = rc
+    if (requestCode == INTENT_REQUEST_ENABLE_LOCATION)
+        resultCode = if (isLocationServiceEnabled(activity)) Activity.RESULT_OK
+        else requestCode
+
+    if (requestCode == INTENT_REQUEST_ENABLE_BLUETOOTH || requestCode == INTENT_REQUEST_ENABLE_LOCATION) {
+        if (resultCode == Activity.RESULT_OK)
+            connectBluetoothDevice(savedCallbackForPermissionResult)
+        else
+            savedCallbackForPermissionResult.success(false)
+        return true
     }
+    return false
+}
+
+fun isBluetoothSettingsReady(activity: Activity): Boolean {
     deniedBluetoothPermissions(activity)?.let {
         requestPermissions(activity, it, BLE_ACCESS_PERMISSION)
         return false
     }
     if (!isBluetoothEnabled(activity)) {
-        requestEnableBle(activity)
+        requestEnableBluetooth(activity)
+        return false
+    }
+    if (!isLocationServiceEnabled(activity)) {
+        requestEnableLocationService(activity)
         return false
     }
     return true
@@ -83,30 +151,12 @@ fun deniedBluetoothPermission(
     return arrayOf()
 }
 
-fun startBluetoothService(
-    activity: Activity,
-    onConnected: (Boolean) -> Unit,
-    onDisconnected: () -> Unit,
-    onReady: () -> Unit
-) {
-    val bleIntent = Intent(activity, RegulaBleService::class.java)
-    activity.startService(bleIntent)
-
-    activity.bindService(bleIntent, object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName, service: IBinder) {
-            bleManager = (service as RegulaBleService.LocalBinder).service.bleManager
-            val isBleManagerConnected = bleManager?.isConnected == true
-            onConnected(isBleManagerConnected)
-            if (!isBleManagerConnected) {
-                bleManager?.addCallback(object : BleWrapperCallback() {
-                    override fun onDeviceReady() {
-                        bleManager!!.removeCallback(this)
-                        onReady()
-                    }
-                })
-            }
-        }
+fun requestEnableBluetooth(activity: Activity) {
+    val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+    activity.startActivityForResult(enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
+}
 
-        override fun onServiceDisconnected(name: ComponentName) = onDisconnected()
-    }, 0)
-}
+fun requestEnableLocationService(activity: Activity) {
+    val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+    activity.startActivityForResult(myIntent, INTENT_REQUEST_ENABLE_LOCATION)
+}

package/src/android/Config.kt

@@ -1,5 +1,5 @@
 //
-//  Config.java
+//  Config.kt
 //  DocumentReader
 //
 //  Created by Pavel Masiuk on 21.09.2023.
@@ -26,6 +26,7 @@ import com.regula.documentreader.api.params.LivenessParams
 import com.regula.documentreader.api.params.ParamsCustomization
 import com.regula.documentreader.api.params.ProcessParam
 import com.regula.documentreader.api.params.RfidScenario
+import com.regula.documentreader.api.params.rfid.dg.DTCDataGroup
 import com.regula.documentreader.api.params.rfid.dg.DataGroups
 import com.regula.documentreader.api.params.rfid.dg.EIDDataGroups
 import com.regula.documentreader.api.params.rfid.dg.EPassportDataGroups
@@ -129,12 +130,16 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "shouldReturnPackageForReprocess" -> processParams.shouldReturnPackageForReprocess = v as Boolean
         "disablePerforationOCR" -> processParams.disablePerforationOCR = v as Boolean
         "respectImageQuality" -> processParams.respectImageQuality = v as Boolean
+        "strictImageQuality" -> processParams.strictImageQuality = v as Boolean
         "splitNames" -> processParams.splitNames = v as Boolean
         "doDetectCan" -> processParams.doDetectCan = v as Boolean
         "useFaceApi" -> processParams.useFaceApi = v as Boolean
         "useAuthenticityCheck" -> processParams.useAuthenticityCheck = v as Boolean
         "checkHologram" -> processParams.checkHologram = v as Boolean
         "generateNumericCodes" -> processParams.generateNumericCodes = v as Boolean
+        "strictBarcodeDigitalSignatureCheck" -> processParams.strictBarcodeDigitalSignatureCheck = v as Boolean
+        "selectLongestNames" -> processParams.selectLongestNames = v as Boolean
+        "generateDTCVC" -> processParams.generateDTCVC = v as Boolean
         "measureSystem" -> processParams.measureSystem = v.toInt()
         "barcodeParserType" -> processParams.barcodeParserType = v.toInt()
         "perspectiveAngle" -> processParams.perspectiveAngle = v.toInt()
@@ -207,12 +212,16 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "shouldReturnPackageForReprocess" to processParams.shouldReturnPackageForReprocess,
     "disablePerforationOCR" to processParams.disablePerforationOCR,
     "respectImageQuality" to processParams.respectImageQuality,
+    "strictImageQuality" to processParams.strictImageQuality,
     "splitNames" to processParams.splitNames,
     "doDetectCan" to processParams.doDetectCan,
     "useFaceApi" to processParams.useFaceApi,
     "useAuthenticityCheck" to processParams.useAuthenticityCheck,
     "checkHologram" to processParams.checkHologram,
     "generateNumericCodes" to processParams.generateNumericCodes,
+    "strictBarcodeDigitalSignatureCheck" to processParams.strictBarcodeDigitalSignatureCheck,
+    "selectLongestNames" to processParams.selectLongestNames,
+    "generateDTCVC" to processParams.generateDTCVC,
     "measureSystem" to processParams.measureSystem,
     "barcodeParserType" to processParams.barcodeParserType,
     "perspectiveAngle" to processParams.perspectiveAngle,
@@ -278,6 +287,7 @@ fun setCustomization(customization: ParamsCustomization, opts: JSONObject, conte
         "activityIndicatorColor" -> editor.setActivityIndicatorColor(v.toColor())
         "statusBackgroundColor" -> editor.setStatusBackgroundColor(v.toColor())
         "cameraPreviewBackgroundColor" -> editor.setCameraPreviewBackgroundColor(v.toColor())
+        "backgroundMaskColor" -> editor.setBackgroundMaskColor(v.toColor())
         "statusPositionMultiplier" -> editor.setStatusPositionMultiplier(v.toFloat())
         "resultStatusPositionMultiplier" -> editor.setResultStatusPositionMultiplier(v.toFloat())
         "toolbarSize" -> editor.setToolbarSize(v.toFloat())
@@ -288,6 +298,8 @@ fun setCustomization(customization: ParamsCustomization, opts: JSONObject, conte
         "cameraFramePortraitAspectRatio" -> editor.setCameraFramePortraitAspectRatio(v.toFloat())
         "cameraFrameCornerRadius" -> editor.setCameraFrameCornerRadius(v.toFloat())
         "livenessAnimationPositionMultiplier" -> editor.setLivenessAnimationPositionMultiplier(v.toFloat())
+        "nextPageAnimationStartDelay" -> editor.setNextPageAnimationStartDelay(v.toFloat())
+        "nextPageAnimationEndDelay" -> editor.setNextPageAnimationEndDelay(v.toFloat())
         "multipageAnimationFrontImage" -> editor.setMultipageAnimationFrontImage(v.toDrawable(context))
         "multipageAnimationBackImage" -> editor.setMultipageAnimationBackImage(v.toDrawable(context))
         "borderBackgroundImage" -> editor.setBorderBackgroundImage(v.toDrawable(context))
@@ -349,6 +361,7 @@ fun getCustomization(customization: ParamsCustomization) = mapOf(
     "activityIndicatorColor" to customization.activityIndicatorColor.toLong(),
     "statusBackgroundColor" to customization.statusBackgroundColor.toLong(),
     "cameraPreviewBackgroundColor" to customization.cameraPreviewBackgroundColor.toLong(),
+    "backgroundMaskColor" to customization.backgroundMaskColor.toLong(),
     "statusPositionMultiplier" to customization.statusPositionMultiplier,
     "resultStatusPositionMultiplier" to customization.resultStatusPositionMultiplier,
     "backgroundMaskAlpha" to customization.backgroundMaskAlpha,
@@ -359,6 +372,8 @@ fun getCustomization(customization: ParamsCustomization) = mapOf(
     "cameraFramePortraitAspectRatio" to customization.cameraFramePortraitAspectRatio,
     "cameraFrameCornerRadius" to customization.cameraFrameCornerRadius,
     "livenessAnimationPositionMultiplier" to customization.livenessAnimationPositionMultiplier,
+    "nextPageAnimationStartDelay" to customization.nextPageAnimationStartDelay,
+    "nextPageAnimationEndDelay" to customization.nextPageAnimationEndDelay,
     "multipageAnimationFrontImage" to customization.multipageAnimationFrontImage.toString(),
     "multipageAnimationBackImage" to customization.multipageAnimationBackImage.toString(),
     "borderBackgroundImage" to customization.borderBackgroundImage.toString(),
@@ -422,6 +437,8 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "applyAmendments" -> rfidScenario.isApplyAmendments = v as Boolean
         "autoSettings" -> rfidScenario.isAutoSettings = v as Boolean
         "proceedReadingAlways" -> rfidScenario.proceedReadingAlways = v as Boolean
+        "readDTC" -> rfidScenario.isReadDTC = v as Boolean
+        "mrzStrictCheck" -> rfidScenario.isMrzStrictCheck = v as Boolean
         "signManagementAction" -> rfidScenario.signManagementAction = v.toInt()
         "readingBuffer" -> rfidScenario.readingBuffer = v.toInt()
         "onlineTAToSignDataType" -> rfidScenario.onlineTAToSignDataType = v.toInt()
@@ -437,9 +454,11 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "mrz" -> rfidScenario.mrz = v as String
         "eSignPINDefault" -> rfidScenario.seteSignPINDefault(v as String)
         "eSignPINNewValue" -> rfidScenario.seteSignPINNewValue(v as String)
+        "cardAccess" -> rfidScenario.cardAccess = v as String
         "ePassportDataGroups" -> setDataGroups(rfidScenario.ePassportDataGroups(), v as JSONObject)
         "eIDDataGroups" -> setDataGroups(rfidScenario.eIDDataGroups(), v as JSONObject)
         "eDLDataGroups" -> setDataGroups(rfidScenario.eDLDataGroups(), v as JSONObject)
+        "dtcDataGroups" -> setDataGroups(rfidScenario.DTCDataGroup(), v as JSONObject)
     }
 }
 
@@ -478,6 +497,8 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "applyAmendments" to rfidScenario.isApplyAmendments,
     "autoSettings" to rfidScenario.isAutoSettings,
     "proceedReadingAlways" to rfidScenario.proceedReadingAlways,
+    "readDTC" to rfidScenario.isReadDTC,
+    "mrzStrictCheck" to rfidScenario.isMrzStrictCheck,
     "signManagementAction" to rfidScenario.signManagementAction,
     "readingBuffer" to rfidScenario.readingBuffer,
     "onlineTAToSignDataType" to rfidScenario.onlineTAToSignDataType,
@@ -493,9 +514,11 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "mrz" to rfidScenario.mrz,
     "eSignPINDefault" to rfidScenario.geteSignPINDefault(),
     "eSignPINNewValue" to rfidScenario.geteSignPINNewValue(),
+    "cardAccess" to rfidScenario.cardAccess,
     "ePassportDataGroups" to getDataGroups(rfidScenario.ePassportDataGroups()),
     "eIDDataGroups" to getDataGroups(rfidScenario.eIDDataGroups()),
-    "eDLDataGroups" to getDataGroups(rfidScenario.eDLDataGroups())
+    "eDLDataGroups" to getDataGroups(rfidScenario.eDLDataGroups()),
+    "dtcDataGroups" to getDataGroups(rfidScenario.DTCDataGroup())
 ).toJsonObject()
 
 fun setDataGroups(dataGroup: DataGroups, opts: JSONObject) = opts.forEach { k, v ->
@@ -529,6 +552,15 @@ fun setDataGroups(dataGroup: DataGroups, opts: JSONObject) = opts.forEach { k, v
         "DG20" -> dataGroup.isDG20 = value
         "DG21" -> dataGroup.isDG21 = value
     }
+    if (dataGroup is DTCDataGroup) when (k) {
+        "DG15" -> dataGroup.isDG15 = value
+        "DG16" -> dataGroup.isDG16 = value
+        "DG17" -> dataGroup.isDG17 = value
+        "DG18" -> dataGroup.isDG18 = value
+        "DG22" -> dataGroup.isDG22 = value
+        "DG23" -> dataGroup.isDG23 = value
+        "DG24" -> dataGroup.isDG24 = value
+    }
 }
 
 fun getDataGroups(dataGroup: DataGroups): JSONObject {
@@ -561,6 +593,15 @@ fun getDataGroups(dataGroup: DataGroups): JSONObject {
         result["DG20"] = dataGroup.isDG20
         result["DG21"] = dataGroup.isDG21
     }
+    if (dataGroup is DTCDataGroup) {
+        result["DG15"] = dataGroup.isDG15
+        result["DG16"] = dataGroup.isDG16
+        result["DG17"] = dataGroup.isDG17
+        result["DG18"] = dataGroup.isDG18
+        result["DG22"] = dataGroup.isDG22
+        result["DG23"] = dataGroup.isDG23
+        result["DG24"] = dataGroup.isDG24
+    }
     return result.toJsonObject()
 }
 

package/src/android/DocumentReader.kt

@@ -48,7 +48,18 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 class DocumentReader : CordovaPlugin() {
-    override fun onNewIntent(intent: Intent) = newIntent(intent)
+    override fun onNewIntent(intent: Intent) {
+        newIntent(intent)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+        myOnActivityResult(requestCode, resultCode, intent)
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?) {
+        myOnRequestPermissionsResult(requestCode, permissions!!, grantResults!!)
+    }
+
     override fun execute(action: String, args: JSONArray, callbackContext: CallbackContext): Boolean {
         activity = cordova.activity
         exec(args, callbackContext)
@@ -56,6 +67,12 @@ class DocumentReader : CordovaPlugin() {
     }
 }
 
+fun myOnActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+    onActivityResult(requestCode, resultCode, intent)
+}
+
+fun myOnRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?) = onRequestPermissionsResult(requestCode, permissions!!, grantResults!!)
+
 fun sendEvent(event: String, data: Any? = "") {
     // These events are not working in cordova and ionic because they don't have a method
     // associated with it. Callbacks are set automatically right after init.
@@ -98,8 +115,6 @@ fun exec(arguments: JSONArray, tempContext: CallbackContext) {
     when (action) {
         "getDocumentReaderIsReady" -> getDocumentReaderIsReady(callback)
         "getDocumentReaderStatus" -> getDocumentReaderStatus(callback)
-        "isAuthenticatorAvailableForUse" -> isAuthenticatorAvailableForUse(callback)
-        "isBlePermissionsGranted" -> isBlePermissionsGranted(callback)
         "getRfidSessionStatus" -> getRfidSessionStatus(callback)
         "setRfidSessionStatus" -> setRfidSessionStatus(callback)
         "getTag" -> getTag(callback)
@@ -139,11 +154,13 @@ fun exec(arguments: JSONArray, tempContext: CallbackContext) {
         "addPKDCertificates" -> addPKDCertificates(callback, args(0))
         "clearPKDCertificates" -> clearPKDCertificates(callback)
         "startNewSession" -> startNewSession(callback)
-        "startBluetoothService" -> startBluetoothService()
+        "connectBluetoothDevice" -> connectBluetoothDevice(callback)
         "setLocalizationDictionary" -> setLocalizationDictionary(args(0))
         "getLicense" -> getLicense(callback)
         "getAvailableScenarios" -> getAvailableScenarios(callback)
         "getIsRFIDAvailableForUse" -> getIsRFIDAvailableForUse(callback)
+        "isAuthenticatorAvailableForUse" -> isAuthenticatorAvailableForUse(callback)
+        "isAuthenticatorRFIDAvailableForUse" -> isAuthenticatorRFIDAvailableForUse(callback)
         "getDocReaderVersion" -> getDocReaderVersion(callback)
         "getDocReaderDocumentsDatabase" -> getDocReaderDocumentsDatabase(callback)
         "textFieldValueByType" -> textFieldValueByType(callback, args(0), args(1))
@@ -164,6 +181,7 @@ fun exec(arguments: JSONArray, tempContext: CallbackContext) {
         "containers" -> containers(callback, args(0), args(1))
         "encryptedContainers" -> encryptedContainers(callback, args(0))
         "finalizePackage" -> finalizePackage(callback)
+        "endBackendTransaction" -> endBackendTransaction(callback)
         "getTranslation" -> getTranslation(callback, args(0), args(1))
     }
 }
@@ -193,10 +211,6 @@ const val eventPACertificateCompletion = "pa_certificate_completion"
 const val eventTACertificateCompletion = "ta_certificate_completion"
 const val eventTASignatureCompletion = "ta_signature_completion"
 
-const val bleOnServiceConnectedEvent = "bleOnServiceConnectedEvent"
-const val bleOnServiceDisconnectedEvent = "bleOnServiceDisconnectedEvent"
-const val bleOnDeviceReadyEvent = "bleOnDeviceReadyEvent"
-
 const val eventVideoEncoderCompletion = "video_encoder_completion"
 const val onCustomButtonTappedEvent = "onCustomButtonTappedEvent"
 
@@ -204,10 +218,6 @@ fun getDocumentReaderIsReady(callback: Callback) = callback.success(Instance().i
 
 fun getDocumentReaderStatus(callback: Callback) = callback.success(Instance().status)
 
-fun isAuthenticatorAvailableForUse(callback: Callback) = callback.success(Instance().isAuthenticatorAvailableForUse)
-
-fun isBlePermissionsGranted(callback: Callback) = callback.success(isBlePermissionsGranted((activity)))
-
 fun getRfidSessionStatus(callback: Callback) = callback.error("getRfidSessionStatus() is an ios-only method")
 
 fun setRfidSessionStatus(callback: Callback) = callback.error("setRfidSessionStatus() is an ios-only method")
@@ -342,13 +352,6 @@ fun startNewSession(callback: Callback) {
     callback.success()
 }
 
-fun startBluetoothService() = startBluetoothService(
-    activity,
-    { sendEvent(bleOnServiceConnectedEvent, it) },
-    { sendEvent(bleOnServiceDisconnectedEvent) },
-    { sendEvent(bleOnDeviceReadyEvent) }
-)
-
 fun setLocalizationDictionary(dictionary: JSONObject) {
     localizationCallbacks = LocalizationCallbacks { if (dictionary.has(it)) dictionary.getString(it) else null }
     Instance().setLocalizationCallback(localizationCallbacks!!)
@@ -365,6 +368,10 @@ fun getAvailableScenarios(callback: Callback) {
 
 fun getIsRFIDAvailableForUse(callback: Callback) = callback.success(Instance().isRFIDAvailableForUse)
 
+fun isAuthenticatorAvailableForUse(callback: Callback) = callback.success(Instance().isAuthenticatorAvailableForUse)
+
+fun isAuthenticatorRFIDAvailableForUse(callback: Callback) = callback.success(Instance().isAuthenticatorRFIDAvailableForUse)
+
 fun getDocReaderVersion(callback: Callback) = callback.success(generateDocReaderVersion(Instance().version))
 
 fun getDocReaderDocumentsDatabase(callback: Callback) = callback.success(Instance().version?.let { generateDocReaderDocumentsDatabase(it.database) })
@@ -405,6 +412,11 @@ fun encryptedContainers(callback: Callback, raw: String) = callback.success(from
 
 fun finalizePackage(callback: Callback) = Instance().finalizePackage { action, info, error -> callback.success(generateFinalizePackageCompletion(action, info, error)) }
 
+fun endBackendTransaction(callback: Callback) {
+    Instance().endBackendTransaction()
+    callback.success()
+}
+
 fun getTranslation(callback: Callback, className: String, value: Int) = when (className) {
     "RFIDErrorCodes" -> callback.success(eRFID_ErrorCodes.getTranslation(context, value))
     "LDSParsingErrorCodes" -> callback.success(eLDS_ParsingErrorCodes.getTranslation(context, value))
@@ -485,12 +497,15 @@ var requestType = RfidReaderRequestType(
 )
 
 @Suppress("DEPRECATION")
-fun newIntent(intent: Intent) = if (intent.action == NfcAdapter.ACTION_TECH_DISCOVERED)
+fun newIntent(intent: Intent): Boolean {
+    if (intent.action != NfcAdapter.ACTION_TECH_DISCOVERED) return false
     Instance().readRFID(
         IsoDep.get(intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)),
         rfidReaderCompletion,
         requestType.getRfidReaderRequest()
-    ) else Unit
+    )
+    return true
+}
 
 fun startForegroundDispatch() {
     backgroundRFIDEnabled = true