6.7.4

Author: Jenkins

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

@@ -493,11 +493,8 @@ private void startForegroundDispatch(final Activity activity) {
                 new String[]{"android.nfc.tech.IsoDep"}
         };
         Intent intent = new Intent(activity.getApplicationContext(), activity.getClass());
-        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        int flags = 0;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            flags = PendingIntent.FLAG_IMMUTABLE;
-        PendingIntent pendingIntent = PendingIntent.getActivity(activity.getApplicationContext(), 0, intent, flags);
+        int flag = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE : 0;
+        PendingIntent pendingIntent = PendingIntent.getActivity(activity.getApplicationContext(), 0, intent, flag);
         NfcAdapter.getDefaultAdapter(getActivity()).enableForegroundDispatch(activity, pendingIntent, filters, techList);
     }
 

example/App.js

@@ -107,6 +107,7 @@ export default class App extends Component {
       fullName: "Please wait...",
       doRfid: false,
       isReadingRfidCustomUi: false,
+      rfidProgress: -1,
       canRfid: false,
       canRfidTitle: '(unavailable)',
       scenarios: [],
@@ -158,7 +159,9 @@ export default class App extends Component {
   updateRfidUI(results) {
     if (results.code === Enum.eRFID_NotificationCodes.RFID_NOTIFICATION_PCSC_READING_DATAGROUP)
       this.setState({ rfidDescription: Enum.eRFID_DataFile_Type.getTranslation(results.dataFileType) })
-    this.setState({ rfidUIHeader: "Reading RFID", rfidUIHeaderColor: "black", rfidProgress: results.value / 100 })
+    this.setState({ rfidUIHeader: "Reading RFID", rfidUIHeaderColor: "black" })
+    if (results.value != null)
+      this.setState({ rfidProgress: results.value / 100 })
     if (Platform.OS === 'ios')
       DocumentReader.setRfidSessionStatus(this.state.rfidDescription + "\n" + results.value + "%", e => { }, e => { })
   }
@@ -168,19 +171,19 @@ export default class App extends Component {
   }
 
   displayResults(results) {
-    if(results == null) return
+    if (results == null) return
 
     results.textFieldValueByType(Enum.eVisualFieldType.FT_SURNAME_AND_GIVEN_NAMES, (value) => {
       this.setState({ fullName: value })
     }, error => console.log(error))
 
     results.graphicFieldImageByType(Enum.eGraphicFieldType.GF_DOCUMENT_IMAGE, (value) => {
-      if(value != null && value != "")
+      if (value != null && value != "")
         this.setState({ docFront: { uri: "data:image/png;base64," + value } })
     }, error => console.log(error))
 
     results.graphicFieldImageByType(Enum.eGraphicFieldType.GF_PORTRAIT, (value) => {
-      if(value != null && value != "")
+      if (value != null && value != "")
         this.setState({ portrait: { uri: "data:image/png;base64," + value } })
     }, error => console.log(error))
   }
@@ -208,7 +211,7 @@ export default class App extends Component {
   render() {
     return (
       <View style={styles.container}>
-        {(this.state.isReadingRfidCustomUi && Platform.OS === 'android') && <View style={styles.container}>
+        {(this.state.isReadingRfidCustomUi) && <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} />
@@ -218,7 +221,7 @@ export default class App extends Component {
         </View>
         }
         {!this.state.isReadingRfidCustomUi && <View style={styles.container}>
-        <Text/><Text/>
+          <Text /><Text />
           <Text style={{
             top: 1,
             left: 1,

example/package.json

@@ -10,7 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "6.7.3",
+    "@regulaforensics/react-native-document-reader-api": "6.7.4",
     "@regulaforensics/react-native-document-reader-core-fullrfid": "6.7.0",
     "react": "17.0.2",
     "react-native": "^0.67.0",

ios/RGLWJSONConstructor.m

@@ -201,7 +201,7 @@ +(NSMutableDictionary*)generateCompletion:(NSInteger)action :(RGLDocumentReaderR
             break;
         case 999:
             result[@"results"] = [self generateResultsWithRFID :results :1];
-            action = 1;
+            action = 0;
             break;
         default:
             break;

ios/RNRegulaDocumentReader.m

@@ -13,26 +13,26 @@
 RFIDDelegateNoPA* rfidDelegateNoPA;
 typedef void (^RGLRFIDSignatureCallback)(NSData *signature);
 RGLRFIDSignatureCallback taSignatureCompletion;
-RNRegulaDocumentReader* plugin;
+RNRegulaDocumentReader* documentReaderPlugin;
 
 @implementation RFIDDelegateNoPA
 
 - (void)onRequestTACertificatesWithKey:(NSString *)keyCAR callback:(RGLRFIDCertificatesCallback)callback {
     taCertificateCompletion = callback;
-    [plugin sendEventWithName:taCertificateCompletionEvent body:@{@"msg": keyCAR}];
+    [documentReaderPlugin sendEventWithName:taCertificateCompletionEvent body:@{@"msg": keyCAR}];
 }
 
 - (void)onRequestTASignatureWithChallenge:(RGLTAChallenge *)challenge callback:(void(^)(NSData *signature))callback {
     taSignatureCompletion = callback;
-    [plugin sendEventWithName:taSignatureCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRGLTAChallenge:challenge]]}];
+    [documentReaderPlugin sendEventWithName:taSignatureCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRGLTAChallenge:challenge]]}];
 }
 
 - (void)didChipConnected {
-    [plugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletion:1]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
+    [documentReaderPlugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletion:1]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
 }
 
 - (void)didReceivedError:(RGLRFIDErrorCodes)errorCode {
-    [plugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletionWithError:2:errorCode]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
+    [documentReaderPlugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletionWithError:2:errorCode]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
 }
 
 @end
@@ -120,15 +120,15 @@ - (void)onRequestTASignatureWithChallenge:(RGLTAChallenge *)challenge callback:(
 }
 
 - (void)didChipConnected {
-    [plugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletion:1]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
+    [documentReaderPlugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletion:1]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
 }
 
 - (void)didReceivedError:(RGLRFIDErrorCodes)errorCode {
-    [plugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletionWithError:2:errorCode]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
+    [documentReaderPlugin sendEventWithName:rfidNotificationCompletionEvent body:@{@"msg": [RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateRfidNotificationCompletionWithError:2:errorCode]]}]; // int RFID_EVENT_CHIP_DETECTED = 1;
 }
 
 RCT_EXPORT_METHOD(exec:(NSString*)moduleName:(NSString*)action:(NSArray*)args:(RCTResponseSenderBlock)sCallback:(RCTResponseSenderBlock)eCallback) {
-    plugin = self;
+    documentReaderPlugin = self;
     Callback successCallback = ^(NSString* response){
         sCallback(@[response]);
     };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/react-native-document-reader-api",
-  "version": "6.7.3",
+  "version": "6.7.4",
   "description": "React Native module for reading and validation of identification documents (API framework)",
   "main": "index.js",
   "scripts": {