7.2.0

Author: Jenkins

RNDocumentReaderApi.podspec

@@ -14,6 +14,6 @@ Pod::Spec.new do |s|
   s.source       = { :http => 'file:' + __dir__ }
   s.ios.deployment_target = '11.0'
   s.source_files  = "ios/*.{h,m}"
-  s.dependency 'DocumentReader', '7.1.3379'
+  s.dependency 'DocumentReader', '7.2.3545'
   s.dependency 'React'
 end

android/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:7.1.9667') {
+    implementation('com.regula.documentreader:api:7.2.9835') {
         transitive = true
     }
 }

android/src/main/java/com/regula/documentreader/Config.kt

@@ -55,7 +55,7 @@ fun setFunctionality(functionality: Functionality, opts: JSONObject) = opts.forE
         "showCaptureButtonDelayFromStart" -> editor.setShowCaptureButtonDelayFromStart(v.toLong())
         "orientation" -> editor.setOrientation(v.toInt())
         "captureMode" -> editor.setCaptureMode(v.toInt())
-        "cameraPosition" -> editor.setCameraMode(v.toInt())
+        "cameraMode" -> editor.setCameraMode(v.toInt())
         "rfidTimeout" -> editor.setRfidTimeout(v.toInt())
         "forcePagesCount" -> editor.setForcePagesCount(v.toInt())
         "cameraFrame" -> editor.setCameraFrame(v as String)
@@ -88,7 +88,7 @@ fun getFunctionality(functionality: Functionality) = mapOf(
     "showCaptureButtonDelayFromStart" to functionality.showCaptureButtonDelayFromStart,
     "orientation" to functionality.orientation,
     "captureMode" to functionality.captureMode,
-    "cameraPosition" to functionality.cameraMode,
+    "cameraMode" to functionality.cameraMode,
     "rfidTimeout" to functionality.rfidTimeout,
     "forcePagesCount" to functionality.forcePagesCount,
     "cameraFrame" to functionality.cameraFrame,
@@ -150,10 +150,10 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
         "scenario" -> processParams.scenario = v as String
         "captureButtonScenario" -> processParams.captureButtonScenario = v as String
         "sessionLogFolder" -> processParams.sessionLogFolder = v as String
-        "timeout" -> processParams.timeout = v as Double
-        "timeoutFromFirstDetect" -> processParams.timeoutFromFirstDetect = v as Double
-        "timeoutFromFirstDocType" -> processParams.timeoutFromFirstDocType = v as Double
-        "documentAreaMin" -> processParams.documentAreaMin = v as Double
+        "timeout" -> processParams.timeout = v.toDouble()
+        "timeoutFromFirstDetect" -> processParams.timeoutFromFirstDetect = v.toDouble()
+        "timeoutFromFirstDocType" -> processParams.timeoutFromFirstDocType = v.toDouble()
+        "documentAreaMin" -> processParams.documentAreaMin = v.toDouble()
         "documentIDList" -> processParams.documentIDList = v.toIntArray()
         "fieldTypesFilter" -> processParams.fieldTypesFilter = v.toIntArray()
         "resultTypeOutput" -> processParams.resultTypeOutput = v.toIntArray()
@@ -412,6 +412,7 @@ fun setRfidScenario(rfidScenario: RfidScenario, opts: JSONObject) = opts.forEach
         "authorizedInstallQCert" -> rfidScenario.isAuthorizedInstallQCert = v as Boolean
         "applyAmendments" -> rfidScenario.isApplyAmendments = v as Boolean
         "autoSettings" -> rfidScenario.isAutoSettings = v as Boolean
+        "proceedReadingAlways" -> rfidScenario.proceedReadingAlways = v as Boolean
         "signManagementAction" -> rfidScenario.signManagementAction = v.toInt()
         "readingBuffer" -> rfidScenario.readingBuffer = v.toInt()
         "onlineTAToSignDataType" -> rfidScenario.onlineTAToSignDataType = v.toInt()
@@ -467,6 +468,7 @@ fun getRfidScenario(rfidScenario: RfidScenario) = mapOf(
     "authorizedInstallQCert" to rfidScenario.isAuthorizedInstallQCert,
     "applyAmendments" to rfidScenario.isApplyAmendments,
     "autoSettings" to rfidScenario.isAutoSettings,
+    "proceedReadingAlways" to rfidScenario.proceedReadingAlways,
     "signManagementAction" to rfidScenario.signManagementAction,
     "readingBuffer" to rfidScenario.readingBuffer,
     "onlineTAToSignDataType" to rfidScenario.onlineTAToSignDataType,
@@ -562,7 +564,7 @@ fun setImageQA(input: ImageQA, opts: JSONObject) = opts.forEach { k, v ->
         "dpiThreshold" -> input.dpiThreshold = v.toInt()
         "angleThreshold" -> input.angleThreshold = v.toInt()
         "documentPositionIndent" -> input.documentPositionIndent = v.toInt()
-        "brightnessThreshold" -> input.brightnessThreshold = v as Double
+        "brightnessThreshold" -> input.brightnessThreshold = v.toDouble()
         "expectedPass" -> input.expectedPass = v.toIntArray()
         "glaresCheckParams" -> input.glaresCheckParams = glaresCheckParamsFromJSON(v as JSONObject)
     }

android/src/main/java/com/regula/documentreader/JSONConstructor.kt

@@ -5,7 +5,6 @@
 //  Created by Pavel Masiuk on 21.09.2023.
 //  Copyright © 2023 Regula. All rights reserved.
 //
-@file:Suppress("USELESS_CAST")
 
 package com.regula.documentreader
 
@@ -16,6 +15,7 @@ import android.graphics.Typeface
 import android.util.Pair
 import com.regula.common.exception.RegulaException
 import com.regula.documentreader.api.License
+import com.regula.documentreader.api.completions.model.PrepareProgress
 import com.regula.documentreader.api.config.RecognizeConfig
 import com.regula.documentreader.api.config.ScannerConfig
 import com.regula.documentreader.api.enums.BarcodeType
@@ -123,6 +123,17 @@ fun generateSuccessCompletion(success: Boolean, error: RegulaException?) = objec
 }
 }
 
