@regulaforensics/cordova-plugin-document-reader-api 7.6.674-nightly → 8.1.61-nightly

package/.gitlab/report.yaml

@@ -0,0 +1,75 @@
+spec:
+  inputs:
+    stage:
+      default: reports
+    image:
+      default: ubuntu:22.04
+    ignore_vulnerabilities:
+      default: "false"
+    sast_report_file:
+      default: gl-sast-report.json
+    secret_detection_report_file:
+      default: gl-secret-detection-report.json
+    dependency_scanning_report_file:
+      default: gl-dependency-scanning-report.json
+---
+
+view reports:
+  image: $[[ inputs.image ]]
+  stage: $[[ inputs.stage ]]
+  variables:
+    IGNORE_VULNERABILITIES: $[[ inputs.ignore_vulnerabilities ]]
+    SAST_REPORT_FILE: $[[ inputs.sast_report_file ]]
+    SECRET_DETECTION_REPORT_FILE: $[[ inputs.secret_detection_report_file ]]
+    DEPENDENCY_SCANNING_REPORT_FILE: $[[ inputs.dependency_scanning_report_file ]]
+    RED: \033[0;31m
+    YELLOW: \033[1;33m
+    GREEN: \033[0;32m
+    NC: \033[0m
+  needs:
+    - job: semgrep-sast
+      artifacts: true
+    - job: secret_detection
+      artifacts: true
+    - job: gemnasium-dependency_scanning
+      artifacts: true
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  script:
+    - ls -la
+    - apt update && apt install -y jq
+    - |
+      for f in SAST_REPORT_FILE SECRET_DETECTION_REPORT_FILE DEPENDENCY_SCANNING_REPORT_FILE
+      do
+        if [[ -f "${!f}" ]]
+        then
+          echo -e "${GREEN}File ${!f} exists, adding report${NC}"
+          r=${f/%_FILE}
+          declare $r="$(cat ${!f} | jq 'select(.vulnerabilities != []).vulnerabilities')"
+          if [[ ! -z "${!r}" ]]
+          then
+            VULNERABILITIES_FOUND=true
+            echo -e "${RED}Found $r vulnerabilities${NC}"
+            echo "${!r}"
+            echo
+          fi
+        else
+          echo -e "${YELLOW}File ${!f} doesn't exist, skipping${NC}"
+        fi
+      done
+
+      if [[ "$VULNERABILITIES_FOUND" == true ]]
+      then
+        if [[ "$IGNORE_VULNERABILITIES" == true ]]
+        then
+          echo -e "${GREEN}All found vulnerabilities were ignored due to IGNORE_VULNERABILITIES=true${NC}"
+          exit 0
+        else
+          echo -e "${RED}Vulnerabilities found, please see reports above${NC}"
+          exit 1
+        fi
+      fi
+
+      echo -e "${GREEN}No vulnerabilities found${NC}"
+
+      exit 0

package/.gitlab-ci.yml

@@ -0,0 +1,49 @@
+stages:
+  - test
+  - reports
+
+include:
+  - template: Jobs/SAST.gitlab-ci.yml
+  - template: Jobs/Secret-Detection.gitlab-ci.yml
+  - template: Jobs/Dependency-Scanning.gitlab-ci.yml
+  - local: .gitlab/report.yaml
+    rules:
+      - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    inputs:
+      stage: reports
+      image: ubuntu:22.04
+      ignore_vulnerabilities: "false"
+      sast_report_file: gl-sast-report.json
+      secret_detection_report_file: gl-secret-detection-report.json
+      dependency_scanning_report_file: gl-dependency-scanning-report.json
+
+trivy scan:
+  stage: test
+  image: aquasec/trivy
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  script:
+    - trivy fs --severity CRITICAL,HIGH,MEDIUM,LOW --ignore-unfixed --db-repository container-registry.regula.local:80/aquasecurity/trivy-db:2 --exit-code 1 .
+
+semgrep-sast:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  artifacts:
+    paths:
+      - gl-sast-report.json
+
+secret_detection:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  artifacts:
+    paths:
+      - gl-secret-detection-report.json
+
+gemnasium-dependency_scanning:
+  variables:
+    DS_MAX_DEPTH: -1
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  artifacts:
+    paths:
+      - gl-dependency-scanning-report.json

package/example/package.json

@@ -13,8 +13,8 @@
   "author": "Regula Forensics Inc.",
   "license": "commercial",
   "dependencies": {
-    "@regulaforensics/cordova-plugin-document-reader-api": "7.6.674-nightly",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "7.6.892-nightly",
+    "@regulaforensics/cordova-plugin-document-reader-api": "8.1.61-nightly",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "8.1.78-nightly",
     "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": "7.6.674-nightly",
+  "version": "8.1.61-nightly",
   "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.6.674-nightly"
-  xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/cordova-plugin-document-reader-api" version="8.1.61-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
   <license>commercial</license>
@@ -15,7 +14,7 @@
       <feature name="DocumentReader">
         <param name="ios-package" value="RGLWDocumentReader" />
       </feature>
-      <preference name="deployment-target" value="12.0" />
+      <preference name="deployment-target" value="13.0" />
     </config-file>
     <header-file src="src/ios/RGLWDocumentReader.h" />
     <source-file src="src/ios/RGLWDocumentReader.m" />
@@ -25,9 +24,10 @@
     <source-file src="src/ios/RGLWConfig.m" />
     <podspec>
       <config>
+        <source url="https://github.com/CocoaPods/Specs.git"/>
       </config>
       <pods>
-        <pod name="DocumentReaderNightly" spec="7.6.4234" />
+        <pod name="DocumentReaderNightly" spec="8.1.4473" />
       </pods>
     </podspec>
   </platform>

package/src/android/BluetoothUtil.kt

@@ -22,11 +22,10 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
-import androidx.core.app.ActivityCompat.requestPermissions
 import androidx.core.content.ContextCompat.checkSelfPermission
-import com.regula.documentreader.api.ble.BLEWrapper
-import com.regula.documentreader.api.ble.BleWrapperCallback
-import com.regula.documentreader.api.ble.RegulaBleService
+import com.regula.common.ble.BLEWrapper
+import com.regula.common.ble.BleWrapperCallback
+import com.regula.common.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
@@ -67,9 +66,9 @@ fun connectBluetoothDevice(callback: Callback) {
     Timer().schedule(timer, SEARCHING_TIMEOUT)
 
     // start searching devices
-    val bleIntent = Intent(activity, RegulaBleService::class.java)
-    activity.startService(bleIntent)
-    activity.bindService(bleIntent, object : ServiceConnection {
+    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
             bluetooth.addCallback(object : BleWrapperCallback() {
@@ -88,7 +87,7 @@ fun connectBluetoothDevice(callback: Callback) {
 
 fun onRequestPermissionsResult(
     requestCode: Int,
-    permissions: Array<out String>,
+    permissions: Array<String>,
     grantResults: IntArray
 ): Boolean {
     if (requestCode != BLE_ACCESS_PERMISSION || permissions.isEmpty()) return false
@@ -117,7 +116,7 @@ fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") da
 }
 
 fun isBluetoothSettingsReady(activity: Activity): Boolean {
-    deniedBluetoothPermissions(activity)?.let {
+    deniedBluetoothPermissions()?.let {
         requestPermissions(activity, it, BLE_ACCESS_PERMISSION)
         return false
     }
@@ -132,31 +131,28 @@ fun isBluetoothSettingsReady(activity: Activity): Boolean {
     return true
 }
 
-fun deniedBluetoothPermissions(activity: Activity): Array<String>? {
+fun deniedBluetoothPermissions(): Array<String>? {
     val result = mutableListOf<String>()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-        result.addAll(deniedBluetoothPermission(activity, BLUETOOTH_SCAN))
-        result.addAll(deniedBluetoothPermission(activity, BLUETOOTH_CONNECT))
+        result.addAll(deniedBluetoothPermission(BLUETOOTH_SCAN))
+        result.addAll(deniedBluetoothPermission(BLUETOOTH_CONNECT))
     } else
-        result.addAll(deniedBluetoothPermission(activity, ACCESS_FINE_LOCATION))
+        result.addAll(deniedBluetoothPermission(ACCESS_FINE_LOCATION))
     return result.let { if (it.size > 0) it.toTypedArray() else null }
 }
 
-fun deniedBluetoothPermission(
-    activity: Activity,
-    permission: String
-): Array<String> {
-    if (checkSelfPermission(activity, permission) != PERMISSION_GRANTED)
+fun deniedBluetoothPermission(permission: String): Array<String> {
+    if (checkSelfPermission(context, permission) != PERMISSION_GRANTED)
         return arrayOf(permission)
     return arrayOf()
 }
 
 fun requestEnableBluetooth(activity: Activity) {
     val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-    activity.startActivityForResult(enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
+    startActivityForResult(activity, enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
 }
 
 fun requestEnableLocationService(activity: Activity) {
     val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-    activity.startActivityForResult(myIntent, INTENT_REQUEST_ENABLE_LOCATION)
+    startActivityForResult(activity, myIntent, INTENT_REQUEST_ENABLE_LOCATION)
 }

package/src/android/Config.kt

@@ -6,6 +6,8 @@
 //  Copyright © 2023 Regula. All rights reserved.
 //
 
+@file:Suppress("EnumValuesSoftDeprecate")
+
 package cordova.plugin.documentreader
 
 import android.content.Context
@@ -53,6 +55,7 @@ fun setFunctionality(functionality: Functionality, opts: JSONObject) = opts.forE
         "isCameraTorchCheckDisabled" -> editor.setIsCameraTorchCheckDisabled(v as Boolean)
         "recordScanningProcess" -> editor.setDoRecordProcessingVideo(v as Boolean)
         "manualMultipageMode" -> editor.setManualMultipageMode(v as Boolean)
+        "torchTurnedOn" -> editor.setTorchTurnedOn(v as Boolean)
         "showCaptureButtonDelayFromDetect" -> editor.setShowCaptureButtonDelayFromDetect(v.toLong())
         "showCaptureButtonDelayFromStart" -> editor.setShowCaptureButtonDelayFromStart(v.toLong())
         "orientation" -> editor.setOrientation(v.toInt())
@@ -86,6 +89,7 @@ fun getFunctionality(functionality: Functionality) = mapOf(
     "isCameraTorchCheckDisabled" to functionality.isCameraTorchCheckDisabled,
     "recordScanningProcess" to functionality.doRecordProcessingVideo(),
     "manualMultipageMode" to functionality.isManualMultipageMode,
+    "torchTurnedOn" to functionality.isTorchTurnedOn,
     "showCaptureButtonDelayFromDetect" to functionality.showCaptureButtonDelayFromDetect,
     "showCaptureButtonDelayFromStart" to functionality.showCaptureButtonDelayFromStart,
     "orientation" to functionality.orientation,
@@ -140,6 +144,7 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "strictBarcodeDigitalSignatureCheck" -> processParams.strictBarcodeDigitalSignatureCheck = v as Boolean
         "selectLongestNames" -> processParams.selectLongestNames = v as Boolean
         "generateDTCVC" -> processParams.generateDTCVC = v as Boolean
+        "strictDLCategoryExpiry" -> processParams.strictDLCategoryExpiry = v as Boolean
         "measureSystem" -> processParams.measureSystem = v.toInt()
         "barcodeParserType" -> processParams.barcodeParserType = v.toInt()
         "perspectiveAngle" -> processParams.perspectiveAngle = v.toInt()
@@ -158,7 +163,6 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "dateFormat" -> processParams.dateFormat = v as String
         "scenario" -> processParams.scenario = v as String
         "captureButtonScenario" -> processParams.captureButtonScenario = v as String
-        "sessionLogFolder" -> processParams.sessionLogFolder = v as String
         "timeout" -> processParams.timeout = v.toDouble()
         "timeoutFromFirstDetect" -> processParams.timeoutFromFirstDetect = v.toDouble()
         "timeoutFromFirstDocType" -> processParams.timeoutFromFirstDocType = v.toDouble()
@@ -222,6 +226,7 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "strictBarcodeDigitalSignatureCheck" to processParams.strictBarcodeDigitalSignatureCheck,
     "selectLongestNames" to processParams.selectLongestNames,
     "generateDTCVC" to processParams.generateDTCVC,
+    "strictDLCategoryExpiry" to processParams.strictDLCategoryExpiry,
     "measureSystem" to processParams.measureSystem,
     "barcodeParserType" to processParams.barcodeParserType,
     "perspectiveAngle" to processParams.perspectiveAngle,
@@ -240,7 +245,6 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
     "dateFormat" to processParams.dateFormat,
     "scenario" to processParams.scenario,
     "captureButtonScenario" to processParams.captureButtonScenario,
-    "sessionLogFolder" to processParams.sessionLogFolder,
     "timeout" to processParams.timeout,
     "timeoutFromFirstDetect" to processParams.timeoutFromFirstDetect,
     "timeoutFromFirstDocType" to processParams.timeoutFromFirstDocType,
@@ -439,6 +443,8 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "proceedReadingAlways" -> rfidScenario.proceedReadingAlways = v as Boolean
         "readDTC" -> rfidScenario.isReadDTC = v as Boolean
         "mrzStrictCheck" -> rfidScenario.isMrzStrictCheck = v as Boolean
+        "loadCRLFromRemote" -> rfidScenario.isLoadCRLFromRemote = v as Boolean
+        "independentSODStatus" -> rfidScenario.isIndependentSODStatus = v as Boolean
         "signManagementAction" -> rfidScenario.signManagementAction = v.toInt()
         "readingBuffer" -> rfidScenario.readingBuffer = v.toInt()
         "onlineTAToSignDataType" -> rfidScenario.onlineTAToSignDataType = v.toInt()
@@ -458,7 +464,7 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "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)
+        "dtcDataGroups" -> setDTCDataGroup(rfidScenario.DTCDataGroup(), v as JSONObject)
     }
 }
 
@@ -499,6 +505,8 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "proceedReadingAlways" to rfidScenario.proceedReadingAlways,
     "readDTC" to rfidScenario.isReadDTC,
     "mrzStrictCheck" to rfidScenario.isMrzStrictCheck,
+    "loadCRLFromRemote" to rfidScenario.isLoadCRLFromRemote,
+    "independentSODStatus" to rfidScenario.isIndependentSODStatus,
     "signManagementAction" to rfidScenario.signManagementAction,
     "readingBuffer" to rfidScenario.readingBuffer,
     "onlineTAToSignDataType" to rfidScenario.onlineTAToSignDataType,
@@ -518,7 +526,7 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "ePassportDataGroups" to getDataGroups(rfidScenario.ePassportDataGroups()),
     "eIDDataGroups" to getDataGroups(rfidScenario.eIDDataGroups()),
     "eDLDataGroups" to getDataGroups(rfidScenario.eDLDataGroups()),
-    "dtcDataGroups" to getDataGroups(rfidScenario.DTCDataGroup())
+    "dtcDataGroups" to getDTCDataGroup(rfidScenario.DTCDataGroup())
 ).toJsonObject()
 
 fun setDataGroups(dataGroup: DataGroups, opts: JSONObject) = opts.forEach { k, v ->
@@ -552,15 +560,6 @@ 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 {
@@ -593,18 +592,28 @@ 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()
 }
 
+fun setDTCDataGroup(dataGroup: DTCDataGroup, opts: JSONObject) = opts.forEach { k, v ->
+    val value = v as Boolean
+    when (k) {
+        "DG17" -> dataGroup.isDG17 = value
+        "DG18" -> dataGroup.isDG18 = value
+        "DG22" -> dataGroup.isDG22 = value
+        "DG23" -> dataGroup.isDG23 = value
+        "DG24" -> dataGroup.isDG24 = value
+    }
+}
+
+fun getDTCDataGroup(dataGroup: DTCDataGroup) = mapOf(
+    "DG17" to dataGroup.isDG17,
+    "DG18" to dataGroup.isDG18,
+    "DG22" to dataGroup.isDG22,
+    "DG23" to dataGroup.isDG23,
+    "DG24" to dataGroup.isDG24,
+).toJsonObject()
+
 fun setImageQA(input: ImageQA, opts: JSONObject) = opts.forEach { k, v ->
     when (k) {
         "focusCheck" -> input.focusCheck = v as Boolean
@@ -617,6 +626,7 @@ fun setImageQA(input: ImageQA, opts: JSONObject) = opts.forEach { k, v ->
         "brightnessThreshold" -> input.brightnessThreshold = v.toDouble()
         "expectedPass" -> input.expectedPass = v.toIntArray()
         "glaresCheckParams" -> input.glaresCheckParams = glaresCheckParamsFromJSON(v as JSONObject)
+        "occlusionCheck" -> input.occlusionCheck = v as Boolean
     }
 }
 
@@ -631,6 +641,7 @@ fun getImageQA(input: ImageQA) = mapOf(
     "brightnessThreshold" to input.brightnessThreshold,
     "expectedPass" to input.expectedPass.generate(),
     "glaresCheckParams" to generateGlaresCheckParams(input.glaresCheckParams),
+    "occlusionCheck" to input.occlusionCheck,
 ).toJsonObject()
 
 fun setAuthenticityParams(input: AuthenticityParams, opts: JSONObject) = opts.forEach { k, v ->
@@ -649,6 +660,7 @@ fun setAuthenticityParams(input: AuthenticityParams, opts: JSONObject) = opts.fo
         "checkPhotoEmbedding" -> input.checkPhotoEmbedding = v as Boolean
         "checkPhotoComparison" -> input.checkPhotoComparison = v as Boolean
         "checkLetterScreen" -> input.checkLetterScreen = v as Boolean
+        "checkSecurityText" -> input.checkSecurityText = v as Boolean
         "livenessParams" -> {
             if (input.livenessParams == null) input.livenessParams = LivenessParams.defaultParams()
             setLivenessParams(input.livenessParams!!, v as JSONObject)
@@ -672,6 +684,7 @@ fun getAuthenticityParams(input: AuthenticityParams?) = input?.let {
         "checkPhotoEmbedding" to it.checkPhotoEmbedding,
         "checkPhotoComparison" to it.checkPhotoComparison,
         "checkLetterScreen" to it.checkLetterScreen,
+        "checkSecurityText" to it.checkSecurityText,
         "livenessParams" to getLivenessParams(it.livenessParams)
     ).toJsonObject()
 }
@@ -682,6 +695,8 @@ fun setLivenessParams(input: LivenessParams, opts: JSONObject) = opts.forEach {
         "checkMLI" -> input.checkMLI = v as Boolean
         "checkHolo" -> input.checkHolo = v as Boolean
         "checkED" -> input.checkED = v as Boolean
+        "checkBlackAndWhiteCopy" -> input.checkBlackAndWhiteCopy = v as Boolean
+        "checkDynaprint" -> input.checkDynaprint = v as Boolean
     }
 }
 
@@ -690,7 +705,9 @@ fun getLivenessParams(input: LivenessParams?) = input?.let {
         "checkOVI" to input.checkOVI,
         "checkMLI" to input.checkMLI,
         "checkHolo" to input.checkHolo,
-        "checkED" to input.checkED
+        "checkED" to input.checkED,
+        "checkBlackAndWhiteCopy" to input.checkBlackAndWhiteCopy,
+        "checkDynaprint" to input.checkDynaprint,
     ).toJsonObject()
 }
 

package/src/android/DocumentReader.kt

@@ -1,8 +1,8 @@
 package cordova.plugin.documentreader
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.PendingIntent
+import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.nfc.NfcAdapter
@@ -47,31 +47,16 @@ import org.apache.cordova.PluginResult
 import org.json.JSONArray
 import org.json.JSONObject
 
-class DocumentReader : CordovaPlugin() {
-    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)
-        return true
-    }
-}
-
-fun myOnActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-    onActivityResult(requestCode, resultCode, intent)
-}
+lateinit var callbackContext: CallbackContext
 
-fun myOnRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?) = onRequestPermissionsResult(requestCode, permissions!!, grantResults!!)
+lateinit var args: JSONArray
+lateinit var binding: CordovaPlugin
+val context: Context
+    get() = binding.cordova.context
+val activity: Activity
+    get() = binding.cordova.activity
+val lifecycle: Lifecycle
+    get() = (activity as AppCompatActivity).lifecycle
 
 fun sendEvent(event: String, data: Any? = "") {
     // These events are not working in cordova and ionic because they don't have a method
@@ -99,10 +84,34 @@ fun <T> argsNullable(index: Int): T? = if (args.get(index).toString() != "null")
     args.get(index) as T
 } else null
 
-lateinit var args: JSONArray
-lateinit var callbackContext: CallbackContext
-val lifecycle: Lifecycle
-    get() = (activity as AppCompatActivity).lifecycle
+class DocumentReader : CordovaPlugin() {
+    init {
+        binding = this
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        newIntent(intent)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+        myOnActivityResult(requestCode, resultCode, intent)
+    }
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun onRequestPermissionResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        myOnRequestPermissionsResult(requestCode, permissions, grantResults)
+    }
+
+    override fun execute(action: String, args: JSONArray, callbackContext: CallbackContext): Boolean {
+        exec(args, callbackContext)
+        return true
+    }
+}
+
+fun requestPermissions(@Suppress("UNUSED_PARAMETER") activity: Activity, permissions: Array<String>, requestCode: Int) = binding.cordova.requestPermissions(binding, requestCode, permissions)
+fun startActivityForResult(@Suppress("UNUSED_PARAMETER") activity: Activity, intent: Intent, requestCode: Int) = binding.cordova.startActivityForResult(binding, intent, requestCode)
+fun myOnRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) = onRequestPermissionsResult(requestCode, permissions, grantResults)
+fun myOnActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) = onActivityResult(requestCode, resultCode, intent)
 
 fun exec(arguments: JSONArray, tempContext: CallbackContext) {
     args = arguments
@@ -192,14 +201,6 @@ interface Callback {
     fun error(message: String)
 }
 
-@SuppressLint("StaticFieldLeak")
-lateinit var activity: Activity
-lateinit var lifecycleObserver: LifecycleEventObserver
-val context
-    get() = activity
-
-var backgroundRFIDEnabled = false
-
 const val eventCompletion = "completion"
 const val eventDatabaseProgress = "database_progress"
 
@@ -507,6 +508,9 @@ fun newIntent(intent: Intent): Boolean {
     return true
 }
 
+var backgroundRFIDEnabled = false
+lateinit var lifecycleObserver: LifecycleEventObserver
+
 fun startForegroundDispatch() {
     backgroundRFIDEnabled = true
     val filters: Array<IntentFilter?> = arrayOfNulls(1)
@@ -514,9 +518,9 @@ fun startForegroundDispatch() {
     filters[0]!!.addAction(NfcAdapter.ACTION_TECH_DISCOVERED)
     filters[0]!!.addCategory(Intent.CATEGORY_DEFAULT)
     val techList = arrayOf(arrayOf("android.nfc.tech.IsoDep"))
-    val intent = Intent(context, context.javaClass)
+    val intent = Intent(activity, activity.javaClass)
     val flag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0
-    val pendingIntent = PendingIntent.getActivity(context, 0, intent, flag)
+    val pendingIntent = PendingIntent.getActivity(activity, 0, intent, flag)
 
     if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
         enableForegroundDispatch(pendingIntent, filters, techList)
@@ -527,7 +531,7 @@ fun startForegroundDispatch() {
             else -> Unit
         }
     }
-    context.runOnUiThread { lifecycle.addObserver(lifecycleObserver) }
+    activity.runOnUiThread { lifecycle.addObserver(lifecycleObserver) }
 }
 
 fun enableForegroundDispatch(
@@ -536,15 +540,15 @@ fun enableForegroundDispatch(
     techList: Array<Array<String>>
 ) = NfcAdapter.getDefaultAdapter(context).enableForegroundDispatch(activity, pendingIntent, filters, techList)
 
-fun disableForegroundDispatch() = NfcAdapter.getDefaultAdapter(activity).disableForegroundDispatch(activity)
+fun disableForegroundDispatch() = NfcAdapter.getDefaultAdapter(context).disableForegroundDispatch(activity)
 
 fun stopBackgroundRFID() {
     if (!backgroundRFIDEnabled) return
     backgroundRFIDEnabled = false
     if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
         disableForegroundDispatch()
-    context.runOnUiThread { lifecycle.removeObserver(lifecycleObserver) }
+    activity.runOnUiThread { lifecycle.removeObserver(lifecycleObserver) }
 }
 
 // Weak references
-var localizationCallbacks: LocalizationCallbacks? = null
+var localizationCallbacks: LocalizationCallbacks? = null