react-native-nfc-manager 3.13.5 → 3.14.1

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

@@ -1,8 +1,6 @@
 package community.revteltech.nfc;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
+
 import android.nfc.Tag;
-import android.nfc.TagLostException;
 import android.nfc.tech.TagTechnology;
 import android.nfc.tech.Ndef;
 import android.nfc.tech.NfcA;
@@ -34,8 +32,18 @@ class TagTechnologyRequest {
         return mTechType;
     }
 
-    Callback getPendingCallback() {
-        return mJsCallback;
+    void invokePendingCallbackWithError(String err) {
+        if (mJsCallback != null) {
+            mJsCallback.invoke(err);
+            mJsCallback = null;
+        }
+    }
+
+    void invokePendingCallback(String connectedTech) {
+        if (mJsCallback != null) {
+            mJsCallback.invoke(null, connectedTech);
+            mJsCallback = null;
+        }
     }
 
     TagTechnology getTechHandle() {
@@ -61,24 +69,34 @@ class TagTechnologyRequest {
         for (int i = 0; i < mTechTypes.size(); i++) {
             String techType = (String)mTechTypes.get(i);
 
-            if (techType.equals("Ndef")) {
-                mTech = Ndef.get(tag);
-            } else if (techType.equals("NfcA")) {
-                mTech = NfcA.get(tag);
-            } else if (techType.equals("NfcB")) {
-                mTech = NfcB.get(tag);
-            } else if (techType.equals("NfcF")) {
-                mTech = NfcF.get(tag);
-            } else if (techType.equals("NfcV")) {
-                mTech = NfcV.get(tag);
-            } else if (techType.equals("IsoDep")) {
-                mTech = IsoDep.get(tag);
-            } else if (techType.equals("MifareClassic")) {
-                mTech = MifareClassic.get(tag);
-            } else if (techType.equals("MifareUltralight")) {
-                mTech = MifareUltralight.get(tag);
-            } else if (techType.equals("NdefFormatable")) {
-                mTech = NdefFormatable.get(tag);
+            switch (techType) {
+                case "Ndef":
+                    mTech = Ndef.get(tag);
+                    break;
+                case "NfcA":
+                    mTech = NfcA.get(tag);
+                    break;
+                case "NfcB":
+                    mTech = NfcB.get(tag);
+                    break;
+                case "NfcF":
+                    mTech = NfcF.get(tag);
+                    break;
+                case "NfcV":
+                    mTech = NfcV.get(tag);
+                    break;
+                case "IsoDep":
+                    mTech = IsoDep.get(tag);
+                    break;
+                case "MifareClassic":
+                    mTech = MifareClassic.get(tag);
+                    break;
+                case "MifareUltralight":
+                    mTech = MifareUltralight.get(tag);
+                    break;
+                case "NdefFormatable":
+                    mTech = NdefFormatable.get(tag);
+                    break;
             }
 
             if (mTech == null) {

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

@@ -44,7 +44,7 @@ public class Util {
                     json.put("canMakeReadOnly", JSONObject.NULL);
                 }
             } catch (JSONException e) {
-                Log.e(TAG, "Failed to convert ndef into json: " + ndef.toString(), e);
+                Log.e(TAG, "Failed to convert ndef into json: " + ndef, e);
             }
         }
         return json;
@@ -58,7 +58,7 @@ public class Util {
                 json.put("id", bytesToHex(tag.getId()));
                 json.put("techTypes", new JSONArray(Arrays.asList(tag.getTechList())));
             } catch (JSONException e) {
-                Log.e(TAG, "Failed to convert tag into json: " + tag.toString(), e);
+                Log.e(TAG, "Failed to convert tag into json: " + tag, e);
             }
         }
         return json;
@@ -66,34 +66,26 @@ public class Util {
 
     static String translateType(String type) {
         String translation;
-        if (type.equals(Ndef.NFC_FORUM_TYPE_1)) {
-            translation = "NFC Forum Type 1";
-        } else if (type.equals(Ndef.NFC_FORUM_TYPE_2)) {
-            translation = "NFC Forum Type 2";
-        } else if (type.equals(Ndef.NFC_FORUM_TYPE_3)) {
-            translation = "NFC Forum Type 3";
-        } else if (type.equals(Ndef.NFC_FORUM_TYPE_4)) {
-            translation = "NFC Forum Type 4";
-        } else {
-            translation = type;
+        switch (type) {
+            case Ndef.NFC_FORUM_TYPE_1:
+                translation = "NFC Forum Type 1";
+                break;
+            case Ndef.NFC_FORUM_TYPE_2:
+                translation = "NFC Forum Type 2";
+                break;
+            case Ndef.NFC_FORUM_TYPE_3:
+                translation = "NFC Forum Type 3";
+                break;
+            case Ndef.NFC_FORUM_TYPE_4:
+                translation = "NFC Forum Type 4";
+                break;
+            default:
+                translation = type;
+                break;
         }
         return translation;
     }
 
-    static NdefRecord[] jsonToNdefRecords(String ndefMessageAsJSON) throws JSONException {
-        JSONArray jsonRecords = new JSONArray(ndefMessageAsJSON);
-        NdefRecord[] records = new NdefRecord[jsonRecords.length()];
-        for (int i = 0; i < jsonRecords.length(); i++) {
-            JSONObject record = jsonRecords.getJSONObject(i);
-            byte tnf = (byte) record.getInt("tnf");
-            byte[] type = jsonToByteArray(record.getJSONArray("type"));
-            byte[] id = jsonToByteArray(record.getJSONArray("id"));
-            byte[] payload = jsonToByteArray(record.getJSONArray("payload"));
-            records[i] = new NdefRecord(tnf, type, id, payload);
-        }
-        return records;
-    }
-
     static JSONArray byteArrayToJSON(byte[] bytes) {
         JSONArray json = new JSONArray();
         for (byte aByte : bytes) {
@@ -116,20 +108,12 @@ public class Util {
         return new String(hexChars);
     }
 
-    static byte[] jsonToByteArray(JSONArray json) throws JSONException {
-        byte[] b = new byte[json.length()];
-        for (int i = 0; i < json.length(); i++) {
-            b[i] = (byte) json.getInt(i);
-        }
-        return b;
-    }
-
     static JSONArray messageToJSON(NdefMessage message) {
         if (message == null) {
             return null;
         }
 
-        List<JSONObject> list = new ArrayList<JSONObject>();
+        List<JSONObject> list = new ArrayList<>();
 
         for (NdefRecord ndefRecord : message.getRecords()) {
             list.add(recordToJSON(ndefRecord));
@@ -147,7 +131,7 @@ public class Util {
             json.put("payload", byteArrayToJSON(record.getPayload()));
         } catch (JSONException e) {
             //Not sure why this would happen, documentation is unclear.
-            Log.e(TAG, "Failed to convert ndef record into json: " + record.toString(), e);
+            Log.e(TAG, "Failed to convert ndef record into json: " + record, e);
         }
         return json;
     }

package/ios/NfcManager+Felica.m

@@ -0,0 +1,43 @@
+#import "NfcManager.h"
+#import "React/RCTBridge.h"
+#import "React/RCTConvert.h"
+#import "React/RCTEventDispatcher.h"
+#import "React/RCTLog.h"
+
+@interface NfcManager (Felica)
+@end
+
+@implementation NfcManager (Felica)
+
+RCT_EXPORT_METHOD(sendFelicaCommand:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback)
+{
+    if (@available(iOS 13.0, *)) {
+        if ([self tagSession] != nil) {
+            if ([self tagSession].connectedTag) {
+                id<NFCFeliCaTag> felicaTag = [[self tagSession].connectedTag asNFCFeliCaTag];
+                NSData *data = arrayToData(bytes);
+                NSLog(@"input bytes: %@", getHexString(data));
+                if (felicaTag) {
+                    [felicaTag sendFeliCaCommandPacket:data
+                               completionHandler:^(NSData *response, NSError *error) {
+                        if (error) {
+                            callback(@[getErrorMessage(error), [NSNull null]]);
+                        } else {
+                            callback(@[[NSNull null], dataToArray(response)]);
+                        }
+                    }];
+                    return;
+                } else {
+                    callback(@[@"not a felica tag", [NSNull null]]);
+                }
+            }
+            callback(@[@"Not connected", [NSNull null]]);
+        } else {
+            callback(@[@"Not even registered", [NSNull null]]);
+        }
+    } else {
+        callback(@[@"Not support in this device", [NSNull null]]);
+    }
+}
+
+@end