@regulaforensics/react-native-document-reader-api 6.4.0 → 6.6.0

package/example/App.js

@@ -3,7 +3,7 @@ import { StyleSheet, View, Button, Text, Image, ScrollView, NativeEventEmitter,
 import DocumentReader, { Enum, DocumentReaderCompletion, DocumentReaderScenario, RNRegulaDocumentReader } from '@regulaforensics/react-native-document-reader-api'
 import * as RNFS from 'react-native-fs'
 import RadioGroup from 'react-native-radio-buttons-group'
-import { launchCamera, launchImageLibrary } from 'react-native-image-picker';
+import { launchImageLibrary } from 'react-native-image-picker';
 import * as Progress from 'react-native-progress'
 import CheckBox from 'react-native-check-box'
 import { LogBox } from 'react-native';
@@ -16,197 +16,192 @@ var certDir = Platform.OS === 'ios' ? (RNFS.MainBundlePath + "/certificates") :
 var readDir = Platform.OS === 'ios' ? RNFS.readDir : RNFS.readDirAssets
 var readFile = Platform.OS === 'ios' ? RNFS.readFile : RNFS.readFileAssets
 
+var isReadingRfid = false;
+
 async function addCertificates() {
-    var certificates = []
-    var items = await readDir(certDir, 'base64')
+  var certificates = []
+  var items = await readDir(certDir, 'base64')
 
-    for (var i in items) {
-        var item = items[i]
-        if (item.isFile()) {
-            var findExt = item.name.split('.')
-            var pkdResourceType = 0
-            if (findExt.length > 0)
-                pkdResourceType = Enum.PKDResourceType.getType(findExt[findExt.length - 1].toLowerCase())
+  for (var i in items) {
+    var item = items[i]
+    if (item.isFile()) {
+      var findExt = item.name.split('.')
+      var pkdResourceType = 0
+      if (findExt.length > 0)
+        pkdResourceType = Enum.PKDResourceType.getType(findExt[findExt.length - 1].toLowerCase())
 
-            var file = await readFile(item.path, 'base64')
-            certificates.push({
-                'binaryData': file,
-                'resourceType': pkdResourceType
-            })
-        }
+      var file = await readFile(item.path, 'base64')
+      certificates.push({
+        'binaryData': file,
+        'resourceType': pkdResourceType
+      })
     }
-    DocumentReader.addPKDCertificates(certificates, s => {
-        console.log("certificates added")
-    }, e => console.log(e))
+  }
+  DocumentReader.addPKDCertificates(certificates, s => {
+    console.log("certificates added")
+  }, e => console.log(e))
 }
 
 export default class App extends Component {
-    constructor(props) {
-        super(props)
-        eventManager.addListener('prepareDatabaseProgressChangeEvent', e => this.setState({ fullName: "Downloading database: " + e["msg"] + "%" }))
-        eventManager.addListener('completionEvent', e => this.handleCompletion(DocumentReaderCompletion.fromJson(JSON.parse(e["msg"]))))
-        eventManager.addListener('rfidNotificationCompletionEvent', e => console.log("rfidNotificationCompletionEvent: " + e["msg"]))
-        eventManager.addListener('paCertificateCompletionEvent', e => console.log("paCertificateCompletionEvent: " + e["msg"]))
-        DocumentReader.prepareDatabase("Full", (respond) => {
-            console.log(respond)
-            readFile(licPath, 'base64').then((res) => {
-                this.setState({ fullName: "Initializing..." })
-                DocumentReader.initializeReader(res, (respond) => {
-                    console.log(respond)
-                    DocumentReader.isRFIDAvailableForUse((canRfid) => {
-                        if (canRfid) {
-                            this.setState({ canRfid: true, rfidUIHeader: "Reading RFID", rfidDescription: "Place your phone on top of the NFC tag", rfidUIHeaderColor: "black" })
-                            this.setState({ canRfidTitle: '' })
-                        }
-                    }, error => console.log(error))
-                    DocumentReader.getAvailableScenarios((jstring) => {
-                        var scenariosTemp = JSON.parse(jstring)
-                        var scenariosL = []
-                        for (var i in scenariosTemp) {
-                            scenariosL.push({
-                                label: DocumentReaderScenario.fromJson(typeof scenariosTemp[i] === "string" ? JSON.parse(scenariosTemp[i]) : scenariosTemp[i]).name,
-                                id: i
-                            })
-                        }
-                        this.setState({ scenarios: scenariosL })
-                        this.setState({ selectedScenario: this.state.scenarios[0]['label'] })
-                        this.setState({ radio: null })
-                        this.setState({
-                            radio: < RadioGroup containerStyle = { styles.radio }
-                            radioButtons = { this.state.scenarios }
-                            onPress = {
-                                (data) => {
-                                    var selectedItem
-                                    for (var index in data)
-                                        if (data[index]['selected'])
-                                            selectedItem = data[index]['label']
-                                    this.setState({ selectedScenario: selectedItem })
-                                }
-                            }
-                            />
-                        })
-                        DocumentReader.getDocumentReaderIsReady((isReady) => {
-                            if (isReady) {
-                                this.setState({ fullName: "Ready" })
-                                DocumentReader.setRfidDelegate(Enum.RFIDDelegate.NO_PA, (r) => {}, error => console.log(error))
-                                    // addCertificates()
-                            } else
-                                this.setState({ fullName: "Failed" })
-                        }, error => console.log(error))
-                    }, error => console.log(error))
-                }, error => console.log(error))
+  constructor(props) {
+    super(props)
+    eventManager.addListener('prepareDatabaseProgressChangeEvent', e => this.setState({ fullName: "Downloading database: " + e["msg"] + "%" }))
+    eventManager.addListener('completionEvent', e => this.handleCompletion(DocumentReaderCompletion.fromJson(JSON.parse(e["msg"]))))
+    eventManager.addListener('rfidNotificationCompletionEvent', e => console.log("rfidNotificationCompletionEvent: " + e["msg"]))
+    eventManager.addListener('paCertificateCompletionEvent', e => console.log("paCertificateCompletionEvent: " + e["msg"]))
+    DocumentReader.prepareDatabase("Full", (respond) => {
+      console.log(respond)
+      readFile(licPath, 'base64').then((res) => {
+        this.setState({ fullName: "Initializing..." })
+        DocumentReader.initializeReader({
+          license: res,
+          delayedNNLoad: true
+        }, (respond) => {
+          console.log(respond)
+          DocumentReader.isRFIDAvailableForUse((canRfid) => {
+            if (canRfid) {
+              this.setState({ canRfid: true, rfidUIHeader: "Reading RFID", rfidDescription: "Place your phone on top of the NFC tag", rfidUIHeaderColor: "black" })
+              this.setState({ canRfidTitle: '' })
+            }
+          }, error => console.log(error))
+          DocumentReader.getAvailableScenarios((jstring) => {
+            var scenariosTemp = JSON.parse(jstring)
+            var scenariosL = []
+            for (var i in scenariosTemp) {
+              scenariosL.push({
+                label: DocumentReaderScenario.fromJson(typeof scenariosTemp[i] === "string" ? JSON.parse(scenariosTemp[i]) : scenariosTemp[i]).name,
+                id: i
+              })
+            }
+            this.setState({ scenarios: scenariosL })
+            this.setState({ selectedScenario: this.state.scenarios[0]['label'] })
+            this.setState({ radio: null })
+            this.setState({
+              radio: < RadioGroup containerStyle={styles.radio}
+                radioButtons={this.state.scenarios}
+                onPress={
+                  (data) => {
+                    var selectedItem
+                    for (var index in data)
+                      if (data[index]['selected'])
+                        selectedItem = data[index]['label']
+                    this.setState({ selectedScenario: selectedItem })
+                  }
+                }
+              />
             })
+            DocumentReader.getDocumentReaderIsReady((isReady) => {
+              if (isReady) {
+                this.setState({ fullName: "Ready" })
+                DocumentReader.setRfidDelegate(Enum.RFIDDelegate.NO_PA, (r) => { }, error => console.log(error))
+                // addCertificates()
+              } else
+                this.setState({ fullName: "Failed" })
+            }, error => console.log(error))
+          }, error => console.log(error))
         }, error => console.log(error))
+      })
+    }, error => console.log(error))
 
-        this.state = {
-            fullName: "Please wait...",
-            doRfid: false,
-            canRfid: false,
-            canRfidTitle: '(unavailable)',
-            scenarios: [],
-            selectedScenario: "",
-            portrait: require('./images/portrait.png'),
-            docFront: require('./images/id.png'),
-            radio: < RadioGroup containerStyle = { styles.radio }
-            radioButtons = {
-                [{ label: 'Loading', id: 0 }] }
-            onPress = { null }
-            />
-        }
+    this.state = {
+      fullName: "Please wait...",
+      doRfid: false,
+      isReadingRfidCustomUi: false,
+      canRfid: false,
+      canRfidTitle: '(unavailable)',
+      scenarios: [],
+      selectedScenario: "",
+      portrait: require('./images/portrait.png'),
+      docFront: require('./images/id.png'),
+      radio: < RadioGroup containerStyle={styles.radio}
+        radioButtons={
+          [{ label: 'Loading', id: 0 }]}
+        onPress={null}
+      />
     }
+  }
 
-    handleCompletion(completion) {
-        if (this.state.isReadingRfid && (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR))
-            this.hideRfidUI()
-        if (this.state.isReadingRfid && completion.action === Enum.DocReaderAction.NOTIFICATION)
-            this.updateRfidUI(completion.results.documentReaderNotification)
-        if (completion.action === Enum.DocReaderAction.COMPLETE)
-            if (this.state.isReadingRfid)
-                if (completion.results.rfidResult !== 1)
-                    this.restartRfidUI()
-                else {
-                    this.hideRfidUI()
-                    this.displayResults(completion.results)
-                }
-        else
-            this.handleResults(completion.results)
-    }
+  handleCompletion(completion) {
+    if (this.state.isReadingRfidCustomUi && (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR))
+      this.hideRfidUI()
+    if (this.state.isReadingRfidCustomUi && completion.action === Enum.DocReaderAction.NOTIFICATION)
+      this.updateRfidUI(completion.results.documentReaderNotification)
+    if (completion.action === Enum.DocReaderAction.COMPLETE)
+      if (this.state.isReadingRfidCustomUi)
+        if (completion.results.rfidResult !== 1)
+          this.restartRfidUI()
+        else {
+          this.hideRfidUI()
+          this.displayResults(completion.results)
+        }
+      else
+        this.handleResults(completion.results)
+    if (completion.action === Enum.DocReaderAction.TIMEOUT)
+      this.handleResults(completion.results)
+    if (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR)
+      isReadingRfid = false
+  }
 
-    showRfidUI() {
-        // show animation
-        this.setState({ isReadingRfid: true })
-    }
+  showRfidUI() {
+    // show animation
+    this.setState({ isReadingRfidCustomUi: true })
+  }
 
-    hideRfidUI() {
-        // show animation
-        this.restartRfidUI()
-        this.setState({ isReadingRfid: false, rfidUIHeader: "Reading RFID", rfidUIHeaderColor: "black" })
-    }
+  hideRfidUI() {
+    // show animation
+    this.restartRfidUI()
+    this.setState({ isReadingRfidCustomUi: false, rfidUIHeader: "Reading RFID", rfidUIHeaderColor: "black" })
+  }
 
-    restartRfidUI() {
-        this.setState({ rfidUIHeaderColor: "red", rfidUIHeader: "Failed!", rfidDescription: "Place your phone on top of the NFC tag", rfidProgress: -1 })
-    }
+  restartRfidUI() {
+    this.setState({ rfidUIHeaderColor: "red", rfidUIHeader: "Failed!", rfidDescription: "Place your phone on top of the NFC tag", rfidProgress: -1 })
+  }
 
-    updateRfidUI(results) {
-        if (results.code === Enum.eRFID_NotificationCodes.RFID_NOTIFICATION_PCSC_READING_DATAGROUP)
-            this.setState({ rfidDescription: Enum.eRFID_DataFile_Type.getTranslation(results.number) })
-        this.setState({ rfidUIHeader: "Reading RFID", rfidUIHeaderColor: "black", rfidProgress: results.value / 100 })
-        if (Platform.OS === 'ios')
-            DocumentReader.setRfidSessionStatus(this.state.rfidDescription + "\n" + results.value + "%", e => {}, e => {})
-    }
+  updateRfidUI(results) {
+    if (results.code === Enum.eRFID_NotificationCodes.RFID_NOTIFICATION_PCSC_READING_DATAGROUP)
+      this.setState({ rfidDescription: Enum.eRFID_DataFile_Type.getTranslation(results.number) })
+    this.setState({ rfidUIHeader: "Reading RFID", rfidUIHeaderColor: "black", rfidProgress: results.value / 100 })
+    if (Platform.OS === 'ios')
+      DocumentReader.setRfidSessionStatus(this.state.rfidDescription + "\n" + results.value + "%", e => { }, e => { })
+  }
 
-    clearResults() {
-        this.setState({ fullName: "Ready", docFront: require('./images/id.png'), portrait: require('./images/portrait.png') })
-    }
+  clearResults() {
+    this.setState({ fullName: "Ready", docFront: require('./images/id.png'), portrait: require('./images/portrait.png') })
+  }
 
-    displayResults(results) {
-        this.setState({ fullName: results.getTextFieldValueByType({ fieldType: Enum.eVisualFieldType.FT_SURNAME_AND_GIVEN_NAMES }) })
-        if (results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE }) != null)
-            this.setState({ docFront: { uri: "data:image/png;base64," + results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE }) } })
-        if (results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_PORTRAIT }) != null)
-            this.setState({ portrait: { uri: "data:image/png;base64," + results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_PORTRAIT }) } })
-    }
+  displayResults(results) {
+    if(results == null) return
+    this.setState({ fullName: results.getTextFieldValueByType({ fieldType: Enum.eVisualFieldType.FT_SURNAME_AND_GIVEN_NAMES }) })
+    if (results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE }) != null)
+      this.setState({ docFront: { uri: "data:image/png;base64," + results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE }) } })
+    if (results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_PORTRAIT }) != null)
+      this.setState({ portrait: { uri: "data:image/png;base64," + results.getGraphicFieldImageByType({ fieldType: Enum.eGraphicFieldType.GF_PORTRAIT }) } })
+  }
 
