Merge pull request #324 from chariotsolutions/first-scan

NFC events not firing on first scan Fixes #217 (and others)
chariotsolutions · Jun 1, 2018 · f817cb5 · f817cb5
2 parents a3a9659 + 50f58da
commit f817cb5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java b/src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java
@@ -194,6 +194,7 @@ private String getNfcStatus() {
 
     private void registerDefaultTag(CallbackContext callbackContext) {
         addTagFilter();
+        restartNfc();
         callbackContext.success();
     }
 
@@ -205,11 +206,13 @@ private void removeDefaultTag(CallbackContext callbackContext) {
 
     private void registerNdefFormatable(CallbackContext callbackContext) {
         addTechList(new String[]{NdefFormatable.class.getName()});
+        restartNfc();
         callbackContext.success();
     }
 
     private void registerNdef(CallbackContext callbackContext) {
         addTechList(new String[]{Ndef.class.getName()});
+        restartNfc();
         callbackContext.success();
     }
 
@@ -248,6 +251,7 @@ private void registerMimeType(JSONArray data, CallbackContext callbackContext) t
         try {
             mimeType = data.getString(0);
             intentFilters.add(createIntentFilter(mimeType));
+            restartNfc();
             callbackContext.success();
         } catch (MalformedMimeTypeException e) {
             callbackContext.error("Invalid MIME Type " + mimeType);
@@ -467,7 +471,13 @@ private void startNfc() {
 
             if (nfcAdapter != null && !getActivity().isFinishing()) {
                 try {
-                    nfcAdapter.enableForegroundDispatch(getActivity(), getPendingIntent(), getIntentFilters(), getTechLists());
+                    IntentFilter[] intentFilters = getIntentFilters();
+                    String[][] techLists = getTechLists();
+                    // don't start NFC unless some intent filters or tech lists have been added,
+                    // because empty lists act as wildcards and receives ALL scan events
+                    if (intentFilters.length > 0 || techLists.length > 0) {
+                        nfcAdapter.enableForegroundDispatch(getActivity(), getPendingIntent(), intentFilters, techLists);
+                    }
 
                     if (p2pMessage != null) {
                         nfcAdapter.setNdefPushMessage(p2pMessage, getActivity());

diff --git a/www/phonegap-nfc.js b/www/phonegap-nfc.js
@@ -841,7 +841,7 @@ require('cordova/channel').onCordovaReady.subscribe(function() {
     if (!message.type) { 
         console.log(message);
     } else {
-        console.log('Received NFC data, firing event');
+        console.log("Received NFC data, firing '" + message.type + "' event");
         var e = document.createEvent('Events');
         e.initEvent(message.type)
         e.tag = message.tag;