community-cordova-plugin-nfc 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [1.4.0](https://github.com/EYALIN/community-admob-plus/compare/admob-plus-cordova@1.31.0...admob-plus-cordova@1.32.0) (2024-07-19)
+
+### Features
+
+* change Android code to support SDK 34
+* share, unshare, handover,stopHandover functions are now deprecated
+* organize the code
+

package/README.md

@@ -99,11 +99,11 @@ Writing NFC tags on iOS uses the same [nfc.write](#nfcwrite) function as other p
 - [nfc.addNdefFormatableListener](#nfcaddndefformatablelistener)
 - [nfc.write](#nfcwrite)
 - [nfc.makeReadOnly](#nfcmakereadonly)
-- [nfc.share](#nfcshare)
-- [nfc.unshare](#nfcunshare)
+- [~~nfc.share~~](#nfcshare)
+- [~~nfc.unshare~~](#nfcunshare)
 - [nfc.erase](#nfcerase)
-- [nfc.handover](#nfchandover)
-- [nfc.stopHandover](#nfcstophandover)
+- [~~nfc.handover~~](#nfchandover)
+- [~~nfc.stopHandover~~](#nfcstophandover)
 - [nfc.enabled](#nfcenabled)
 - [nfc.showSettings](#nfcshowsettings)
 - [~~nfc.beginSession~~](#nfcbeginsession)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "community-cordova-plugin-nfc",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Near Field Communication (NFC) Plugin. Read and write NDEF messages to NFC tags and share NDEF messages with peers.",
   "cordova": {
     "id": "phonegap-nfc",

package/plugin.xml

@@ -3,7 +3,7 @@
     xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="community-cordova-plugin-nfc"
-    version="1.3.0">
+    version="1.4.0">
 
     <name>NFC</name>
 

package/src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java

@@ -5,11 +5,14 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-// using wildcard imports so we can support Cordova 3.x
-import org.apache.cordova.*; // Cordova 3.x
+import org.apache.cordova.CallbackContext;
+import org.apache.cordova.CordovaArgs;
+import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.PluginResult;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -35,7 +38,7 @@ import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
 
-public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCompleteCallback {
+public class NfcPlugin extends CordovaPlugin {
     private static final String REGISTER_MIME_TYPE = "registerMimeType";
     private static final String REMOVE_MIME_TYPE = "removeMimeType";
     private static final String REGISTER_NDEF = "registerNdef";
@@ -62,7 +65,6 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     private static final String READER_MODE = "readerMode";
     private static final String DISABLE_READER_MODE = "disableReaderMode";
 
-    // TagTechnology IsoDep, NfcA, NfcB, NfcV, NfcF, MifareClassic, MifareUltralight
     private static final String CONNECT = "connect";
     private static final String CLOSE = "close";
     private static final String TRANSCEIVE = "transceive";
@@ -87,111 +89,149 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
 
     private CallbackContext readerModeCallback;
     private CallbackContext channelCallback;
-    private CallbackContext shareTagCallback;
-    private CallbackContext handoverCallback;
+
+    private PostponedPluginResult postponedPluginResult = null;
+
+    class PostponedPluginResult {
+        private Date moment;
+        private PluginResult pluginResult;
+
+        PostponedPluginResult(Date moment, PluginResult pluginResult) {
+            this.moment = moment;
+            this.pluginResult = pluginResult;
+        }
+
+        boolean isValid() {
+            return this.moment.after(new Date(new Date().getTime() - 30000));
+        }
+    }
 
     @Override
     public boolean execute(String action, JSONArray data, CallbackContext callbackContext) throws JSONException {
-
         Log.d(TAG, "execute " + action);
 
-        // showSettings can be called if NFC is disabled
-        // might want to skip this if NO_NFC
         if (action.equalsIgnoreCase(SHOW_SETTINGS)) {
             showSettings(callbackContext);
             return true;
         }
 
-        // the channel is set up when the plugin starts
         if (action.equalsIgnoreCase(CHANNEL)) {
             channelCallback = callbackContext;
-            return true; // short circuit
+            if (postponedPluginResult != null) {
+                Log.i(TAG, "Postponed plugin result available");
+
+                if (postponedPluginResult.isValid()) {
+                    Log.i(TAG, "Postponed plugin result is valid, resending it now");
+                    channelCallback.sendPluginResult(postponedPluginResult.pluginResult);
+                } else {
+                    Log.i(TAG, "Postponed plugin result not valid anymore, so ignoring it");
+                }
+
+                postponedPluginResult = null;
+            }
+            return true;
         }
 
-        // allow reader mode to be disabled even if nfc is disabled
         if (action.equalsIgnoreCase(DISABLE_READER_MODE)) {
             disableReaderMode(callbackContext);
-            return true; // short circuit
+            return true;
         }
 
         if (!getNfcStatus().equals(STATUS_NFC_OK)) {
             callbackContext.error(getNfcStatus());
-            return true; // short circuit
+            return true;
         }
 
         createPendingIntent();
 
-        if (action.equalsIgnoreCase(READER_MODE)) {
-            int flags = data.getInt(0);
-            readerMode(flags, callbackContext);
-
-        } else if (action.equalsIgnoreCase(REGISTER_MIME_TYPE)) {
-            registerMimeType(data, callbackContext);
-
-        } else if (action.equalsIgnoreCase(REMOVE_MIME_TYPE)) {
-            removeMimeType(data, callbackContext);
-
-        } else if (action.equalsIgnoreCase(REGISTER_NDEF)) {
-            registerNdef(callbackContext);
-
-        } else if (action.equalsIgnoreCase(REMOVE_NDEF)) {
-            removeNdef(callbackContext);
-
-        } else if (action.equalsIgnoreCase(REGISTER_NDEF_FORMATABLE)) {
-            registerNdefFormatable(callbackContext);
-
-        } else if (action.equals(REGISTER_DEFAULT_TAG)) {
-            registerDefaultTag(callbackContext);
-
-        } else if (action.equals(REMOVE_DEFAULT_TAG)) {
-            removeDefaultTag(callbackContext);
-
-        } else if (action.equalsIgnoreCase(WRITE_TAG)) {
-            writeTag(data, callbackContext);
-
-        } else if (action.equalsIgnoreCase(MAKE_READ_ONLY)) {
-            makeReadOnly(callbackContext);
-
-        } else if (action.equalsIgnoreCase(ERASE_TAG)) {
-            eraseTag(callbackContext);
-
-        } else if (action.equalsIgnoreCase(SHARE_TAG)) {
-            shareTag(data, callbackContext);
-
-        } else if (action.equalsIgnoreCase(UNSHARE_TAG)) {
-            unshareTag(callbackContext);
-
-        } else if (action.equalsIgnoreCase(HANDOVER)) {
-            handover(data, callbackContext);
-
-        } else if (action.equalsIgnoreCase(STOP_HANDOVER)) {
-            stopHandover(callbackContext);
-
-        } else if (action.equalsIgnoreCase(INIT)) {
-            init(callbackContext);
-
-        } else if (action.equalsIgnoreCase(ENABLED)) {
-            // status is checked before every call
-            // if code made it here, NFC is enabled
-            callbackContext.success(STATUS_NFC_OK);
-
-        } else if (action.equalsIgnoreCase(CONNECT)) {
-            String tech = data.getString(0);
-            int timeout = data.optInt(1, -1);
-            connect(tech, timeout, callbackContext);
-
-        } else if (action.equalsIgnoreCase(TRANSCEIVE)) {
-            CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
-
-            byte[] command = args.getArrayBuffer(0);
-            transceive(command, callbackContext);
-
-        } else if (action.equalsIgnoreCase(CLOSE)) {
-            close(callbackContext);
-
-        } else {
-            // invalid action
-            return false;
+        switch (action) {
+            case READER_MODE:
+                int flags = data.getInt(0);
+                readerMode(flags, callbackContext);
+                break;
+
+            case REGISTER_MIME_TYPE:
+                registerMimeType(data, callbackContext);
+                break;
+
+            case REMOVE_MIME_TYPE:
+                removeMimeType(data, callbackContext);
+                break;
+
+            case REGISTER_NDEF:
+                registerNdef(callbackContext);
+                break;
+
+            case REMOVE_NDEF:
+                removeNdef(callbackContext);
+                break;
+
+            case REGISTER_NDEF_FORMATABLE:
+                registerNdefFormatable(callbackContext);
+                break;
+
+            case REGISTER_DEFAULT_TAG:
+                registerDefaultTag(callbackContext);
+                break;
+
+            case REMOVE_DEFAULT_TAG:
+                removeDefaultTag(callbackContext);
+                break;
+
+            case WRITE_TAG:
+                writeTag(data, callbackContext);
+                break;
+
+            case MAKE_READ_ONLY:
+                makeReadOnly(callbackContext);
+                break;
+
+            case ERASE_TAG:
+                eraseTag(callbackContext);
+                break;
+
+            case SHARE_TAG:
+                shareTag(data, callbackContext);
+                break;
+
+            case UNSHARE_TAG:
+                unshareTag(callbackContext);
+                break;
+
+            case HANDOVER:
+                handover(data, callbackContext);
+                break;
+
+            case STOP_HANDOVER:
+                stopHandover(callbackContext);
+                break;
+
+            case INIT:
+                init(callbackContext);
+                break;
+
+            case ENABLED:
+                callbackContext.success(STATUS_NFC_OK);
+                break;
+
+            case CONNECT:
+                String tech = data.getString(0);
+                int timeout = data.optInt(1, -1);
+                connect(tech, timeout, callbackContext);
+                break;
+
+            case TRANSCEIVE:
+                CordovaArgs args = new CordovaArgs(data);
+                byte[] command = args.getArrayBuffer(0);
+                transceive(command, callbackContext);
+                break;
+
+            case CLOSE:
+                close(callbackContext);
+                break;
+
+            default:
+                return false;
         }
 
         return true;
@@ -209,13 +249,16 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private void readerMode(int flags, CallbackContext callbackContext) {
-        Bundle extras = new Bundle(); // not used
+        Bundle extras = new Bundle();
         readerModeCallback = callbackContext;
         getActivity().runOnUiThread(() -> {
             NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-            nfcAdapter.enableReaderMode(getActivity(), callback, flags, extras);
+            if (nfcAdapter != null) {
+                nfcAdapter.enableReaderMode(getActivity(), callback, flags, extras);
+            } else {
+                callbackContext.error("NFC Adapter not available");
+            }
         });
-
     }
 
     private void disableReaderMode(CallbackContext callbackContext) {
@@ -229,33 +272,26 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         });
     }
 
-    private NfcAdapter.ReaderCallback callback = new NfcAdapter.ReaderCallback() {
-        @Override
-        public void onTagDiscovered(Tag tag) {
-
-            JSONObject json;
-
-            // If the tag supports Ndef, try and return an Ndef message
-            List<String> techList = Arrays.asList(tag.getTechList());
-            if (techList.contains(Ndef.class.getName())) {
-                Ndef ndef = Ndef.get(tag);
-                json = Util.ndefToJSON(ndef);
-            } else {
-                json = Util.tagToJSON(tag);
-            }
-
-            Intent tagIntent = new Intent();
-            tagIntent.putExtra(NfcAdapter.EXTRA_TAG, tag);
-            setIntent(tagIntent);
+    private final NfcAdapter.ReaderCallback callback = tag -> {
+        JSONObject json;
+        List<String> techList = Arrays.asList(tag.getTechList());
+        if (techList.contains(Ndef.class.getName())) {
+            Ndef ndef = Ndef.get(tag);
+            json = Util.ndefToJSON(ndef);
+        } else {
+            json = Util.tagToJSON(tag);
+        }
 
-            PluginResult result = new PluginResult(PluginResult.Status.OK, json);
-            result.setKeepCallback(true);
-            if (readerModeCallback != null) {
-                readerModeCallback.sendPluginResult(result);
-            } else {
-                Log.i(TAG, "readerModeCallback is null - reader mode probably disabled in the meantime");
-            }
+        Intent tagIntent = new Intent();
+        tagIntent.putExtra(NfcAdapter.EXTRA_TAG, tag);
+        setIntent(tagIntent);
 
+        PluginResult result = new PluginResult(PluginResult.Status.OK, json);
+        result.setKeepCallback(true);
+        if (readerModeCallback != null) {
+            readerModeCallback.sendPluginResult(result);
+        } else {
+            Log.i(TAG, "readerModeCallback is null - reader mode probably disabled in the meantime");
         }
     };
 
@@ -290,15 +326,11 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private void unshareTag(CallbackContext callbackContext) {
-        p2pMessage = null;
-        stopNdefPush();
-        shareTagCallback = null;
         callbackContext.success();
     }
 
     private void init(CallbackContext callbackContext) {
         Log.d(TAG, "Enabling plugin " + getIntent());
-
         startNfc();
         if (!recycledIntent()) {
             parseMessage();
@@ -325,17 +357,16 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         }
     }
 
-    // Cheating and writing an empty record. We may actually be able to erase some tag types.
     private void eraseTag(CallbackContext callbackContext) {
         Tag tag = savedIntent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
         NdefRecord[] records = {
-                new NdefRecord(NdefRecord.TNF_EMPTY, new byte[0], new byte[0], new byte[0])
+            new NdefRecord(NdefRecord.TNF_EMPTY, new byte[0], new byte[0], new byte[0])
         };
         writeNdefMessage(new NdefMessage(records), tag, callbackContext);
     }
 
     private void writeTag(JSONArray data, CallbackContext callbackContext) throws JSONException {
-        if (getIntent() == null) {  // TODO remove this and handle LostTag
+        if (getIntent() == null) {
             callbackContext.error("Failed to write tag, received null intent");
         }
 
@@ -344,50 +375,47 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         writeNdefMessage(new NdefMessage(records), tag, callbackContext);
     }
 
-    private void writeNdefMessage(final NdefMessage message, final Tag tag, final CallbackContext callbackContext) {
-        cordova.getThreadPool().execute(() -> {
-            try {
-                Ndef ndef = Ndef.get(tag);
-                if (ndef != null) {
-                    ndef.connect();
-
-                    if (ndef.isWritable()) {
-                        int size = message.toByteArray().length;
-                        if (ndef.getMaxSize() < size) {
-                            callbackContext.error("Tag capacity is " + ndef.getMaxSize() +
-                                    " bytes, message is " + size + " bytes.");
-                        } else {
-                            ndef.writeNdefMessage(message);
-                            callbackContext.success();
-                        }
-                    } else {
-                        callbackContext.error("Tag is read only");
-                    }
-                    ndef.close();
-                } else {
-                    NdefFormatable formatable = NdefFormatable.get(tag);
-                    if (formatable != null) {
-                        formatable.connect();
-                        formatable.format(message);
-                        callbackContext.success();
-                        formatable.close();
-                    } else {
-                        callbackContext.error("Tag doesn't support NDEF");
-                    }
-                }
-            } catch (FormatException e) {
-                callbackContext.error(e.getMessage());
-            } catch (TagLostException e) {
-                callbackContext.error(e.getMessage());
-            } catch (IOException e) {
-                callbackContext.error(e.getMessage());
-            }
-        });
-    }
+   private void writeNdefMessage(final NdefMessage message, final Tag tag, final CallbackContext callbackContext) {
+       cordova.getThreadPool().execute(() -> {
+           try {
+               Ndef ndef = Ndef.get(tag);
+               if (ndef != null) {
+                   ndef.connect();
+                   if (ndef.isWritable()) {
+                       int size = message.toByteArray().length;
+                       if (ndef.getMaxSize() < size) {
+                           callbackContext.error("Tag capacity is " + ndef.getMaxSize() + " bytes, message is " + size + " bytes.");
+                       } else {
+                           ndef.writeNdefMessage(message);
+                           callbackContext.success();
+                       }
+                   } else {
+                       callbackContext.error("Tag is read only");
+                   }
+                   ndef.close();
+               } else {
+                   NdefFormatable formatable = NdefFormatable.get(tag);
+                   if (formatable != null) {
+                       formatable.connect();
+                       formatable.format(message);
+                       callbackContext.success();
+                       formatable.close();
+                   } else {
+                       callbackContext.error("Tag doesn't support NDEF");
+                   }
+               }
+           } catch (FormatException e) {
+               callbackContext.error(e.getMessage());
+           } catch (TagLostException e) {
+               callbackContext.error(e.getMessage());
+           } catch (IOException e) {
+               callbackContext.error(e.getMessage());
+           }
+       });
+   }
 
     private void makeReadOnly(final CallbackContext callbackContext) {
-
-        if (getIntent() == null) { // Lost Tag
+        if (getIntent() == null) {
             callbackContext.error("Failed to make tag read only, received null intent");
             return;
         }
@@ -406,7 +434,6 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
 
             try {
                 if (ndef != null) {
-
                     ndef.connect();
 
                     if (!ndef.isWritable()) {
@@ -414,13 +441,11 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
                     } else if (ndef.canMakeReadOnly()) {
                         success = ndef.makeReadOnly();
                     } else {
-                        message = "Tag can not be made read only";
+                        message = "Tag cannot be made read only";
                     }
-
                 } else {
                     message = "Tag is not NDEF";
                 }
-
             } catch (IOException e) {
                 Log.e(TAG, "Failed to make tag read only", e);
                 if (e.getMessage() != null) {
@@ -439,31 +464,14 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private void shareTag(JSONArray data, CallbackContext callbackContext) throws JSONException {
-        NdefRecord[] records = Util.jsonToNdefRecords(data.getString(0));
-        this.p2pMessage = new NdefMessage(records);
-
-        startNdefPush(callbackContext);
+        callbackContext.success();
     }
 
-    // setBeamPushUris
-    // Every Uri you provide must have either scheme 'file' or scheme 'content'.
-    // Note that this takes priority over setNdefPush
-    //
-    // See http://developer.android.com/reference/android/nfc/NfcAdapter.html#setBeamPushUris(android.net.Uri[],%20android.app.Activity)
     private void handover(JSONArray data, CallbackContext callbackContext) throws JSONException {
-
-        Uri[] uri = new Uri[data.length()];
-
-        for (int i = 0; i < data.length(); i++) {
-            uri[i] = Uri.parse(data.getString(i));
-        }
-
-        startNdefBeam(callbackContext, uri);
+        callbackContext.success();
     }
 
     private void stopHandover(CallbackContext callbackContext) {
-        stopNdefBeam();
-        handoverCallback = null;
         callbackContext.success();
     }
 
@@ -483,7 +491,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
             Activity activity = getActivity();
             Intent intent = new Intent(activity, activity.getClass());
             intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
                 pendingIntent = PendingIntent.getActivity(activity, 0, intent, PendingIntent.FLAG_MUTABLE);
             } else {
                 pendingIntent = PendingIntent.getActivity(activity, 0, intent, 0);
@@ -492,13 +500,13 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private void addTechList(String[] list) {
-        this.addTechFilter();
-        this.addToTechList(list);
+        addTechFilter();
+        addToTechList(list);
     }
 
     private void removeTechList(String[] list) {
-        this.removeTechFilter();
-        this.removeFromTechList(list);
+        removeTechFilter();
+        removeFromTechList(list);
     }
 
     private void addTechFilter() {
@@ -535,7 +543,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private void startNfc() {
-        createPendingIntent(); // onResume can call startNfc before execute
+        createPendingIntent();
 
         getActivity().runOnUiThread(() -> {
             NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
@@ -544,20 +552,12 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
                 try {
                     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());
-                    }
                 } catch (IllegalStateException e) {
-                    // issue 110 - user exits app with home button while nfc is initializing
                     Log.w(TAG, "Illegal State Exception starting NFC. Assuming application is terminating.");
                 }
-
             }
         });
     }
@@ -565,91 +565,18 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     private void stopNfc() {
         Log.d(TAG, "stopNfc");
         getActivity().runOnUiThread(() -> {
-
             NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
 
             if (nfcAdapter != null) {
                 try {
                     nfcAdapter.disableForegroundDispatch(getActivity());
                 } catch (IllegalStateException e) {
-                    // issue 125 - user exits app with back button while nfc
                     Log.w(TAG, "Illegal State Exception stopping NFC. Assuming application is terminating.");
                 }
             }
         });
     }
 
-    private void startNdefBeam(final CallbackContext callbackContext, final Uri[] uris) {
-        getActivity().runOnUiThread(() -> {
-
-            NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-
-            if (nfcAdapter == null) {
-                callbackContext.error(STATUS_NO_NFC);
-            } else if (!nfcAdapter.isNdefPushEnabled()) {
-                callbackContext.error(STATUS_NDEF_PUSH_DISABLED);
-            } else {
-                nfcAdapter.setOnNdefPushCompleteCallback(NfcPlugin.this, getActivity());
-                try {
-                    nfcAdapter.setBeamPushUris(uris, getActivity());
-
-                    PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT);
-                    result.setKeepCallback(true);
-                    handoverCallback = callbackContext;
-                    callbackContext.sendPluginResult(result);
-
-                } catch (IllegalArgumentException e) {
-                    callbackContext.error(e.getMessage());
-                }
-            }
-        });
-    }
-
-    private void startNdefPush(final CallbackContext callbackContext) {
-        getActivity().runOnUiThread(() -> {
-
-            NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-
-            if (nfcAdapter == null) {
-                callbackContext.error(STATUS_NO_NFC);
-            } else if (!nfcAdapter.isNdefPushEnabled()) {
-                callbackContext.error(STATUS_NDEF_PUSH_DISABLED);
-            } else {
-                nfcAdapter.setNdefPushMessage(p2pMessage, getActivity());
-                nfcAdapter.setOnNdefPushCompleteCallback(NfcPlugin.this, getActivity());
-
-                PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT);
-                result.setKeepCallback(true);
-                shareTagCallback = callbackContext;
-                callbackContext.sendPluginResult(result);
-            }
-        });
-    }
-
-    private void stopNdefPush() {
-        getActivity().runOnUiThread(() -> {
-
-            NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-
-            if (nfcAdapter != null) {
-                nfcAdapter.setNdefPushMessage(null, getActivity());
-            }
-
-        });
-    }
-
-    private void stopNdefBeam() {
-        getActivity().runOnUiThread(() -> {
-
-            NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-
-            if (nfcAdapter != null) {
-                nfcAdapter.setBeamPushUris(null, getActivity());
-            }
-
-        });
-    }
-
     private void addToTechList(String[] techs) {
         techLists.add(techs);
     }
@@ -690,7 +617,6 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private String[][] getTechLists() {
-        //noinspection ToArrayCallWithZeroLengthArrayArgument
         return techLists.toArray(new String[0][0]);
     }
 
@@ -705,47 +631,46 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
             }
 
             Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-            Parcelable[] messages = intent.getParcelableArrayExtra((NfcAdapter.EXTRA_NDEF_MESSAGES));
+            Parcelable[] messages = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
 
             if (action.equals(NfcAdapter.ACTION_NDEF_DISCOVERED)) {
                 Ndef ndef = Ndef.get(tag);
                 fireNdefEvent(NDEF_MIME, ndef, messages);
-
             } else if (action.equals(NfcAdapter.ACTION_TECH_DISCOVERED)) {
                 for (String tagTech : tag.getTechList()) {
                     Log.d(TAG, tagTech);
                     if (tagTech.equals(NdefFormatable.class.getName())) {
                         fireNdefFormatableEvent(tag);
-                    } else if (tagTech.equals(Ndef.class.getName())) { //
+                    } else if (tagTech.equals(Ndef.class.getName())) {
                         Ndef ndef = Ndef.get(tag);
                         fireNdefEvent(NDEF, ndef, messages);
                     }
                 }
-            }
-
-            if (action.equals(NfcAdapter.ACTION_TAG_DISCOVERED)) {
-                fireTagEvent(tag);
+            } else if (action.equals(NfcAdapter.ACTION_TAG_DISCOVERED)) {
+                fireTagEvent(tag, messages);
             }
 
             setIntent(new Intent());
         });
     }
 
-    // Send the event data through a channel so the JavaScript side can fire the event
     private void sendEvent(String type, JSONObject tag) {
-
         try {
             JSONObject event = new JSONObject();
-            event.put("type", type);       // TAG_DEFAULT, NDEF, NDEF_MIME, NDEF_FORMATABLE
-            event.put("tag", tag);         // JSON representing the NFC tag and NDEF messages
+            event.put("type", type);
+            event.put("tag", tag);
 
             PluginResult result = new PluginResult(PluginResult.Status.OK, event);
             result.setKeepCallback(true);
-            channelCallback.sendPluginResult(result);
+
+            if (channelCallback != null) {
+                channelCallback.sendPluginResult(result);
+            } else {
+                postponedPluginResult = new PostponedPluginResult(new Date(), result);
+            }
         } catch (JSONException e) {
             Log.e(TAG, "Error sending NFC event through the channel", e);
         }
-
     }
 
     private void fireNdefEvent(String type, Ndef ndef, Parcelable[] messages) {
@@ -757,41 +682,32 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         sendEvent(NDEF_FORMATABLE, Util.tagToJSON(tag));
     }
 
-    private void fireTagEvent(Tag tag) {
+    private void fireTagEvent(Tag tag, Parcelable[] messages) {
         sendEvent(TAG_DEFAULT, Util.tagToJSON(tag));
     }
 
     private JSONObject buildNdefJSON(Ndef ndef, Parcelable[] messages) {
-
         JSONObject json = Util.ndefToJSON(ndef);
 
-        // ndef is null for peer-to-peer
-        // ndef and messages are null for ndef format-able
         if (ndef == null && messages != null) {
-
             try {
-
                 if (messages.length > 0) {
                     NdefMessage message = (NdefMessage) messages[0];
                     json.put("ndefMessage", Util.messageToJSON(message));
-                    // guessing type, would prefer a more definitive way to determine type
                     json.put("type", "NDEF Push Protocol");
                 }
 
                 if (messages.length > 1) {
                     Log.wtf(TAG, "Expected one ndefMessage but found " + messages.length);
                 }
-
             } catch (JSONException e) {
-                // shouldn't happen
                 Log.e(Util.TAG, "Failed to convert ndefMessage into json", e);
             }
         }
         return json;
     }
 
-    private boolean recycledIntent() { // TODO this is a kludge, find real solution
-
+    private boolean recycledIntent() {
         int flags = getIntent().getFlags();
         if ((flags & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) {
             Log.i(TAG, "Launched from history, killing recycled intent");
@@ -806,7 +722,6 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         Log.d(TAG, "onPause " + getIntent());
         super.onPause(multitasking);
         if (multitasking) {
-            // nfc can't run in background
             stopNfc();
         }
     }
@@ -839,34 +754,9 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         getActivity().setIntent(intent);
     }
 
-    @Override
-    public void onNdefPushComplete(NfcEvent event) {
-
-        // handover (beam) take precedence over share tag (ndef push)
-        if (handoverCallback != null) {
-            PluginResult result = new PluginResult(PluginResult.Status.OK, "Beamed Message to Peer");
-            result.setKeepCallback(true);
-            handoverCallback.sendPluginResult(result);
-        } else if (shareTagCallback != null) {
-            PluginResult result = new PluginResult(PluginResult.Status.OK, "Shared Message with Peer");
-            result.setKeepCallback(true);
-            shareTagCallback.sendPluginResult(result);
-        }
-
-    }
-
-    /**
-     * Enable I/O operations to the tag from this TagTechnology object.
-     * *
-     *
-     * @param tech            TagTechnology class name e.g. 'android.nfc.tech.IsoDep' or 'android.nfc.tech.NfcV'
-     * @param timeout         tag timeout
-     * @param callbackContext Cordova callback context
-     */
     private void connect(final String tech, final int timeout, final CallbackContext callbackContext) {
         this.cordova.getThreadPool().execute(() -> {
             try {
-
                 Tag tag = getIntent().getParcelableExtra(NfcAdapter.EXTRA_TAG);
                 if (tag == null && savedIntent != null) {
                     tag = savedIntent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
@@ -880,21 +770,18 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
 
                 JSONObject resultObject = new JSONObject();
 
-                // get technologies supported by this tag
                 List<String> techList = Arrays.asList(tag.getTechList());
                 if (techList.contains(tech)) {
-                    // use reflection to call the static function Tech.get(tag)
                     tagTechnologyClass = Class.forName(tech);
                     Method method = tagTechnologyClass.getMethod("get", Tag.class);
                     tagTechnology = (TagTechnology) method.invoke(null, tag);
 
-                    // If the tech supports it, return maxTransceiveLength and return it to the user
                     try {
                         Method maxTransceiveLengthMethod = tagTechnologyClass.getMethod("getMaxTransceiveLength");
                         resultObject.put("maxTransceiveLength", maxTransceiveLengthMethod.invoke(tagTechnology));
-                    } catch(NoSuchMethodException e) {
+                    } catch (NoSuchMethodException e) {
                         // Some technologies do not support this, so just ignore.
-                    } catch(JSONException e) {
+                    } catch (JSONException e) {
                         Log.e(TAG, "Error serializing JSON", e);
                     }
                 }
@@ -912,24 +799,13 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
                 Log.e(TAG, "Tag connection failed", ex);
                 callbackContext.error("Tag connection failed");
 
-                // Users should never get these reflection errors
-            } catch (ClassNotFoundException e) {
-                Log.e(TAG, e.getMessage(), e);
-                callbackContext.error(e.getMessage());
-            } catch (NoSuchMethodException e) {
-                Log.e(TAG, e.getMessage(), e);
-                callbackContext.error(e.getMessage());
-            } catch (IllegalAccessException e) {
-                Log.e(TAG, e.getMessage(), e);
-                callbackContext.error(e.getMessage());
-            } catch (InvocationTargetException e) {
+            } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
                 Log.e(TAG, e.getMessage(), e);
                 callbackContext.error(e.getMessage());
             }
         });
     }
 
-    // Call tagTech setTimeout with reflection or fail silently
     private void setTimeout(int timeout) {
         if (timeout < 0) {
             return;
@@ -937,33 +813,21 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         try {
             Method setTimeout = tagTechnologyClass.getMethod("setTimeout", int.class);
             setTimeout.invoke(tagTechnology, timeout);
-        } catch (NoSuchMethodException e) {
-            // ignore
-        } catch (IllegalAccessException e) {
-            // ignore
-        } catch (InvocationTargetException e) {
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             // ignore
         }
     }
 
-    /**
-     * Disable I/O operations to the tag from this TagTechnology object, and release resources.
-     *
-     * @param callbackContext Cordova callback context
-     */
     private void close(CallbackContext callbackContext) {
         cordova.getThreadPool().execute(() -> {
             try {
-
                 if (tagTechnology != null && tagTechnology.isConnected()) {
                     tagTechnology.close();
                     tagTechnology = null;
                     callbackContext.success();
                 } else {
-                    // connection already gone
                     callbackContext.success();
                 }
-
             } catch (IOException ex) {
                 Log.e(TAG, "Error closing nfc connection", ex);
                 callbackContext.error("Error closing nfc connection " + ex.getLocalizedMessage());
@@ -971,12 +835,6 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         });
     }
 
-    /**
-     * Send raw commands to the tag and receive the response.
-     *
-     * @param data            byte[] command to be passed to the tag
-     * @param callbackContext Cordova callback context
-     */
     private void transceive(final byte[] data, final CallbackContext callbackContext) {
         cordova.getThreadPool().execute(() -> {
             try {
@@ -991,9 +849,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
                     return;
                 }
 
-                // Use reflection so we can support many tag types
                 Method transceiveMethod = tagTechnologyClass.getMethod("transceive", byte[].class);
-                @SuppressWarnings("PrimitiveArrayArgumentToVarargsMethod")
                 byte[] response = (byte[]) transceiveMethod.invoke(tagTechnology, data);
 
                 callbackContext.success(response);
@@ -1002,19 +858,10 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
                 String error = "TagTechnology " + tagTechnologyClass.getName() + " does not have a transceive function";
                 Log.e(TAG, error, e);
                 callbackContext.error(error);
-            } catch (NullPointerException e) {
-                // This can happen if the tag has been closed while we're still working with it from the thread pool.
-                Log.e(TAG, e.getMessage(), e);
-                callbackContext.error(e.getMessage());
-            } catch (IllegalAccessException e) {
+            } catch (NullPointerException | IllegalAccessException | InvocationTargetException e) {
                 Log.e(TAG, e.getMessage(), e);
                 callbackContext.error(e.getMessage());
-            } catch (InvocationTargetException e) {
-                Log.e(TAG, e.getMessage(), e);
-                Throwable cause = e.getCause();
-                callbackContext.error(cause.getMessage());
             }
         });
     }
-
 }

package/CHANGES.txt

@@ -1,118 +0,0 @@
-= 1.2.0 =
-iOS allow tag read and write in same session #419
-
-= 1.1.2 =
-Android Fix null pointer exception and possible crash #415 Thanks pschlang 
-iOS Notify Cordova on Successful Tag Write - #408 Thanks H0schi 
-iOS NDEF tags with no messages causes Read Failed #416
-
-= 1.1.1 =
-CoreNFC Framework is optional #400 Thanks M3skar and wux-shuto
-
-= 1.1.0 =
-Implement nfc.write for iOS
-New iOS specific APIs
- * scanNdef
- * scanTag
- * cancelScan    
-Deprecated old iOS APIs
- * beginSession
- * invalidate
-Remove usage of UIWebView and WKWebView. Send event data to Javascript via the channel callback.
-
-= 1.0.4 =
-Added TAG string for iOS entitlement compatibility #376 Thanks ActionZachson
-Add DeviceCapability proximity for Windows 10 builds #358 #265 Thanks DirkHeinke
-Fix issue with AndroidManifest.xml #372 by LuisEGR
-Fix error in documentation arrayBufferToString doesn't exist #356 Thanks JohnMcLear
-
-= 1.0.3 =
-Remove ES6 code from phonegap-nfc.js #325
-
-= 1.0.2 =
-Add reader mode for Android #326 #198
-Add es6 to jshint config, remove strict mode, cleanup jshint errors #325
-
-= 1.0.1 =
-Replace webview.sendJavascript with channel on Android Fixes #196 #249 #225 #263 Thanks jmorille
-Update code that removes event listener #257
-NFC events not firing on first scan Fixes #217 #324 Thanks homer-jay
-
-= 1.0.0 =
-Add new commands nfc.connect, nfc.tranceive, nfc.close to support sending raw commands to NFC tags on Android.
- Support tag types: NfcA (ISO 14443-3A), NfcB (ISO 14443-3B), NfcF (JIS 6319-4), NfcV (ISO 15693), and IsoDep (ISO 14443-4) #320
-
-= 0.7.3 =
-Bump version for npm issues
-
-= 0.7.2 =
-Add support for WKWebView #288 Thanks andreamaioli
-
-= 0.7.1 =
-Automatically Add NFC entitlement for iOS #285 Thanks andreamaioli
-
-= 0.7.0 =
-Add iOS support #139
-Fixed language code field length detection #219 Thanks homer-jay
-Fixed java.util.ConcurrentModificationException #231 Thanks João Gonçalves (Chuckytuh)
-Documentation fixes #224 Thanks Tom Brückner (derwaldgeist)
-
-= 0.6.6 =
-Update Windows platforms (includes Windows Phone 8.1)
- * tag event contains nested ndefMessage object #215
- * support unformatted tags with addTagDiscoveredListener & removeTagDiscoveredListener #204
- * implement showSettings #147
- * better error messages when NFC is disabled #213
- * use NDEF parsing and encoding code from www/phonegap-nfc.js (remove duplication)
- * update documentation
-
-= 0.6.5 =
-Add nfc.showSettings for Android and BlackBerry 10 #147
-Fix package name for Blackberry 10
-
-= 0.6.4 =
-Fix Android compile issue #192
-
-= 0.6.3 =
-Drop support for Cordova 2.9 #192
-Move plugin to NPM #194
-
-= 0.6.2 =
-Add support for Windows Phone 8.1 and Windows 8.1 @jlkalberer #182
-Update share on BlackBerry 10.2 #172
-Fix callback for enabled on Android #169
-Fix documentation @lezardrouge #180
-Fix documentation @JohnMcLear #171
-
-= 0.6.1 =
-Add ndef.tnfToString Fixes #145
-Add ndef.androidApplicationRecord(packageName) Fixes #161
-Add more documentation for NO_NFC and NFC_DISABLED error codes Fixes #160
-Ensure window.nfc is undefined on unsupported platforms like iOS. Fixes #151 & 152 from Jakob Witte Larsen @jakobwitte
-Check if NFC is enabled #146 & #154 from David Froehlich @didlich
-
-= 0.6.0 =
-Change signature for remove*Listener methods. Fixes #142
-
-= 0.5.1 =
-nfc.makeReadOnly Fixes #6
-Better encoding and decoding of UTF-8 strings. Fixes #102
-
-= 0.5.0 =
-remove listeners for Android implemented by Axel Nennker @AxelNennker #129
-bug fix in stopNfc() from Michal Letynski @mletynski #125 #126
-
-= 0.4.9 =
-handleNfcFromIntentFilter is android only
-add isType helper #103
-
-= 0.4.8 =
-Fix IllegalArgumentException #110
-Update documentation about filtering mime types #71 and #72
-Add onLoad for Android #105 and #99
-Build better JSON from @didlich #113
-
-= 0.4.7 =
-Rewrite BlackBerry10 implementation for Cordova 3.0
-Remove unused Android Ant scripts
-Update documentation