improve nfc tag serialization process

hack-and-backslash · Feb 16, 2019 · 19e58c1 · 19e58c1
1 parent c78d1b0
commit 19e58c1
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/android/src/main/java/community/revteltech/nfc/NfcManager.java b/android/src/main/java/community/revteltech/nfc/NfcManager.java
@@ -816,21 +816,18 @@ private void enableDisableForegroundDispatch(boolean enable) {
 					}
 
 					if (enable) {
+						Log.i(LOG_TAG, "enableReaderMode");
 						nfcAdapter.enableReaderMode(currentActivity, new NfcAdapter.ReaderCallback() {
 							@Override
 							public void onTagDiscovered(Tag tag) {
+								Log.d(LOG_TAG, "readerMode onTagDiscovered");
 								WritableMap nfcTag = null;
-								for (String tagTech : tag.getTechList()) {
-									Log.d(LOG_TAG, tagTech);
-									if (tagTech.equals(NdefFormatable.class.getName())) {
-										// fireNdefFormatableEvent(tag);
-										nfcTag = tag2React(tag);
-									} else if (tagTech.equals(Ndef.class.getName())) { //
-										Ndef ndef = Ndef.get(tag);
-										nfcTag = ndef2React(ndef, new NdefMessage[] { ndef.getCachedNdefMessage() });
-									} else {
-										nfcTag = tag2React(tag);
-									}
+								// 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) {
@@ -839,6 +836,7 @@ public void onTagDiscovered(Tag tag) {
 							}
 						}, readerModeFlags, null);
 					} else {
+						Log.i(LOG_TAG, "disableReaderMode");
 						nfcAdapter.disableReaderMode(currentActivity);
 					}
 				} else {
@@ -979,15 +977,12 @@ private WritableMap parseNfcIntent(Intent intent) {
 			Parcelable[] messages = intent.getParcelableArrayExtra((NfcAdapter.EXTRA_NDEF_MESSAGES));
 			parsed = ndef2React(ndef, messages);
 		} else if (action.equals(NfcAdapter.ACTION_TECH_DISCOVERED)) {
-			for (String tagTech : tag.getTechList()) {
-				Log.d(LOG_TAG, tagTech);
-				if (tagTech.equals(NdefFormatable.class.getName())) {
-					// fireNdefFormatableEvent(tag);
-					parsed = tag2React(tag);
-				} else if (tagTech.equals(Ndef.class.getName())) { //
-					Ndef ndef = Ndef.get(tag);
-					parsed = ndef2React(ndef, new NdefMessage[] { ndef.getCachedNdefMessage() });
-				}
+			// 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);
+				parsed = ndef2React(ndef, new NdefMessage[] { ndef.getCachedNdefMessage() });
+			} else {
+				parsed = tag2React(tag);
 			}
 		} else if (action.equals(NfcAdapter.ACTION_TAG_DISCOVERED)) {
 			parsed = tag2React(tag);