Merge pull request #536 from revtel/fix/android-nfc-setting-ex

fix(android): avoid native exception while jumping to system NFC settings
revtel · Jun 25, 2022 · 0ea6a38 · 0ea6a38
2 parents 899856d + 9607b50
commit 0ea6a38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/android/src/main/java/community/revteltech/nfc/NfcManager.java b/android/src/main/java/community/revteltech/nfc/NfcManager.java
@@ -1034,8 +1034,12 @@ public void goToNfcSetting(Callback callback) {
             return;
         }
 
-        currentActivity.startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
-        callback.invoke();
+        try {
+            currentActivity.startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
+            callback.invoke(null, true);
+        } catch (Exception ex) {
+            callback.invoke(null, false);
+        }
     }
 
     @ReactMethod

diff --git a/index.d.ts b/index.d.ts
@@ -271,7 +271,7 @@ declare module 'react-native-nfc-manager' {
     /**
      * Android only
      */
-    goToNfcSetting(): Promise<any>;
+    goToNfcSetting(): Promise<boolean>;
     getLaunchTagEvent(): Promise<TagEvent | null>;
     transceive(bytes: number[]): Promise<number[]>;
     getMaxTransceiveLength(): Promise<number>;