+fun prepareProgressFromJSON(it: JSONObject) = PrepareProgress(
+    it.getInt("downloadedBytes"),
+    it.getInt("totalBytes")
+)
+
+fun generatePrepareProgress(it: PrepareProgress) = mapOf(
+    "downloadedBytes" to it.downloadedBytes,
+    "totalBytes" to it.totalBytes,
+    "progress" to it.progress
+).toJson()
+
 fun generatePACertificateCompletion(serialNumber: ByteArray?, issuer: PAResourcesIssuer?) = object : JSONObject() { init {
     put("serialNumber", generateByteArray(serialNumber))
     put("issuer", generatePAResourcesIssuer(issuer))
@@ -998,9 +1009,8 @@ fun generateImageQualityGroup(temp: ImageQualityGroup?): JSONObject? {
 }
 
 fun cameraSizeFromJSON(input: JSONObject): Pair<Int, Int> {
-    val cameraSize = input.getJSONObject("cameraSize")
-    val width = cameraSize.getInt("width")
-    val height = cameraSize.getInt("height")
+    val width = input.getInt("width")
+    val height = input.getInt("height")
     return Pair(width, height)
 }
 
@@ -1962,7 +1972,7 @@ fun generateDocReaderDocumentsDatabase(temp: DocReaderDocumentsDatabase?): JSONO
     result.put("databaseDescription", input.databaseDescription)
     result.put("countriesNumber", input.countriesNumber)
     result.put("documentsNumber", input.documentsNumber)
-    result.put("size", input.size as Long?)
+    result.put("size", input.size)
 
     return result
 }

android/src/main/java/com/regula/documentreader/RNRegulaDocumentReaderModule.kt

@@ -27,7 +27,8 @@ import com.regula.documentreader.Convert.byteArrayFromBase64
 import com.regula.documentreader.api.DocumentReader.Instance
 import com.regula.documentreader.api.completions.IDocumentReaderCompletion
 import com.regula.documentreader.api.completions.IDocumentReaderInitCompletion
-import com.regula.documentreader.api.completions.IDocumentReaderPrepareCompletion
+import com.regula.documentreader.api.completions.IDocumentReaderPrepareDbCompletion
+import com.regula.documentreader.api.completions.model.PrepareProgress
 import com.regula.documentreader.api.completions.rfid.IRfidPKDCertificateCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidReaderRequest
@@ -89,6 +90,7 @@ fun <T> argsNullable(index: Int): T? {
         val intValue = value.toInt()
         return intValue as T
     }
+    if (args[index].toString() == "null") return null
     return args[index] as T
 }
 