-    customRFID() {
-        this.showRfidUI()
-        DocumentReader.readRFID(e => {}, e => {})
-    }
+  customRFID() {
+    this.showRfidUI()
+    DocumentReader.readRFID(e => { }, e => { })
+  }
 
-    usualRFID() {
-        this.setState({ doRfid: false })
-        DocumentReader.startRFIDReader(e => {}, e => {})
-    }
+  usualRFID() {
+    isReadingRfid = true
+    DocumentReader.startRFIDReader(e => { }, e => { })
+  }
 
-    handleResults(results) {
-        if (this.state.doRfid && results != null && results.chipPage != 0) {
-            accessKey = null
-            accessKey = results.getTextFieldValueByType(Enum.eVisualFieldType.FT_MRZ_STRINGS)
-            if (accessKey != null && accessKey != "") {
-                accessKey = accessKey.replace(/^/g, '').replace(/\n/g, '')
-                DocumentReader.setRfidScenario({
-                    mrz: accessKey,
-                    pacePasswordType: Enum.eRFID_Password_Type.PPT_MRZ,
-                }, e => {}, error => console.log(error))
-            } else {
-                accessKey = null
-                accessKey = results.getTextFieldValueByType(159)
-                if (accessKey != null && accessKey != "") {
-                    DocumentReader.setRfidScenario({
-                        password: accessKey,
-                        pacePasswordType: Enum.eRFID_Password_Type.PPT_CAN,
-                    }, e => {}, error => console.log(error))
-                }
-            }
-            // this.customRFID()
-            this.usualRFID()
-        } else
-            this.displayResults(results)
+  handleResults(results) {
+    if (this.state.doRfid && !isReadingRfid && results != null && results.chipPage != 0) {
+      // this.customRFID()
+      this.usualRFID()
+    } else {
+      isReadingRfid = false
+      this.displayResults(results)
     }
+  }
 
   render() {
     return (
       <View style={styles.container}>
-        {(this.state.isReadingRfid && Platform.OS === 'android') && <View style={styles.container}>
+        {(this.state.isReadingRfidCustomUi && Platform.OS === 'android') && <View style={styles.container}>
           <Text style={{ paddingBottom: 30, fontSize: 23, color: this.state.rfidUIHeaderColor }}>{this.state.rfidUIHeader}</Text>
           <Text style={{ paddingBottom: 50, fontSize: 20 }}>{this.state.rfidDescription}</Text>
           <Progress.Bar width={200} useNativeDriver={true} color="#4285F4" progress={this.state.rfidProgress} />
@@ -215,7 +210,8 @@ export default class App extends Component {
           </TouchableOpacity>
         </View>
         }
-        {!this.state.isReadingRfid && <View style={styles.container}>
+        {!this.state.isReadingRfidCustomUi && <View style={styles.container}>
+        <Text/><Text/>
           <Text style={{
             top: 1,
             left: 1,
@@ -275,7 +271,13 @@ export default class App extends Component {
               }}
               disabled={!this.state.canRfid}
             />
-            <Text style={{ padding: 5 }}>
+            <Text
+              style={{ padding: 5 }}
+              onPress={() => {
+                if (this.state.canRfid) {
+                  this.setState({ doRfid: !this.state.doRfid })
+                }
+              }}>
               {'Process rfid reading' + this.state.canRfidTitle}
             </Text>
           </View>

package/example/android/app/build.gradle

@@ -15,14 +15,8 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
-
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
     defaultConfig {
         applicationId "com.regula.dr.fullrfid"
         minSdkVersion rootProject.ext.minSdkVersion

package/example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.regula.dr.fullrfid">
 
+  <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+  <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.NFC" />
 

package/example/android/build.gradle

@@ -1,19 +1,17 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
-        ndkVersion = "21.4.7075529"
+        compileSdkVersion = 33
+        targetSdkVersion = 33
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath('com.android.tools.build:gradle:7.2.2')
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -21,13 +19,10 @@ allprojects {
     repositories {
         mavenCentral()
         mavenLocal()
-
         maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
         }
         maven {
-            // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 

package/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/example/ios/Podfile

@@ -20,5 +20,13 @@ target 'DocumentReader' do
   post_install do |installer|
     react_native_post_install(installer)
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
+
+    installer.pods_project.targets.each do |target|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+            config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end
   end
 end

package/example/metro.config.js

@@ -1,10 +1,8 @@
-/**
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- * @format
- */
-
+const path = require('path');
+const folders = [
+  "../",
+  path.resolve(path.join(__dirname, './node_modules'))
+];
 module.exports = {
   transformer: {
     getTransformOptions: async () => ({
@@ -14,4 +12,8 @@ module.exports = {
       },
     }),
   },
-};
+  resolver: {
+    nodeModulesPaths: folders
+  },
+  watchFolders: folders,
+};

package/example/package.json

@@ -10,8 +10,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "^6.4.0",
-    "@regulaforensics/react-native-document-reader-core-fullrfid": "^6.4.0",
+    "@regulaforensics/react-native-document-reader-api": "6.6.0",
+    "@regulaforensics/react-native-document-reader-core-fullrfid": "6.6.0",
     "react": "17.0.2",
     "react-native": "^0.67.0",
     "react-native-check-box": "^2.1.7",