react-native-nfc-manager 3.17.1 → 3.17.3

package/README.md

@@ -14,8 +14,8 @@ Made with ❤️ by [whitedogg13](https://github.com/whitedogg13) and [revteltec
 
 ## Version Notes
 
-- `v3` only supports legacy architecture (latest release is `v3.16.3`).
-- `v4` supports new architecture (still in beta, latest release is `v4.0.0-beta.4`) .
+- `v3` only supports legacy architecture (`v3.x.y`).
+- `v4` supports new architecture (`v4.0.0-beta.x`).
 
 ## Table of Contents
 

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

@@ -45,7 +45,6 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     private static final String LOG_TAG = "ReactNativeNfcManager";
     private final List<IntentFilter> intentFilters = new ArrayList<>();
     private final ArrayList<String[]> techLists = new ArrayList<>();
-    private final Context context;
     private Boolean isForegroundEnabled = false;
     private Boolean isResumed = false;
     private WriteNdefRequest writeNdefRequest = null;
@@ -82,7 +81,6 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
     public NfcManager(ReactApplicationContext reactContext) {
         super(reactContext);
-        context = reactContext;
         reactContext.addActivityEventListener(this);
         reactContext.addLifecycleEventListener(this);
         Log.d(LOG_TAG, "NfcManager created");
@@ -1010,12 +1008,13 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
     @ReactMethod
     public void start(Callback callback) {
+        var context = getReactApplicationContext();
         NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
         if (nfcAdapter != null) {
             Log.d(LOG_TAG, "start");
 
             IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
-            Activity currentActivity = getCurrentActivity();
+            Activity currentActivity = context.getCurrentActivity();
             if (currentActivity == null) {
                 callback.invoke(ERR_GET_ACTIVITY_FAIL);
                 return;
@@ -1035,7 +1034,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     @ReactMethod
     public void isSupported(String tech, Callback callback){
         Log.d(LOG_TAG, "isSupported");
-        Activity currentActivity = getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             callback.invoke(ERR_GET_ACTIVITY_FAIL);
             return;
@@ -1062,7 +1061,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     @ReactMethod
     public void isEnabled(Callback callback) {
         Log.d(LOG_TAG, "isEnabled");
-        NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
+        NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getReactApplicationContext());
         if (nfcAdapter != null) {
             callback.invoke(null, nfcAdapter.isEnabled());
         } else {
@@ -1073,7 +1072,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     @ReactMethod
     public void goToNfcSetting(Callback callback) {
         Log.d(LOG_TAG, "goToNfcSetting");
-        Activity currentActivity = getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             callback.invoke(ERR_GET_ACTIVITY_FAIL);
             return;
@@ -1089,7 +1088,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
     @ReactMethod
     public void getLaunchTagEvent(Callback callback) {
-        Activity currentActivity = getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             callback.invoke(ERR_GET_ACTIVITY_FAIL);
             return;
@@ -1197,8 +1196,9 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
 
     private void enableDisableForegroundDispatch(boolean enable) {
         Log.i(LOG_TAG, "enableForegroundDispatch, enable = " + enable);
+        var context = getReactApplicationContext();
         NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
-        Activity currentActivity = getCurrentActivity();
+        Activity currentActivity = context.getCurrentActivity();
         final NfcManager manager = this;
         if (nfcAdapter != null && currentActivity != null && !currentActivity.isFinishing()) {
             try {
@@ -1255,7 +1255,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     private PendingIntent getPendingIntent() {
-        Activity activity = getCurrentActivity();
+        Activity activity = getReactApplicationContext().getCurrentActivity();
         assert activity != null;
         Intent intent = new Intent(activity, activity.getClass());
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -1288,7 +1288,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
             Log.d(LOG_TAG, "onReceive " + intent);
             final String action = intent.getAction();
 
-            if (action.equals(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED)) {
+            if (action != null && action.equals(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED)) {
                 final int state = intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE,
                         NfcAdapter.STATE_OFF);
                 String stateStr = "unknown";

package/index.d.ts

@@ -396,7 +396,7 @@ declare module 'react-native-nfc-manager' {
     isType(record: NdefRecord, tnf: TNF, type: string): boolean;
     stringify(data: number[], separator: string): string;
     encodeMessage(records: NdefRecord[]): number[];
-    decodeMessage(bytes: number[]): NdefRecord[];
+    decodeMessage(bytes: number[] | Uint8Array): NdefRecord[];
     textRecord(text: string, lang?: ISOLangCode, encoding?: any): NdefRecord;
     uriRecord(uri: URI, id?: any): NdefRecord;
     wifiSimpleRecord(credentials: WifiSimpleCredentials, id?: any): NdefRecord;

package/ios/NfcManager+Felica.m

@@ -29,6 +29,7 @@ RCT_EXPORT_METHOD(sendFelicaCommand:(NSArray *)bytes callback: (nonnull RCTRespo
                     return;
                 } else {
                     callback(@[@"not a felica tag", [NSNull null]]);
+                    return;
                 }
             }
             callback(@[@"Not connected", [NSNull null]]);

package/ios/NfcManager+IsoDep.m

@@ -28,6 +28,7 @@ RCT_EXPORT_METHOD(sendCommandAPDUBytes:(NSArray *)bytes callback: (nonnull RCTRe
                     return;
                 } else {
                     callback(@[@"not an iso7816 tag", [NSNull null]]);
+                    return;
                 }
             }
             callback(@[@"Not connected", [NSNull null]]);
@@ -69,6 +70,7 @@ RCT_EXPORT_METHOD(sendCommandAPDU:(NSDictionary *)apduData callback: (nonnull RC
                     return;
                 } else {
                     callback(@[@"not an iso7816 tag", [NSNull null]]);
+                    return;
                 }
             }
             callback(@[@"Not connected", [NSNull null]]);

package/ios/NfcManager+Mifare.m

@@ -29,6 +29,7 @@ RCT_EXPORT_METHOD(sendMifareCommand:(NSArray *)bytes callback: (nonnull RCTRespo
                     return;
                 } else {
                     callback(@[@"not a mifare tag", [NSNull null]]);
+                    return;
                 }
             }
             callback(@[@"Not connected", [NSNull null]]);

package/ndef-lib/ndef.js

@@ -126,15 +126,14 @@ function decodeNdefMessage(ndefBytes) {
 
   // ndefBytes can be an array of bytes e.g. [0x03, 0x31, 0xd1] or a Buffer
   let bytes;
-  if (ndefBytes instanceof Array) {
-    bytes = ndefBytes.slice(0);
+  if (Array.isArray(ndefBytes) || ndefBytes instanceof Uint8Array) {
+    bytes = Array.from(ndefBytes);
   } else {
     throw new Error(
-      'ndef.decodeMessage requires a Buffer or an Array of bytes',
+      'ndef.decodeMessage requires a Buffer, Uint8Array, or an Array of bytes',
     );
   }
 
-  bytes = bytes.slice(0); // clone since parsing is destructive
   let ndef_message = [],
     tnf_byte,
     header,

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "react-native-nfc-manager",
-  "version": "3.17.1",
+  "version": "3.17.3",
   "description": "A NFC module for react native.",
   "main": "src/index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/whitedogg13/react-native-nfc-manager.git"
+    "url": "https://github.com/revtel/react-native-nfc-manager.git"
   },
   "bugs": {
-    "url": "https://github.com/whitedogg13/react-native-nfc-manager/issues"
+    "url": "https://github.com/revtel/react-native-nfc-manager/issues"
   },
   "keywords": [
     "react-native",
@@ -74,6 +74,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "test": "jest -i",
-    "release": "dotenv -- release-it --"
+    "release": "dotenv -- release-it --",
+    "typecheck": "tsc --noEmit -p tsconfig.typecheck.json",
+    "test:publishing": "node --test scripts/trusted-publishing.test.cjs"
   }
 }