@@ -121,6 +123,7 @@ fun exec(action: String?, arguments: ReadableArray, successCallback: com.faceboo
         "setCustomization" -> setCustomization(args(0))
         "getRfidScenario" -> getRfidScenario(callback)
         "setRfidScenario" -> setRfidScenario(args(0))
+        "resetConfiguration" -> resetConfiguration()
         "initializeReader" -> initializeReader(callback, args(0))
         "initializeReaderWithBleDeviceConfig" -> initializeReaderWithBleDeviceConfig(callback, args(0))
         "deinitializeReader" -> deinitializeReader(callback)
@@ -134,8 +137,8 @@ fun exec(action: String?, arguments: ReadableArray, successCallback: com.faceboo
         "startNewPage" -> startNewPage(callback)
         "stopScanner" -> stopScanner(callback)
         "startRFIDReader" -> startRFIDReader(args(0), args(1), args(2))
-        "stopRFIDReader" -> stopRFIDReader(callback)
         "readRFID" -> readRFID(args(0), args(1), args(2))
+        "stopRFIDReader" -> stopRFIDReader(callback)
         "providePACertificates" -> providePACertificates(callback, argsNullable(0))
         "provideTACertificates" -> provideTACertificates(callback, argsNullable(0))
         "provideTASignature" -> provideTASignature(callback, args(0))
@@ -167,12 +170,12 @@ fun exec(action: String?, arguments: ReadableArray, successCallback: com.faceboo
         "graphicFieldImageByTypeSourcePageIndexLight" -> graphicFieldImageByTypeSourcePageIndexLight(callback, args(0), args(1), args(2), args(3), args(4))
         "containers" -> containers(callback, args(0), args(1))
         "encryptedContainers" -> encryptedContainers(callback, args(0))
-        "getTranslation" -> getTranslation(callback, args(0), args(1))
         "finalizePackage" -> finalizePackage(callback)
+        "getTranslation" -> getTranslation(callback, args(0), args(1))
     }
 }
 
-fun <T> args(index: Int): T = argsNullable(index)!!
+inline fun <reified T> args(index: Int) = argsNullable<T>(index)!!
 interface Callback {
     fun success(data: Any? = "")
     fun error(message: String)
@@ -237,6 +240,8 @@ fun getRfidScenario(callback: Callback) = callback.success(getRfidScenario(Insta
 
 fun setRfidScenario(rfidScenario: JSONObject) = setRfidScenario(Instance().rfidScenario(), rfidScenario)
 
+fun resetConfiguration() = Instance().resetConfiguration()
+
 fun initializeReader(callback: Callback, config: JSONObject) = Instance().initializeReader(context, docReaderConfigFromJSON(config), getInitCompletion(callback))
 
 fun initializeReaderWithBleDeviceConfig(callback: Callback, config: JSONObject) = Instance().initializeReader(context, bleDeviceConfigFromJSON(config), getInitCompletion(callback))
@@ -344,9 +349,8 @@ fun startBluetoothService() = startBluetoothService(
     { sendEvent(bleOnDeviceReadyEvent) }
 )
 
-@Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
 fun setLocalizationDictionary(dictionary: JSONObject) {
-    localizationCallbacks = LocalizationCallbacks { dictionary.optString(it, null) }
+    localizationCallbacks = LocalizationCallbacks { if (dictionary.has(it)) dictionary.getString(it) else null }
     Instance().setLocalizationCallback(localizationCallbacks!!)
 }
 
@@ -427,15 +431,9 @@ val rfidReaderCompletion = object : IRfidReaderCompletion() {
     override fun onProgress(notification: DocumentReaderNotification) = sendEvent(rfidOnProgressEvent, generateDocumentReaderNotification(notification))
 }
 
-fun getPrepareCompletion(callback: Callback) = object : IDocumentReaderPrepareCompletion {
-    override fun onPrepareProgressChanged(progress: Int) {
-        if (progress != databaseDownloadProgress) {
-            sendEvent(eventDatabaseProgress, progress)
-            databaseDownloadProgress = progress
-        }
-    }
-
-    override fun onPrepareCompleted(s: Boolean, e: DocumentReaderException?) = callback.success(generateSuccessCompletion(s, e))
+fun getPrepareCompletion(callback: Callback) = object : IDocumentReaderPrepareDbCompletion() {
+    override fun onPrepareProgressChanged(progress: PrepareProgress) = sendEvent(eventDatabaseProgress, generatePrepareProgress(progress))
+    override fun onPrepareCompleted(success: Boolean, error: DocumentReaderException?) = callback.success(generateSuccessCompletion(success, error))
 }
 
 fun getInitCompletion(callback: Callback) = IDocumentReaderInitCompletion { success, error ->

android/src/main/java/com/regula/documentreader/Utils.kt

@@ -5,7 +5,6 @@
 //  Created by Pavel Masiuk on 21.09.2023.
 //  Copyright © 2023 Regula. All rights reserved.
 //
-@file:Suppress("UNCHECKED_CAST")
 
 package com.regula.documentreader
 
@@ -31,27 +30,26 @@ fun Any?.toSendable(): Any? = this?.let {
     else this
 }
 
-fun arrayListToJSONArray(list: ArrayList<*>): JSONArray {
+fun List<*>.toJson(): JSONArray {
     val result = JSONArray()
-    for (i in list.indices) {
-        when {
-            list[i] == null -> result.put(null)
-            list[i].javaClass == HashMap::class.java -> result.put(hashMapToJSONObject(list[i] as HashMap<String, *>))
-            list[i].javaClass == ArrayList::class.java -> result.put(arrayListToJSONArray(list[i] as ArrayList<*>))
-            else -> result.put(list[i])
+    for (i in indices)
+        when (val v = this[i]) {
+            null -> result.put(null)
+            is Map<*, *> -> result.put(v.toJson())
+            is List<*> -> result.put(v.toJson())
+            else -> result.put(v)
         }
-    }
     return result
 }
 
-fun hashMapToJSONObject(map: HashMap<String, *>): JSONObject {
+fun Map<*, *>.toJson(): JSONObject {
     val result = JSONObject()
-    for ((key, value) in map) {
-        when {
-            value == null -> result.put(key, null)
-            value.javaClass == HashMap::class.java -> result.put(key, hashMapToJSONObject(value as HashMap<String, *>))
-            value.javaClass == ArrayList::class.java -> result.put(key, arrayListToJSONArray(value as ArrayList<*>))
-            else -> result.put(key, value)
+    for ((k, v) in this) {
+        when (v) {
+            null -> result.put(k as String, null)
+            is Map<*, *> -> result.put(k as String, v.toJson())
+            is List<*> -> result.put(k as String, v.toJson())
+            else -> result.put(k as String, v)
         }
     }
     return result
@@ -78,6 +76,7 @@ fun <T> listFromJSON(input: JSONArray?, fromJson: (JSONObject?) -> T) = input?.l
     result
 }
 
+@Suppress("UNCHECKED_CAST")
 fun <T> listFromJSON(input: JSONArray): List<T> {
     val result: MutableList<T> = ArrayList()
     for (i in 0 until input.length()) result.add(input.opt(i) as T)
@@ -170,6 +169,12 @@ fun Any?.toLong() = when (this) {
     else -> this as Long
 }
 
+fun Any?.toDouble() = when (this) {
+    is Int -> toDouble()
+    is Long -> toDouble()
+    else -> this as Double
+}
+
 fun Any?.toColor() = "#" + toLong().toString(16)
 
 fun Any?.toFloat() =

example/App.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { SafeAreaView, ScrollView, StyleSheet, Text, View, NativeEventEmitter, Platform, TouchableOpacity, Image, Button } from 'react-native'
-import DocumentReader, { Enum, DocumentReaderCompletion, DocumentReaderScenario, RNRegulaDocumentReader, DocumentReaderResults, DocumentReaderNotification, ScannerConfig, RecognizeConfig, DocReaderConfig } from '@regulaforensics/react-native-document-reader-api'
+import DocumentReader, { Enum, DocumentReaderCompletion, DocumentReaderScenario, RNRegulaDocumentReader, DocumentReaderResults, DocumentReaderNotification, ScannerConfig, RecognizeConfig, DocReaderConfig, Functionality } from '@regulaforensics/react-native-document-reader-api'
 import * as RNFS from 'react-native-fs'
 import RadioGroup, { RadioButtonProps } from 'react-native-radio-buttons-group'
 import { CheckBox } from '@rneui/themed'
@@ -33,9 +33,9 @@ export default class App extends React.Component<IProps, IState> {
   onInitialized() {
     this.setState({ fullName: "Ready" })
 
-    DocumentReader.setFunctionality({
-      showCaptureButton: true
-    }, _ => { }, _ => { })
+    var functionality = new Functionality()
+    functionality.showCaptureButton = true
+    DocumentReader.setFunctionality(functionality, _ => { }, _ => { })
   }
 
   constructor(props: {} | Readonly<{}>) {
@@ -103,7 +103,7 @@ export default class App extends React.Component<IProps, IState> {
         this.hideRfidUI()
         this.displayResults(completion.results!)
       }
-    } else if (this.actionSuccess(completion.action!))
+    } else if (this.actionSuccess(completion.action!) || this.actionError(completion.action!))
       this.handleResults(completion.results!)
   }
 

example/android/gradle.properties

@@ -41,4 +41,4 @@ newArchEnabled=false
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled=true
+hermesEnabled=false

example/ios/Podfile

@@ -8,17 +8,6 @@ require Pod::Executable.execute_command('node', ['-p',
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
 
-# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
-# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
-#
-# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
-# ```js
-# module.exports = {
-#   dependencies: {
-#     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
-# ```
-flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
-
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
   Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -33,21 +22,14 @@ target 'DocumentReader' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    # Hermes is now enabled by default. Disable by setting this flag to false.
-    :hermes_enabled => flags[:hermes_enabled],
+    :hermes_enabled => false,
     :fabric_enabled => flags[:fabric_enabled],
-    # Enables Flipper.
-    #
-    # Note that if you have use_frameworks! enabled, Flipper will not work and
-    # you should disable the next line.
-    :flipper_configuration => flipper_config,
-    # An absolute path to your application root.
+    :flipper_configuration => FlipperConfiguration.disabled,
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
   target 'DocumentReaderTests' do
     inherit! :complete
-    # Pods for testing
   end
 
   post_install do |installer|