react-native-nfc-manager 3.13.0 → 3.13.3

package/CHANGELOG.md

@@ -0,0 +1,98 @@
+## [3.0.2](https://github.com/whitedogg13/react-native-nfc-manager/compare/v3.0.1...v3.0.2) (2021-02-22)
+
+
+### Features
+
+* **android:** allow requestTechnology resolves to tags even when tech ([8b7f862](https://github.com/whitedogg13/react-native-nfc-manager/commit/8b7f8629a8e46304f2a68d62f01e745047fe01dc))
+
+
+
+## [3.0.1](https://github.com/whitedogg13/react-native-nfc-manager/compare/v3.0.0...v3.0.1) (2021-02-20)
+
+
+### Bug Fixes
+
+* [#371](https://github.com/whitedogg13/react-native-nfc-manager/issues/371) missing MIFARE_BLOCK_SIZE for mifareClassicHandlerAndroid ([b136419](https://github.com/whitedogg13/react-native-nfc-manager/commit/b1364197c80ab16542bbb823483a2079a896e169))
+
+
+
+# [3.0.0](https://github.com/whitedogg13/react-native-nfc-manager/compare/v3.0.0-0...v3.0.0) (2021-02-18)
+
+
+### Features
+
+* expose RTD_URI_PROTOCOLS ([26516a7](https://github.com/whitedogg13/react-native-nfc-manager/commit/26516a7ce8309ade21464df13a8e5c799c0e417c))
+
+
+
+# [3.0.0-0](https://github.com/whitedogg13/react-native-nfc-manager/compare/v2.0.0-beta.1...v3.0.0-0) (2021-02-10)
+
+
+### Bug Fixes
+
+* disable 18092 polling (cause iOS freeze) ([64115f8](https://github.com/whitedogg13/react-native-nfc-manager/commit/64115f80f8cd93ed5ef3b01987d6c628a5a9127b))
+* **ios:** add polling for iso18092 ([b7984a5](https://github.com/whitedogg13/react-native-nfc-manager/commit/b7984a59ea27076d7fd34a2614592f468c80f5e1))
+* add callback type null possible ([1371533](https://github.com/whitedogg13/react-native-nfc-manager/commit/13715334ea908b89654b42eba4ec902bcc6f4229))
+* cancelTechnology might cause exception if there's a connected tag ([af2f1f9](https://github.com/whitedogg13/react-native-nfc-manager/commit/af2f1f92bbd7bfcf8c604db48b790289c3ca4946))
+* cancelTechnology might cause exception if there's a connected tag ([dcb26b8](https://github.com/whitedogg13/react-native-nfc-manager/commit/dcb26b85a955ce17ae633e00f6f189a895e8adcb))
+* getNdefMessage should use the same structure for platforms ([73859fb](https://github.com/whitedogg13/react-native-nfc-manager/commit/73859fbac8939277f1e7fc2ad13ececee8c9d4c7))
+* import NfcManager from new location ([c95cc76](https://github.com/whitedogg13/react-native-nfc-manager/commit/c95cc76a0a3b52c751c1a0f00895cf1b34b66b28))
+* ios isSupported ([adcc966](https://github.com/whitedogg13/react-native-nfc-manager/commit/adcc966c8ed4a565c2800fabc5e5a0cad07ea376))
+* promise won't be rejected when calling cancelTechnologyRequest in ([64c9cbd](https://github.com/whitedogg13/react-native-nfc-manager/commit/64c9cbd05e34e975fa4744727859efd08ea610bf))
+* reject tech request promise when native iOS cancel button is pressed ([7915b98](https://github.com/whitedogg13/react-native-nfc-manager/commit/7915b98132cf5c6f86eb96dfe242b67bef32e8a7))
+* remove getNdefMessage's parameter declaration ([6fc257e](https://github.com/whitedogg13/react-native-nfc-manager/commit/6fc257e61e1da5600a7aac44d9a8a97a7ecc988c))
+
+
+### Features
+
+* extract more NfcTech handlers ([0032408](https://github.com/whitedogg13/react-native-nfc-manager/commit/0032408af21cafa3f5f92c16083f914325450524))
+* **android:** getNdefStatus ([4cc68ce](https://github.com/whitedogg13/react-native-nfc-manager/commit/4cc68ce233d81c03760b791fc2f568fe4b8415c4))
+* **ios:** enhance didDetectTags and add queryNDEFStatus / makeReadOnly ([32dd3be](https://github.com/whitedogg13/react-native-nfc-manager/commit/32dd3be2968abbe095ae42fd12793a9a8c0725c6))
+* invalidateSessionWithErrorIOS ([c631110](https://github.com/whitedogg13/react-native-nfc-manager/commit/c631110b6454c08821607014a28b8dffb20fe8b0))
+* ios 13 ndef read and write ([31a3ae6](https://github.com/whitedogg13/react-native-nfc-manager/commit/31a3ae6e141e41f3f36a102d5c2bb5ce04ba78a5))
+* requestTechnology support multi-techs ([65e8f02](https://github.com/whitedogg13/react-native-nfc-manager/commit/65e8f02b83820cb72e65c8443a607b6dca2c8fae))
+
+
+
+# [2.0.0-beta.1](https://github.com/whitedogg13/react-native-nfc-manager/compare/0.0.9...v2.0.0-beta.1) (2019-07-13)
+
+
+### Bug Fixes
+
+* call the correct method `mifareUltralightReadPages` (notice the tailing s) ([60feee8](https://github.com/whitedogg13/react-native-nfc-manager/commit/60feee88c2d20bc18af23b3abb6d8cb22fe17e16))
+* ios crash on registerTagEvent ([e654d93](https://github.com/whitedogg13/react-native-nfc-manager/commit/e654d9359751327284d20b3bee1139c78657dcb4))
+* MifareClassic should also support `transceive` ([dd4a902](https://github.com/whitedogg13/react-native-nfc-manager/commit/dd4a902257a402e5d6d3eae8bd43f9d37c03928b))
+* use non-cached ndef for getNdefMessage API ([49f8541](https://github.com/whitedogg13/react-native-nfc-manager/commit/49f85415a5bc6d0218992dc6ba2b9303cee8e3ac))
+
+
+### Features
+
+* mifareultralight support ([4a53a13](https://github.com/whitedogg13/react-native-nfc-manager/commit/4a53a135c594ef340927ae053dfc142ebfd0b9b6))
+* support `getMaxTransceiveLength` and `setTimeout` ([e759c39](https://github.com/whitedogg13/react-native-nfc-manager/commit/e759c399008e9060ae6f5fe23d7b31a61b1f8037))
+
+
+
+## [0.0.9](https://github.com/whitedogg13/react-native-nfc-manager/compare/0.0.8...0.0.9) (2018-01-02)
+
+
+
+## [0.0.8](https://github.com/whitedogg13/react-native-nfc-manager/compare/0.0.7...0.0.8) (2017-12-09)
+
+
+
+## [0.0.7](https://github.com/whitedogg13/react-native-nfc-manager/compare/0.0.6...0.0.7) (2017-12-04)
+
+
+
+## [0.0.6](https://github.com/whitedogg13/react-native-nfc-manager/compare/0.0.3...0.0.6) (2017-11-17)
+
+
+
+## [0.0.3](https://github.com/whitedogg13/react-native-nfc-manager/compare/0.0.2...0.0.3) (2017-09-27)
+
+
+
+## 0.0.2 (2017-08-01)
+
+
+

package/README.md

@@ -69,6 +69,12 @@ We have a full featured NFC utility app using this library available for downloa
 
 It also open sourced in this repo: [React Native NFC ReWriter App](https://github.com/revtel/react-native-nfc-rewriter)
 
+## Learn
+
+We have published a React Native NFC course with [newline.co](https://www.newline.co/), check it out!
+- Free course (1 hour) about basic NFC setup and concept [here](https://www.youtube.com/watch?v=rAS-DvNUFck)
+- Full course (3 hours) for more (NDEF, Deep Linking, NTAG password protection, signature with UID) [here](https://www.newline.co/courses/newline-guide-to-nfcs-with-react-native)
+
 ## Usage
 
 The simplest (and most common) use case for this library is to read `NFC` tags containing `NDEF`, which can be achieved via the following codes:

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

@@ -536,6 +536,99 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
         }
     }
 
+    @ReactMethod
+    public void mifareClassicIncrementBlock(int blockIndex, int value, Callback callback) {
+        synchronized(this) {
+            if (techRequest != null) {
+                try {
+                    MifareClassic mifareTag = (MifareClassic) techRequest.getTechHandle();
+                    if (mifareTag == null || mifareTag.getType() == MifareClassic.TYPE_UNKNOWN) {
+                        // Not a mifare card, fail
+                        callback.invoke("mifareClassicIncrementBlock fail: TYPE_UNKNOWN");
+                        return;
+                    } else if (blockIndex >= mifareTag.getBlockCount()) {
+                        // Check if in range
+                        String msg = String.format("mifareClassicIncrementBlock fail: invalid block %d (max %d)", blockIndex, mifareTag.getBlockCount());
+                        callback.invoke(msg);
+                        return;
+                    }
+
+                    mifareTag.increment(blockIndex, value);
+
+                    callback.invoke(null, true);
+                } catch (TagLostException ex) {
+                    callback.invoke("mifareClassicIncrementBlock fail: TAG_LOST");
+                } catch (Exception ex) {
+                    callback.invoke("mifareClassicIncrementBlock fail: " + ex.toString());
+                }
+            } else {
+                callback.invoke(ERR_NO_TECH_REQ);
+            }
+        }
+    }
+
+    @ReactMethod
+    public void mifareClassicDecrementBlock(int blockIndex, int value, Callback callback) {
+        synchronized(this) {
+            if (techRequest != null) {
+                try {
+                    MifareClassic mifareTag = (MifareClassic) techRequest.getTechHandle();
+                    if (mifareTag == null || mifareTag.getType() == MifareClassic.TYPE_UNKNOWN) {
+                        // Not a mifare card, fail
+                        callback.invoke("mifareClassicDecrementBlock fail: TYPE_UNKNOWN");
+                        return;
+                    } else if (blockIndex >= mifareTag.getBlockCount()) {
+                        // Check if in range
+                        String msg = String.format("mifareClassicDecrementBlock fail: invalid block %d (max %d)", blockIndex, mifareTag.getBlockCount());
+                        callback.invoke(msg);
+                        return;
+                    }
+
+                    mifareTag.decrement(blockIndex, value);
+
+                    callback.invoke(null, true);
+                } catch (TagLostException ex) {
+                    callback.invoke("mifareClassicDecrementBlock fail: TAG_LOST");
+                } catch (Exception ex) {
+                    callback.invoke("mifareClassicDecrementBlock fail: " + ex.toString());
+                }
+            } else {
+                callback.invoke(ERR_NO_TECH_REQ);
+            }
+        }
+    }
+
+    @ReactMethod
+    public void mifareClassicTransferBlock(int blockIndex, Callback callback) {
+        synchronized(this) {
+            if (techRequest != null) {
+                try {
+                    MifareClassic mifareTag = (MifareClassic) techRequest.getTechHandle();
+                    if (mifareTag == null || mifareTag.getType() == MifareClassic.TYPE_UNKNOWN) {
+                        // Not a mifare card, fail
+                        callback.invoke("mifareClassicTransferBlock fail: TYPE_UNKNOWN");
+                        return;
+                    } else if (blockIndex >= mifareTag.getBlockCount()) {
+                        // Check if in range
+                        String msg = String.format("mifareClassicTransferBlock fail: invalid block %d (max %d)", blockIndex, mifareTag.getBlockCount());
+                        callback.invoke(msg);
+                        return;
+                    }
+
+                    mifareTag.transfer(blockIndex);
+
+                    callback.invoke(null, true);
+                } catch (TagLostException ex) {
+                    callback.invoke("mifareClassicTransferBlock fail: TAG_LOST");
+                } catch (Exception ex) {
+                    callback.invoke("mifareClassicTransferBlock fail: " + ex.toString());
+                }
+            } else {
+                callback.invoke(ERR_NO_TECH_REQ);
+            }
+        }
+    }
+
     @ReactMethod
     public void mifareUltralightReadPages(int pageOffset, Callback callback) {
         synchronized(this) {
@@ -646,27 +739,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());
+            }
         }
     }
 
@@ -971,11 +1064,11 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
     @ReactMethod
     private void registerTagEvent(ReadableMap options, Callback callback) {
-        this.isReaderModeEnabled = options.getBoolean("isReaderModeEnabled");
-        this.readerModeFlags = options.getInt("readerModeFlags");
-        this.readerModeDelay = options.getInt("readerModeDelay");
+        isReaderModeEnabled = options.getBoolean("isReaderModeEnabled");
+        readerModeFlags = options.getInt("readerModeFlags");
+        readerModeDelay = options.getInt("readerModeDelay");
 
-        Log.d(LOG_TAG, "registerTag");
+        Log.d(LOG_TAG, "registerTagEvent");
         isForegroundEnabled = true;
 
         // capture all mime-based dispatch NDEF
@@ -1002,18 +1095,23 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
     @ReactMethod
     private void unregisterTagEvent(Callback callback) {
-        Log.d(LOG_TAG, "registerTag");
-        isForegroundEnabled = false;
-        intentFilters.clear();
+        Log.d(LOG_TAG, "unregisterTagEvent");
         if (isResumed) {
             enableDisableForegroundDispatch(false);
         }
+
+        intentFilters.clear();
+        isForegroundEnabled = false;
+        isReaderModeEnabled = false;
+        readerModeFlags = 0;
+        readerModeDelay = 0;
+
         callback.invoke();
     }
 
     @ReactMethod
     private void hasTagEventRegistration(Callback callback) {
-        Log.d(LOG_TAG, "isSessionAvailable");
+        Log.d(LOG_TAG, "isSessionAvailable: " + isForegroundEnabled);
         callback.invoke(null, isForegroundEnabled);
     }
 
@@ -1061,25 +1159,36 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
                     }
 
                     if (enable) {
-                        Log.i(LOG_TAG, "enableReaderMode");
+                        Log.i(LOG_TAG, "enableReaderMode: " + readerModeFlags);
                         Bundle readerModeExtras = new Bundle();
                         readerModeExtras.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, readerModeDelay * 1000);
                         nfcAdapter.enableReaderMode(currentActivity, new NfcAdapter.ReaderCallback() {
                             @Override
                             public void onTagDiscovered(Tag tag) {
-                                manager.tag = tag;
-                                Log.d(LOG_TAG, "readerMode onTagDiscovered");
-                                WritableMap nfcTag = null;
-                                // if the tag contains NDEF, we want to report the content
-                                if (Arrays.asList(tag.getTechList()).contains(Ndef.class.getName())) {
-                                    Ndef ndef = Ndef.get(tag);
-                                    nfcTag = ndef2React(ndef, new NdefMessage[] { ndef.getCachedNdefMessage() });
-                                } else {
-                                    nfcTag = tag2React(tag);
-                                }
-
-                                if (nfcTag != null) {
-                                    sendEvent("NfcManagerDiscoverTag", nfcTag);
+                                synchronized (this) {
+                                    manager.tag = tag;
+                                    Log.d(LOG_TAG, "readerMode onTagDiscovered");
+                                    WritableMap nfcTag = null;
+                                    // if the tag contains NDEF, we want to report the content
+                                    if (Arrays.asList(tag.getTechList()).contains(Ndef.class.getName())) {
+                                        Ndef ndef = Ndef.get(tag);
+                                        nfcTag = ndef2React(ndef, new NdefMessage[] { ndef.getCachedNdefMessage() });
+                                    } else {
+                                        nfcTag = tag2React(tag);
+                                    }
+
+                                    if (nfcTag != null) {
+                                        sendEvent("NfcManagerDiscoverTag", nfcTag);
+                                        if (techRequest!= null && !techRequest.isConnected()) {
+                                            boolean result = techRequest.connect(tag);
+                                            if (result) {
+                                                techRequest.getPendingCallback().invoke(null, techRequest.getTechType());
+                                            } else {
+                                                // this indicates that we get a NFC tag, but none of the user required tech is matched
+                                                techRequest.getPendingCallback().invoke(null, null);
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }, readerModeFlags, readerModeExtras);
@@ -1107,7 +1216,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/index.d.ts

@@ -88,6 +88,7 @@ declare module 'react-native-nfc-manager' {
 
   export interface CancelTechReqOpts {
     throwOnError?: boolean = false;
+    delayMsAndroid?: number = 1000;
   }
 
   interface NdefHandler {
@@ -122,11 +123,26 @@ declare module 'react-native-nfc-manager' {
       block: ArrayLike<number>,
       simpliArr: any[],
     ) => Promise<void>;
+    mifareClassicIncrementBlock: (
+      block: ArrayLike<number>,
+      data: number,
+    ) => Promise<void>;
+    mifareClassicDecrementBlock: (
+      block: ArrayLike<number>,
+      data: number,
+    ) => Promise<void>;
+    mifareClassicTransferBlock: (
+      block: ArrayLike<number>,
+    ) => Promise<void>;
     mifareClassicGetSectorCount: () => Promise<number>;
     mifareClassicAuthenticateA: (
       sector: number,
       keys: number[],
     ) => Promise<void>;
+    mifareClassicAuthenticateB: (
+      sector: number,
+      keys: number[],
+    ) => Promise<void>;
   }
 
   interface MifareUltralightHandlerAndroid {

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.3",
   "description": "A NFC module for react native.",
   "main": "src/index.js",
   "repository": {

package/react-native-nfc-manager.podspec

@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m}"
   s.platform = :ios, "8.0"
 
-  s.dependency "React"
+  s.dependency "React-Core"
 end

package/src/NfcManagerAndroid.js

@@ -15,6 +15,8 @@ const NfcAdapter = {
   FLAG_READER_NO_PLATFORM_SOUNDS: 0x100,
 };
 
+const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
+
 class NfcManagerAndroid extends NfcManagerBase {
   constructor() {
     super();
@@ -42,12 +44,13 @@ class NfcManagerAndroid extends NfcManagerBase {
   };
 
   cancelTechnologyRequest = async (options = {}) => {
-    const {throwOnError = false} = options;
+    const {throwOnError = false, delayMsAndroid = 1000} = options;
 
     try {
       await callNative('cancelTechnologyRequest');
 
-      if (!this.cleanUpTagRegistration) {
+      if (this.cleanUpTagRegistration) {
+        await delay(delayMsAndroid);
         await this.unregisterTagEvent();
         this.cleanUpTagRegistration = false;
       }

package/src/NfcTech/MifareClassicHandlerAndroid.js

@@ -67,6 +67,48 @@ class MifareClassicHandlerAndroid {
       callNative('mifareClassicWriteBlock', [block, data]),
     );
   }
+
+  async mifareClassicIncrementBlock(block, value) {
+    if (
+      !value ||
+      Number.isNaN(value)) {
+      throw new Error(
+        `value should be a number`,
+      );
+    }
+
+    return handleNativeException(
+      callNative('mifareClassicIncrementBlock', [block, value]),
+    );
+  }
+
+  async mifareClassicDecrementBlock(block, value) {
+    if (
+      !value ||
+      Number.isNaN(value)) {
+      throw new Error(
+        `value should be a number`,
+      );
+    }
+
+    return handleNativeException(
+      callNative('mifareClassicDecrementBlock', [block, value]),
+    );
+  }
+  async mifareClassicTransferBlock(block) {
+    if (
+      !block ||
+      Number.isNaN(block)) {
+      throw new Error(
+        `block should be a number`,
+      );
+    }
+
+    return handleNativeException(
+      callNative('mifareClassicTransferBlock', [block]),
+    );
+  }
+
 }
 
 export {MifareClassicHandlerAndroid};