react-native-nfc-manager 3.13.0 → 3.13.1

package/android/src/main/java/community/revteltech/nfc/MifareUtil.java

@@ -49,7 +49,7 @@ class MifareUtil {
 		// able of reading/writing MIFARE Classic tags. I don't know why...
 		// https://github.com/ikarus23/MifareClassicTool/issues/152
 		boolean isLenovoP2 = Build.MANUFACTURER.equals("LENOVO")
-			&& Build.MODEL.equals("Lenovo P2a42");
+				&& Build.MODEL.equals("Lenovo P2a42");
 		File device = new File("/dev/bcm2079x-i2c");
 		if (!isLenovoP2 && device.exists()) {
 			return false;
@@ -70,8 +70,8 @@ class MifareUtil {
 		File[] libs = libsFolder.listFiles();
 		for (File lib : libs) {
 			if (lib.isFile()
-				&& lib.getName().startsWith("libnfc")
-				&& lib.getName().contains("brcm")
+					&& lib.getName().startsWith("libnfc")
+					&& lib.getName().contains("brcm")
 				// Add here other non NXP NFC libraries.
 			) {
 				return false;

package/android/src/main/java/community/revteltech/nfc/NfcManager.java

@@ -646,27 +646,27 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     @ReactMethod
     public void connect(ReadableArray techs, Callback callback){
         synchronized(this) {
-          try {
-            techRequest = new TagTechnologyRequest(techs.toArrayList(), callback);
-            techRequest.connect(this.tag);
-            callback.invoke(null, null);
-            return;
-          } catch (Exception ex) {
-              callback.invoke(ex.toString());
-          }
+            try {
+                techRequest = new TagTechnologyRequest(techs.toArrayList(), callback);
+                techRequest.connect(this.tag);
+                callback.invoke(null, null);
+                return;
+            } catch (Exception ex) {
+                callback.invoke(ex.toString());
+            }
         }
     }
 
     @ReactMethod
     public void close(Callback callback){
         synchronized(this) {
-          try {
-            techRequest.close();
-            callback.invoke(null, null);
-            return;
-          } catch (Exception ex) {
-            callback.invoke(ex.toString());
-          }
+            try {
+                techRequest.close();
+                callback.invoke(null, null);
+                return;
+            } catch (Exception ex) {
+                callback.invoke(ex.toString());
+            }
         }
     }
 
@@ -1107,7 +1107,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
         int flag = 0;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-          flag = PendingIntent.FLAG_MUTABLE;
+            flag = PendingIntent.FLAG_MUTABLE;
         }
         return PendingIntent.getActivity(activity, 0, intent, flag);
     }

package/android/src/main/java/community/revteltech/nfc/Util.java

@@ -39,9 +39,9 @@ public class Util {
                 // mTag.getTagService(); of the Ndef object sometimes returns null
                 // see http://issues.mroland.at/index.php?do=details&task_id=47
                 try {
-                  json.put("canMakeReadOnly", ndef.canMakeReadOnly());
+                    json.put("canMakeReadOnly", ndef.canMakeReadOnly());
                 } catch (NullPointerException e) {
-                  json.put("canMakeReadOnly", JSONObject.NULL);
+                    json.put("canMakeReadOnly", JSONObject.NULL);
                 }
             } catch (JSONException e) {
                 Log.e(TAG, "Failed to convert ndef into json: " + ndef.toString(), e);
@@ -104,16 +104,16 @@ public class Util {
     }
 
     public static String bytesToHex(byte[] bytes) {
-      char[] hexChars = new char[bytes.length * 2];
+        char[] hexChars = new char[bytes.length * 2];
 
-      for ( int j = 0; j < bytes.length; j++ ) {
-          int v = bytes[j] & 0xFF;
+        for ( int j = 0; j < bytes.length; j++ ) {
+            int v = bytes[j] & 0xFF;
 
-          hexChars[j * 2] = hexArray[v >>> 4];
-          hexChars[j * 2 + 1] = hexArray[v & 0x0F];
-      }
+            hexChars[j * 2] = hexArray[v >>> 4];
+            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+        }
 
-      return new String(hexChars);
+        return new String(hexChars);
     }
 
     static byte[] jsonToByteArray(JSONArray json) throws JSONException {

package/ios/NfcManager.h

@@ -30,3 +30,8 @@
         #endif
 
 @end
+
+extern NSString* _Nonnull getHexString(NSData * _Nonnull);
+extern NSString* _Nonnull getErrorMessage(NSError * _Nonnull);
+extern NSData * _Nonnull arrayToData(NSArray * _Nonnull);
+extern NSArray * _Nonnull dataToArray(NSData * _Nonnull);

package/ios/NfcManager.m

@@ -4,29 +4,6 @@
 #import "React/RCTEventDispatcher.h"
 #import "React/RCTLog.h"
 
-NSString* getHexString(NSData *data) {
-    NSUInteger capacity = data.length * 2;
-    NSMutableString *sbuf = [NSMutableString stringWithCapacity:capacity];
-    const unsigned char *buf = data.bytes;
-    NSInteger i;
-    for (i=0; i<data.length; ++i) {
-        [sbuf appendFormat:@"%02lX", (unsigned long)buf[i]];
-    }
-    return sbuf;
-}
-
-NSString* getErrorMessage(NSError *error) {
-     NSDictionary *userInfo = [error userInfo];
-     NSError *underlyingError = [userInfo objectForKey:NSUnderlyingErrorKey];
-    if (underlyingError != nil) {
-        return [NSString stringWithFormat:@"%@:%ld,%@:%ld",
-                [error domain], (long)[error code],
-                [underlyingError domain], (long)[underlyingError code]];
-    }
-    return [NSString stringWithFormat:@"%@:%ld",
-            [error domain], (long)[error code]];
-}
-
 @implementation NfcManager {
     NSDictionary *nfcTechTypes;
     NSArray *techRequestTypes;
@@ -37,7 +14,6 @@ RCT_EXPORT_MODULE()
 
 @synthesize session;
 @synthesize tagSession;
-@synthesize bridge = _bridge;
 
 static NSString *const kBgNfcTagNotification = @"RNBgNfcTagNotification";
 NSArray * bgNdefRecords = nil;
@@ -112,38 +88,12 @@ continueUserActivity:(NSUserActivity *)userActivity
              ];
 }
 
-- (NSData *)arrayToData: (NSArray *) array
-{
-  Byte bytes[[array count]];
-  for (int i = 0; i < [array count]; i++) {
-    bytes[i] = [[array objectAtIndex:i] integerValue];
-  }
-  NSData *payload = [[NSData alloc] initWithBytes:bytes length:[array count]];
-  return payload;
-}
-
-+ (NSArray *)dataToArray:(NSData *)data
-{
-    const unsigned char *dataBuffer = data ? (const unsigned char *)[data bytes] : NULL;
-    
-    if (!dataBuffer)
-        return @[];
-    
-    NSUInteger          dataLength  = [data length];
-    NSMutableArray     *array  = [NSMutableArray arrayWithCapacity:dataLength];
-    
-    for (int i = 0; i < dataLength; ++i)
-        [array addObject:[NSNumber numberWithInteger:dataBuffer[i]]];
-    
-    return array;
-}
-
 + (NSDictionary*)convertNdefRecord:(NFCNDEFPayload *) record
 {
     return @{
-             @"id": [self dataToArray:[record identifier]],
-             @"payload": [self dataToArray: [record payload]],
-             @"type": [self dataToArray:[record type]],
+             @"id": dataToArray([record identifier]),
+             @"payload": dataToArray([record payload]),
+             @"type": dataToArray([record type]),
              @"tnf": [NSNumber numberWithInt:[record typeNameFormat]]
              };
 }
@@ -179,13 +129,13 @@ continueUserActivity:(NSUserActivity *)userActivity
             id<NFCISO7816Tag> iso7816Tag = [tag asNFCISO7816Tag];
             [tagInfo setObject:getHexString(iso7816Tag.identifier) forKey:@"id"];
             [tagInfo setObject:iso7816Tag.initialSelectedAID forKey:@"initialSelectedAID"];
-            [tagInfo setObject:[NfcManager dataToArray:iso7816Tag.historicalBytes] forKey:@"historicalBytes"];
-            [tagInfo setObject:[NfcManager dataToArray:iso7816Tag.applicationData] forKey:@"applicationData"];
+            [tagInfo setObject:dataToArray(iso7816Tag.historicalBytes) forKey:@"historicalBytes"];
+            [tagInfo setObject:dataToArray(iso7816Tag.applicationData) forKey:@"applicationData"];
         } else if (tag.type == NFCTagTypeISO15693) {
             id<NFCISO15693Tag> iso15693Tag = [tag asNFCISO15693Tag];
             [tagInfo setObject:getHexString(iso15693Tag.identifier) forKey:@"id"];
             [tagInfo setObject:[NSNumber numberWithUnsignedInteger:iso15693Tag.icManufacturerCode] forKey:@"icManufacturerCode"];
-            [tagInfo setObject:[NfcManager dataToArray:iso15693Tag.icSerialNumber] forKey:@"icSerialNumber"];
+            [tagInfo setObject:dataToArray(iso15693Tag.icSerialNumber) forKey:@"icSerialNumber"];
         } else if (tag.type == NFCTagTypeFeliCa) {
             id<NFCFeliCaTag> felicaTag = [tag asNFCFeliCaTag];
             [tagInfo setObject:getHexString(felicaTag.currentIDm) forKey:@"idm"];
@@ -196,18 +146,17 @@ continueUserActivity:(NSUserActivity *)userActivity
     return tagInfo;
 }
 
-- (id<NFCNDEFTag>)getNDEFTagHandle:(id<NFCTag>)tag {
+- (id<NFCNDEFTag>)getNDEFTagHandle:(id<NFCTag>)tag
+    API_AVAILABLE(ios(13.0)) {
     // all following types inherite from NFCNDEFTag
-    if (@available(iOS 13.0, *)) {
-        if (tag.type == NFCTagTypeMiFare) {
-            return [tag asNFCMiFareTag];
-        } else if (tag.type == NFCTagTypeISO7816Compatible) {
-            return [tag asNFCISO7816Tag];
-        } else if (tag.type == NFCTagTypeISO15693) {
-            return [tag asNFCISO15693Tag];
-        } else if (tag.type == NFCTagTypeFeliCa) {
-            return [tag asNFCFeliCaTag];
-        }
+    if (tag.type == NFCTagTypeMiFare) {
+        return [tag asNFCMiFareTag];
+    } else if (tag.type == NFCTagTypeISO7816Compatible) {
+        return [tag asNFCISO7816Tag];
+    } else if (tag.type == NFCTagTypeISO15693) {
+        return [tag asNFCISO15693Tag];
+    } else if (tag.type == NFCTagTypeFeliCa) {
+        return [tag asNFCFeliCaTag];
     }
 
     return nil;
@@ -235,31 +184,29 @@ continueUserActivity:(NSUserActivity *)userActivity
 }
 
 - (void)tagReaderSession:(NFCTagReaderSession *)session didDetectTags:(NSArray<__kindof id<NFCTag>> *)tags
-{
+    API_AVAILABLE(ios(13.0)) {
     NSLog(@"NFCTag didDetectTags");
-    if (@available(iOS 13.0, *)) {
-        if (techRequestCallback != nil) {
-            for (id<NFCTag> tag in tags) {
-                NSString * tagType = [self getRNTechName:tag];
-                
-                for (NSString* requestType in techRequestTypes) {
-                    // here we treat Ndef is a special case, because all specific tech types
-                    // inherites from NFCNDEFTag, so we simply allow it to connect
-                    if ([tagType isEqualToString:requestType] || [requestType isEqualToString:@"Ndef"]) {
-                        RCTResponseSenderBlock pendingCallback = techRequestCallback;
-                        techRequestCallback = nil;
-
-                        [tagSession connectToTag:tag
-                               completionHandler:^(NSError *error) {
-                            if (error != nil) {
-                                pendingCallback(@[getErrorMessage(error)]);
-                                return;
-                            }
-                            
-                            pendingCallback(@[[NSNull null], requestType]);
-                        }];
-                        return;
-                    }
+    if (techRequestCallback != nil) {
+        for (id<NFCTag> tag in tags) {
+            NSString * tagType = [self getRNTechName:tag];
+            
+            for (NSString* requestType in techRequestTypes) {
+                // here we treat Ndef is a special case, because all specific tech types
+                // inherites from NFCNDEFTag, so we simply allow it to connect
+                if ([tagType isEqualToString:requestType] || [requestType isEqualToString:@"Ndef"]) {
+                    RCTResponseSenderBlock pendingCallback = techRequestCallback;
+                    techRequestCallback = nil;
+
+                    [tagSession connectToTag:tag
+                           completionHandler:^(NSError *error) {
+                        if (error != nil) {
+                            pendingCallback(@[getErrorMessage(error)]);
+                            return;
+                        }
+                        
+                        pendingCallback(@[[NSNull null], requestType]);
+                    }];
+                    return;
                 }
             }
         }
@@ -267,7 +214,7 @@ continueUserActivity:(NSUserActivity *)userActivity
 }
 
 - (void)tagReaderSession:(NFCTagReaderSession *)session didInvalidateWithError:(NSError *)error
-{
+    API_AVAILABLE(ios(13.0)) {
     NSLog(@"NFCTag didInvalidateWithError");
     if (techRequestCallback) {
         techRequestCallback(@[getErrorMessage(error)]);
@@ -280,7 +227,7 @@ continueUserActivity:(NSUserActivity *)userActivity
 }
 
 - (void)tagReaderSessionDidBecomeActive:(NFCTagReaderSession *)session
-{
+    API_AVAILABLE(ios(13.0)) {
     NSLog(@"NFCTag didBecomeActive");
 }
 
@@ -499,7 +446,7 @@ RCT_EXPORT_METHOD(writeNdefMessage:(NSArray*)bytes callback:(nonnull RCTResponse
         }
         
         if (ndefTag) {
-            NSData *data = [self arrayToData:bytes];
+            NSData *data = arrayToData(bytes);
             NFCNDEFMessage *ndefMsg = [NFCNDEFMessage ndefMessageWithData:data];
             if (!ndefMsg) {
                 callback(@[@"invalid ndef msg"]);
@@ -568,8 +515,8 @@ RCT_EXPORT_METHOD(queryNDEFStatus:(nonnull RCTResponseSenderBlock)callback)
                 } else {
                     callback(@[[NSNull null],
                                @{
-                                   @"status": [[NSNumber alloc] initWithInt:status],
-                                   @"capacity": [[NSNumber alloc] initWithInt:capacity]
+                                   @"status": [[NSNumber alloc] initWithInt:(int)status],
+                                   @"capacity": [[NSNumber alloc] initWithInt:(int)capacity]
                                }
                              ]);
                 }
@@ -591,7 +538,7 @@ RCT_EXPORT_METHOD(sendMifareCommand:(NSArray *)bytes callback: (nonnull RCTRespo
         if (tagSession != nil) {
             if (tagSession.connectedTag) {
                 id<NFCMiFareTag> mifareTag = [tagSession.connectedTag asNFCMiFareTag];
-                NSData *data = [self arrayToData:bytes];
+                NSData *data = arrayToData(bytes);
                 NSLog(@"input bytes: %@", getHexString(data));
                 if (mifareTag) {
                     [mifareTag sendMiFareCommand:data
@@ -599,7 +546,7 @@ RCT_EXPORT_METHOD(sendMifareCommand:(NSArray *)bytes callback: (nonnull RCTRespo
                         if (error) {
                             callback(@[getErrorMessage(error), [NSNull null]]);
                         } else {
-                            callback(@[[NSNull null], [NfcManager dataToArray:response]]);
+                            callback(@[[NSNull null], dataToArray(response)]);
                         }
                     }];
                     return;
@@ -622,7 +569,7 @@ RCT_EXPORT_METHOD(sendFelicaCommand:(NSArray *)bytes callback: (nonnull RCTRespo
         if (tagSession != nil) {
             if (tagSession.connectedTag) {
                 id<NFCFeliCaTag> felicaTag = [tagSession.connectedTag asNFCFeliCaTag];
-                NSData *data = [self arrayToData:bytes];
+                NSData *data = arrayToData(bytes);
                 NSLog(@"input bytes: %@", getHexString(data));
                 if (felicaTag) {
                     [felicaTag sendFeliCaCommandPacket:data
@@ -630,7 +577,7 @@ RCT_EXPORT_METHOD(sendFelicaCommand:(NSArray *)bytes callback: (nonnull RCTRespo
                         if (error) {
                             callback(@[getErrorMessage(error), [NSNull null]]);
                         } else {
-                            callback(@[[NSNull null], [NfcManager dataToArray:response]]);
+                            callback(@[[NSNull null], dataToArray(response)]);
                         }
                     }];
                     return;
@@ -653,14 +600,14 @@ RCT_EXPORT_METHOD(sendCommandAPDUBytes:(NSArray *)bytes callback: (nonnull RCTRe
         if (tagSession != nil) {
             if (tagSession.connectedTag) {
                 id<NFCISO7816Tag> iso7816Tag = [tagSession.connectedTag asNFCISO7816Tag];
-                NSData *data = [self arrayToData:bytes];
+                NSData *data = arrayToData(bytes);
                 NFCISO7816APDU *apdu = [[NFCISO7816APDU alloc] initWithData:data];
                 if (iso7816Tag) {
                     [iso7816Tag sendCommandAPDU:apdu completionHandler:^(NSData* response, uint8_t sw1, uint8_t sw2, NSError* error) {
                         if (error) {
                             callback(@[getErrorMessage(error), [NSNull null]]);
                         } else {
-                            callback(@[[NSNull null], [NfcManager dataToArray:response], [NSNumber numberWithInt:sw1], [NSNumber numberWithInt:sw2]]);
+                            callback(@[[NSNull null], dataToArray(response), [NSNumber numberWithInt:sw1], [NSNumber numberWithInt:sw2]]);
                         }
                     }];
                     return;
@@ -688,7 +635,7 @@ RCT_EXPORT_METHOD(sendCommandAPDU:(NSDictionary *)apduData callback: (nonnull RC
                 NSNumber *p1 = [apduData objectForKey:@"p1"];
                 NSNumber *p2 = [apduData objectForKey:@"p2"];
                 NSArray *dataArray = [apduData objectForKey:@"data"];
-                NSData *data = [self arrayToData:dataArray];
+                NSData *data = arrayToData(dataArray);
                 NSNumber *le = [apduData objectForKey:@"le"];
                 
                 /*
@@ -701,7 +648,7 @@ RCT_EXPORT_METHOD(sendCommandAPDU:(NSDictionary *)apduData callback: (nonnull RC
                         if (error) {
                             callback(@[getErrorMessage(error), [NSNull null]]);
                         } else {
-                            callback(@[[NSNull null], [NfcManager dataToArray:response], [NSNumber numberWithInt:sw1], [NSNumber numberWithInt:sw2]]);
+                            callback(@[[NSNull null], dataToArray(response), [NSNumber numberWithInt:sw1], [NSNumber numberWithInt:sw2]]);
                         }
                     }];
                     return;
@@ -758,7 +705,7 @@ RCT_EXPORT_METHOD(isTagSessionAvailable:(nonnull RCTResponseSenderBlock)callback
 // ---------------------------
 RCT_EXPORT_METHOD(iso15693_getSystemInfo:(nonnull NSNumber *)flags callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -794,7 +741,7 @@ RCT_EXPORT_METHOD(iso15693_getSystemInfo:(nonnull NSNumber *)flags callback:(non
 
 RCT_EXPORT_METHOD(iso15693_readSingleBlock:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -817,7 +764,7 @@ RCT_EXPORT_METHOD(iso15693_readSingleBlock:(NSDictionary *)options callback:(non
                 return;
             }
             
-            callback(@[[NSNull null], [NfcManager dataToArray:resp]]);
+            callback(@[[NSNull null], dataToArray(resp)]);
         }];
     } else {
         callback(@[@"Not support in this device", [NSNull null]]);
@@ -826,7 +773,7 @@ RCT_EXPORT_METHOD(iso15693_readSingleBlock:(NSDictionary *)options callback:(non
 
 RCT_EXPORT_METHOD(iso15693_readMultipleBlocks:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -853,7 +800,7 @@ RCT_EXPORT_METHOD(iso15693_readMultipleBlocks:(NSDictionary *)options callback:(
             }
             NSMutableArray *blocks = [NSMutableArray arrayWithCapacity:[dataBlocks count]];
             [dataBlocks enumerateObjectsUsingBlock:^(NSData *blockData, NSUInteger idx, BOOL *stop) {
-                [blocks addObject:[NfcManager dataToArray:blockData]];
+                [blocks addObject:dataToArray(blockData)];
             }];
             callback(@[[NSNull null], blocks]);
         }];
@@ -864,7 +811,7 @@ RCT_EXPORT_METHOD(iso15693_readMultipleBlocks:(NSDictionary *)options callback:(
 
 RCT_EXPORT_METHOD(iso15693_writeSingleBlock:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -878,7 +825,7 @@ RCT_EXPORT_METHOD(iso15693_writeSingleBlock:(NSDictionary *)options callback:(no
 
         RequestFlag flags = [[options objectForKey:@"flags"] unsignedIntValue];
         uint8_t blockNumber = [[options objectForKey:@"blockNumber"] unsignedIntValue];
-        NSData *dataBlock = [self arrayToData:[options mutableArrayValueForKey:@"dataBlock"]];
+        NSData *dataBlock = arrayToData([options mutableArrayValueForKey:@"dataBlock"]);
         
         [tag writeSingleBlockWithRequestFlags:flags
                                   blockNumber:blockNumber
@@ -898,7 +845,7 @@ RCT_EXPORT_METHOD(iso15693_writeSingleBlock:(NSDictionary *)options callback:(no
 
 RCT_EXPORT_METHOD(iso15693_lockBlock:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -930,7 +877,7 @@ RCT_EXPORT_METHOD(iso15693_lockBlock:(NSDictionary *)options callback:(nonnull R
 
 RCT_EXPORT_METHOD(iso15693_writeAFI:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -962,7 +909,7 @@ RCT_EXPORT_METHOD(iso15693_writeAFI:(NSDictionary *)options callback:(nonnull RC
 
 RCT_EXPORT_METHOD(iso15693_lockAFI:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -992,7 +939,7 @@ RCT_EXPORT_METHOD(iso15693_lockAFI:(NSDictionary *)options callback:(nonnull RCT
 
 RCT_EXPORT_METHOD(iso15693_writeDSFID:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1024,7 +971,7 @@ RCT_EXPORT_METHOD(iso15693_writeDSFID:(NSDictionary *)options callback:(nonnull
 
 RCT_EXPORT_METHOD(iso15693_lockDSFID:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1055,7 +1002,7 @@ RCT_EXPORT_METHOD(iso15693_lockDSFID:(NSDictionary *)options callback:(nonnull R
 
 RCT_EXPORT_METHOD(iso15693_resetToReady:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1085,7 +1032,7 @@ RCT_EXPORT_METHOD(iso15693_resetToReady:(NSDictionary *)options callback:(nonnul
 
 RCT_EXPORT_METHOD(iso15693_select:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1115,7 +1062,7 @@ RCT_EXPORT_METHOD(iso15693_select:(NSDictionary *)options callback:(nonnull RCTR
 
 RCT_EXPORT_METHOD(iso15693_stayQuiet:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1142,7 +1089,7 @@ RCT_EXPORT_METHOD(iso15693_stayQuiet:(nonnull RCTResponseSenderBlock)callback)
 
 RCT_EXPORT_METHOD(iso15693_customCommand:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1156,7 +1103,7 @@ RCT_EXPORT_METHOD(iso15693_customCommand:(NSDictionary *)options callback:(nonnu
 
         RequestFlag flags = [[options objectForKey:@"flags"] unsignedIntValue];
         NSInteger customCommandCode = [[options objectForKey:@"customCommandCode"] integerValue];
-        NSData *customRequestParameters = [self arrayToData:[options mutableArrayValueForKey:@"customRequestParameters"]];
+        NSData *customRequestParameters = arrayToData([options mutableArrayValueForKey:@"customRequestParameters"]);
         
         [tag customCommandWithRequestFlag:flags
                         customCommandCode: customCommandCode
@@ -1167,7 +1114,7 @@ RCT_EXPORT_METHOD(iso15693_customCommand:(NSDictionary *)options callback:(nonnu
                 return;
             }
             
-            callback(@[[NSNull null], [NfcManager dataToArray:resp]]);
+            callback(@[[NSNull null], dataToArray(resp)]);
         }];
     } else {
         callback(@[@"Not support in this device", [NSNull null]]);
@@ -1190,7 +1137,7 @@ RCT_EXPORT_METHOD(iso15693_sendRequest:(NSDictionary *)options callback:(nonnull
         
         NSInteger flags = [[options objectForKey:@"flags"] integerValue];
         NSInteger commandCode = [[options objectForKey:@"commandCode"] integerValue];
-        NSData *data = [self arrayToData:[options mutableArrayValueForKey:@"data"]];
+        NSData *data = arrayToData([options mutableArrayValueForKey:@"data"]);
         
         [tag sendRequestWithFlag:flags
                      commandCode:commandCode
@@ -1200,7 +1147,7 @@ RCT_EXPORT_METHOD(iso15693_sendRequest:(NSDictionary *)options callback:(nonnull
                 callback(@[getErrorMessage(error), [NSNull null]]);
                 return;
             }
-            callback(@[[NSNull null], [NSNumber numberWithLong:responseFlag], [NfcManager dataToArray:resp]]);
+            callback(@[[NSNull null], [NSNumber numberWithLong:responseFlag], dataToArray(resp)]);
         }];
     } else {
         callback(@[@"Not support in this device", [NSNull null]]);
@@ -1209,7 +1156,7 @@ RCT_EXPORT_METHOD(iso15693_sendRequest:(NSDictionary *)options callback:(nonnull
 
 RCT_EXPORT_METHOD(iso15693_extendedReadSingleBlock:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1232,7 +1179,7 @@ RCT_EXPORT_METHOD(iso15693_extendedReadSingleBlock:(NSDictionary *)options callb
                 return;
             }
             
-            callback(@[[NSNull null], [NfcManager dataToArray:resp]]);
+            callback(@[[NSNull null], dataToArray(resp)]);
         }];
     } else {
         callback(@[@"Not support in this device", [NSNull null]]);
@@ -1241,7 +1188,7 @@ RCT_EXPORT_METHOD(iso15693_extendedReadSingleBlock:(NSDictionary *)options callb
 
 RCT_EXPORT_METHOD(iso15693_extendedWriteSingleBlock:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;
@@ -1255,7 +1202,7 @@ RCT_EXPORT_METHOD(iso15693_extendedWriteSingleBlock:(NSDictionary *)options call
 
         RequestFlag flags = [[options objectForKey:@"flags"] unsignedIntValue];
         uint16_t blockNumber = [[options objectForKey:@"blockNumber"] unsignedIntValue];
-        NSData *dataBlock = [self arrayToData:[options mutableArrayValueForKey:@"dataBlock"]];
+        NSData *dataBlock = arrayToData([options mutableArrayValueForKey:@"dataBlock"]);
         
         [tag extendedWriteSingleBlockWithRequestFlags:flags
                                   blockNumber:blockNumber
@@ -1275,7 +1222,7 @@ RCT_EXPORT_METHOD(iso15693_extendedWriteSingleBlock:(NSDictionary *)options call
 
 RCT_EXPORT_METHOD(iso15693_extendedLockBlock:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
 {
-    if (@available(iOS 13.0, *)) {
+    if (@available(iOS 14.0, *)) {
         if (!tagSession || !tagSession.connectedTag) {
             callback(@[@"Not connected", [NSNull null]]);
             return;

package/ios/Util.m

@@ -0,0 +1,55 @@
+//
+//  Util.m
+//  react-native-nfc-manager
+//
+//  Created by Richie Hsieh on 2022/1/27.
+//
+
+#import <Foundation/Foundation.h>
+
+NSString* getHexString(NSData *data) {
+    NSUInteger capacity = data.length * 2;
+    NSMutableString *sbuf = [NSMutableString stringWithCapacity:capacity];
+    const unsigned char *buf = data.bytes;
+    NSInteger i;
+    for (i=0; i<data.length; ++i) {
+        [sbuf appendFormat:@"%02lX", (unsigned long)buf[i]];
+    }
+    return sbuf;
+}
+
+NSString* getErrorMessage(NSError *error) {
+     NSDictionary *userInfo = [error userInfo];
+     NSError *underlyingError = [userInfo objectForKey:NSUnderlyingErrorKey];
+    if (underlyingError != nil) {
+        return [NSString stringWithFormat:@"%@:%ld,%@:%ld",
+                [error domain], (long)[error code],
+                [underlyingError domain], (long)[underlyingError code]];
+    }
+    return [NSString stringWithFormat:@"%@:%ld",
+            [error domain], (long)[error code]];
+}
+
+NSData * arrayToData(NSArray *array) {
+  Byte bytes[[array count]];
+  for (int i = 0; i < [array count]; i++) {
+    bytes[i] = [[array objectAtIndex:i] integerValue];
+  }
+  NSData *payload = [[NSData alloc] initWithBytes:bytes length:[array count]];
+  return payload;
+}
+
+NSArray * dataToArray(NSData *data) {
+    const unsigned char *dataBuffer = data ? (const unsigned char *)[data bytes] : NULL;
+    
+    if (!dataBuffer)
+        return @[];
+    
+    NSUInteger          dataLength  = [data length];
+    NSMutableArray     *array  = [NSMutableArray arrayWithCapacity:dataLength];
+    
+    for (int i = 0; i < dataLength; ++i)
+        [array addObject:[NSNumber numberWithInteger:dataBuffer[i]]];
+    
+    return array;
+}

package/ndef-lib/index.js

@@ -87,8 +87,8 @@ const ExtraTypeRecord = {
   androidApplicationRecord(packageName, id = []) {
     return PrimitiveRecord.externalTypeRecord(
       'android.com:pkg',
-      id,
       packageName,
+      id,
     );
   },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nfc-manager",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "description": "A NFC module for react native.",
   "main": "src/index.js",
   "repository": {