react-native-nfc-manager 4.0.0-beta.5 → 4.0.0-beta.7

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.2`).
-- `v4` supports new architecture (still in beta, latest release is `v4.0.0-beta.3`) .
+- `v3` only supports legacy architecture (`v3.x.y`).
+- `v4` supports new architecture (still in beta, `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 NativeNfcManagerSpec implements ActivityEventListener,
     private static final String LOG_TAG = "ReactNativeNfcManager";
     private final List<IntentFilter> intentFilters = new ArrayList<>();
     private final ArrayList<String[]> techLists = new ArrayList<>();
-    private final ReactApplicationContext context;
     private Boolean isForegroundEnabled = false;
     private Boolean isResumed = false;
     private WriteNdefRequest writeNdefRequest = null;
@@ -82,7 +81,6 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
 
     public NfcManager(ReactApplicationContext reactContext) {
         super(reactContext);
-        context = reactContext;
         reactContext.addActivityEventListener(this);
         reactContext.addLifecycleEventListener(this);
         Log.d(LOG_TAG, "NfcManager created");
@@ -788,6 +786,59 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
         }
     }
 
+    @ReactMethod
+    public void getTimeout(Callback callback) {
+        synchronized (this) {
+            if (techRequest != null) {
+                try {
+                    String tech = techRequest.getTechType();
+                    TagTechnology baseTechHandle = techRequest.getTechHandle();
+                    // TagTechnology is the base class for each tech (ex, NfcA, NfcB, IsoDep ...)
+                    // but it doesn't provide transceive in its interface, so we need to explicitly cast it
+                    switch (tech) {
+                        case "NfcA": {
+                            NfcA techHandle = (NfcA) baseTechHandle;
+                            int timeout = techHandle.getTimeout();
+                            callback.invoke(null, timeout);
+                            return;
+                        }
+                        case "NfcF": {
+                            NfcF techHandle = (NfcF) baseTechHandle;
+                            int timeout = techHandle.getTimeout();
+                            callback.invoke(null, timeout);
+                            return;
+                        }
+                        case "IsoDep": {
+                            IsoDep techHandle = (IsoDep) baseTechHandle;
+                            int timeout = techHandle.getTimeout();
+                            callback.invoke(null, timeout);
+                            return;
+                        }
+                        case "MifareClassic": {
+                            MifareClassic techHandle = (MifareClassic) baseTechHandle;
+                            int timeout = techHandle.getTimeout();
+                            callback.invoke(null, timeout);
+                            return;
+                        }
+                        case "MifareUltralight": {
+                            MifareUltralight techHandle = (MifareUltralight) baseTechHandle;
+                            int timeout = techHandle.getTimeout();
+                            callback.invoke(null, timeout);
+                            return;
+                        }
+                    }
+                    Log.d(LOG_TAG, "getTimeout not supported");
+                    callback.invoke(ERR_API_NOT_SUPPORT);
+                } catch (Exception ex) {
+                    Log.d(LOG_TAG, ex.toString());
+                    callback.invoke(ex.toString());
+                }
+            } else {
+                callback.invoke(ERR_NO_TECH_REQ);
+            }
+        }
+    }
+
     @ReactMethod
     public void connect(ReadableArray techs, Callback callback){
         synchronized(this) {
@@ -1002,6 +1053,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
 
     @ReactMethod
     public void start(Callback callback) {
+        var context = getReactApplicationContext();
         NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
         if (nfcAdapter != null) {
             Log.d(LOG_TAG, "start");
@@ -1027,7 +1079,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
     @ReactMethod
     public void isSupported(String tech, Callback callback){
         Log.d(LOG_TAG, "isSupported");
-        Activity currentActivity = context.getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             callback.invoke(ERR_GET_ACTIVITY_FAIL);
             return;
@@ -1054,7 +1106,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
     @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 {
@@ -1065,7 +1117,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
     @ReactMethod
     public void goToNfcSetting(Callback callback) {
         Log.d(LOG_TAG, "goToNfcSetting");
-        Activity currentActivity = context.getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             callback.invoke(ERR_GET_ACTIVITY_FAIL);
             return;
@@ -1081,7 +1133,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
 
     @ReactMethod
     public void getLaunchTagEvent(Callback callback) {
-        Activity currentActivity = context.getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             callback.invoke(ERR_GET_ACTIVITY_FAIL);
             return;
@@ -1296,6 +1348,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
 
     private void enableDisableForegroundDispatch(boolean enable) {
         Log.i(LOG_TAG, "enableForegroundDispatch, enable = " + enable);
+        var context = getReactApplicationContext();
         NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
         Activity currentActivity = context.getCurrentActivity();
         final NfcManager manager = this;
@@ -1354,7 +1407,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
     }
 
     private PendingIntent getPendingIntent() {
-        Activity activity = context.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);
@@ -1387,7 +1440,7 @@ class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener,
             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

@@ -284,6 +284,7 @@ declare module 'react-native-nfc-manager' {
     transceive(bytes: number[]): Promise<number[]>;
     getMaxTransceiveLength(): Promise<number>;
     setTimeout(timeout: number): Promise<void>;
+    getTimeout(): Promise<number|void>;
     connect: (techs: NfcTech[]) => Promise<void>;
     close: () => Promise<void>;
     mifareClassicHandlerAndroid: MifareClassicHandlerAndroid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nfc-manager",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "description": "A NFC module for react native.",
   "main": "src/index.js",
   "repository": {
@@ -64,7 +64,7 @@
     "typescript": "^4.1.3"
   },
   "peerDependencies": {
-    "@expo/config-plugins": "9 || 10"
+    "@expo/config-plugins": "*"
   },
   "peerDependenciesMeta": {
     "@expo/config-plugins": {

package/specs/NativeNfcManager.ts

@@ -57,6 +57,7 @@ export interface Spec extends TurboModule {
   goToNfcSetting(callback: (err?: string) => void): void;
   getLaunchTagEvent(callback: (err?: string, tag?: Object) => void): void;
   setTimeout(timeout: number, callback: (err?: string, tag?: Object) => void): void;
+  getTimeout(callback: (err?: string, timeout?: number) => void): void;
   connect(techs: string[], callback: (err?: string) => void): void;
   close(callback: (err?: string) => void): void;
   transceive(bytes: number[], callback: (err?: string, bytes?: number[]) => void): void;

package/src/NfcManager.js

@@ -114,6 +114,8 @@ class NfcManagerBase {
 
   setAlertMessage = DoNothing;
 
+  getTimeout = DoNothing;
+
   async writeNdefMessage(bytes, options = {}) {
     return handleNativeException(callNative('writeNdefMessage', [bytes, options]));
   }

package/src/NfcManagerAndroid.js

@@ -84,6 +84,8 @@ class NfcManagerAndroid extends NfcManagerBase {
   setTimeout = (timeout) =>
     handleNativeException(callNative('setTimeout', [timeout]));
 
+  getTimeout = () => handleNativeException(callNative('getTimeout'));
+
   connect = (techs) => handleNativeException(callNative('connect', [techs]));
 
   close = () => handleNativeException(callNative('close'));