@iotize/device-com-nfc.cordova 3.5.0 → 3.6.0

package/esm2015/www/cordova-interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"cordova-interface.js","sourceRoot":"","sources":["../../../../../src/www/cordova-interface.ts"],"names":[],"mappings":"","sourcesContent":["//\n//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license.\n//\n//  cordova-interface.ts\n//  device-com-ble.cordova BLE Cordova Plugin\n//\n/**\n * Partial typings for phonegap nfc cordova interface class\n */\nexport interface CordovaInterface {\n  /**\n   * Close current nfc tag\n   */\n  close(): Promise<void>;\n\n  /**\n   * Connect to current nfc tag\n   */\n  connect(tech: string, timeout?: number): Promise<void>;\n\n  /**\n   * Transeive data using Tap NFC communication protocol\n   * @param data ArrayBuffer or string of hex data for transcieve\n   */\n  transceiveTap(data: ArrayBuffer | string): Promise<string>;\n\n  /**\n   * Transeive raw data\n   * @param data ArrayBuffer or string of hex data for transcieve\n   */\n  transceive(data: ArrayBuffer | string): Promise<string>;\n\n  setTapDeviceDiscoveryEnabled(value: boolean): Promise<void>;\n  \n  /**\n   * Begins a reading session for the given technology.\n   * @param tech String representing the technology of the tap to discover.\n   */\n  beginSessionFromTech(tech: string, alertMessage?: string): Promise<void>;\n\n  endSession(): Promise<void>;\n}\n"]}
+{"version":3,"file":"cordova-interface.js","sourceRoot":"","sources":["../../../../../src/www/cordova-interface.ts"],"names":[],"mappings":"","sourcesContent":["//\n//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license.\n//\n//  cordova-interface.ts\n//  device-com-ble.cordova BLE Cordova Plugin\n//\n/**\n * Partial typings for phonegap nfc cordova interface class\n */\nexport interface CordovaInterface {\n  /**\n   * Close current nfc tag\n   */\n  close(): Promise<void>;\n\n  /**\n   * Connect to current Tap nfc tag\n   */\n  connect(tech: string, timeout?: number): Promise<void>;\n\n  /**\n   * Raw NFC connect\n   */\n  connectRaw(tech: string, timeout?: number): Promise<void>;\n\n  /**\n   * Transeive data using Tap NFC communication protocol\n   * @param data ArrayBuffer or string of hex data for transcieve\n   */\n  transceiveTap(data: ArrayBuffer | string): Promise<string>;\n\n  /**\n   * Transeive raw data\n   * @param data ArrayBuffer or string of hex data for transcieve\n   */\n  transceive(data: ArrayBuffer | string): Promise<string>;\n\n  setTapDeviceDiscoveryEnabled(value: boolean): Promise<void>;\n\n  /**\n   * Begins a reading session for the given technology.\n   * @param tech String representing the technology of the tap to discover.\n   */\n  beginSessionFromTech(tech: string, alertMessage?: string): Promise<void>;\n\n  endSession(): Promise<void>;\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iotize/device-com-nfc.cordova",
   "main": "bundles/iotize-device-com-nfc.cordova.umd.js",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Near Field Communication (NFC) Plugin. Read and write NDEF messages to NFC tags and share NDEF messages with peers.",
   "cordova": {
     "id": "@iotize/device-com-nfc.cordova",

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

@@ -81,7 +81,8 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     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 CONNECT_TAP = "connect";
+    private static final String CONNECT_RAW = "connectRaw";
     private static final String CLOSE = "close";
     private static final String TRANSCEIVE_TAP = "transceiveTap";
     private static final String TRANSCEIVE = "transceive";
@@ -94,10 +95,15 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     private static final String PREF_NFC_PAIRING_DONE_TOAST_MESSAGE = "NFCParingDoneToastMessage";
     private static final String REGISTER_NFC_TAP_DEVICE = "registerTapDevice";
     private static final String SET_TAP_DEVICE_DISCOVERY_ENABLED = "setTapDeviceDiscoveryEnabled";
+    private static final String ANDROID_NFC_TECH_CLASS_PASS = "android.nfc.tech.";
+    private static final String DEFAULT_NFC_TECH_CLASS_PASS = ANDROID_NFC_TECH_CLASS_PASS + "NfcV";
 
     @Nullable
     private TagTechnology tagTechnology = null;
 
+    @NonNull
+    private String _lastTechName = DEFAULT_NFC_TECH_CLASS_PASS;
+
     @Nullable
     private Class<?> tagTechnologyClass;
 
@@ -135,7 +141,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     @Override
     public boolean execute(String action, JSONArray data, CallbackContext callbackContext) throws JSONException {
 
-            Log.d(TAG, "execute " + action);
+        Log.d(TAG, "execute " + action);
 
         // showSettings can be called if NFC is disabled
         // might want to skip this if NO_NFC
@@ -218,10 +224,15 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
             // if code made it here, NFC is enabled
             callbackContext.success(STATUS_NFC_OK);
 
-        } else if (action.equalsIgnoreCase(CONNECT)) {
+        } else if (action.equalsIgnoreCase(CONNECT_TAP)) {
+            String tech = data.getString(0);
+            int timeout = data.optInt(1, -1);
+            connectTap(tech, timeout, callbackContext);
+
+        } else if (action.equalsIgnoreCase(CONNECT_RAW)) {
             String tech = data.getString(0);
             int timeout = data.optInt(1, -1);
-            connect(tech, timeout, callbackContext);
+            connectRaw(tech, timeout, callbackContext);
 
         } else if (action.equalsIgnoreCase(TRANSCEIVE)) {
             CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
@@ -320,11 +331,14 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         NFCIntentParser parser = this.getIntentParser(intent);
         ProtocolFactory nfcProtocolFactory = new NFCProtocolFactory(parser.getTag());
         IoTizeDevice tap = IoTizeDevice.fromProtocol(nfcProtocolFactory.create(context));
+
+        boolean nfcPairingEnabled = preferences.getBoolean(PREF_ENABLE_NFC_PAIRING, true);
+        boolean encryptionEnabled = preferences.getBoolean(PREF_ENABLE_ENCRYPTION_WITH_NFC, false);
         tap.connect();
-        if (preferences.getBoolean(PREF_ENABLE_NFC_PAIRING, true)) {
+        if (nfcPairingEnabled) {
             byte[] response = tap.nfcPairing();
         }
-        if (preferences.getBoolean(PREF_ENABLE_ENCRYPTION_WITH_NFC, false)) {
+        if (encryptionEnabled) {
             tap.encryption(true, true);
         }
         return tap;
@@ -623,7 +637,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
             int pendingIntentFlags = 0;
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
                 pendingIntentFlags = PendingIntent.FLAG_MUTABLE;
-            } 
+            }
             pendingIntent = PendingIntent.getActivity(activity, 0, intent, pendingIntentFlags);
         }
     }
@@ -880,7 +894,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
             if (tagTech.equals(NdefFormatable.class.getName())) {
                 fireNdefFormatableEvent(tag);
             } else if (tagTech.equals(Ndef.class.getName())) { //
-                 this._fireNdefEvent(tag, messages);
+                this._fireNdefEvent(tag, messages);
             }
         }
     }
@@ -947,7 +961,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     private void fireNdefEvent(String type, Ndef ndef, Parcelable[] messages) {
         try {
             JSONObject json = buildNdefJSON(ndef, messages);
-              sendEvent(type, json);
+            sendEvent(type, json);
         } catch (Throwable e) {
             Log.w(TAG, "Failed to fire NDef event", e);
         }
@@ -1129,18 +1143,22 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
      * @param timeout         tag timeout
      * @param callbackContext Cordova callback context
      */
-    private void connect(final String tech, final int timeout,
-                         final CallbackContext callbackContext) {
+    private void connectRaw(final String tech, final int timeout,
+                            final CallbackContext callbackContext) {
+        final String fullTechName = !tech.startsWith(ANDROID_NFC_TECH_CLASS_PASS) ? ANDROID_NFC_TECH_CLASS_PASS + tech : tech;
         this.cordova.getThreadPool().execute(() -> {
             try {
-                this._initIntentTag(tech);
+                this._lastTechName = fullTechName;
+                this._initIntentTag(fullTechName);
 
-                if (nfcProtocol == null) {        
+                if (tagTechnology == null) {
                     callbackContext.error("Tag does not support " + tech);
                     return;
                 }
 
-                nfcProtocol.connect();
+                if (!tagTechnology.isConnected()) {
+                    tagTechnology.connect();
+                }
                 setTimeout(timeout);
                 Log.d(TAG, "NFC Connection successful");
                 callbackContext.success();
@@ -1154,8 +1172,38 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
         });
     }
 
-    private void _initIntentTag() throws Exception {
-        this._initIntentTag("android.nfc.tech.NfcV"); // TODO
+    /**
+     * Perform Tap NFCProtocol connect call
+     *
+     * @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 connectTap(final String tech, final int timeout,
+                            final CallbackContext callbackContext) {
+        final String fullTechName = !tech.startsWith(ANDROID_NFC_TECH_CLASS_PASS) ? ANDROID_NFC_TECH_CLASS_PASS + tech : tech;
+        this.cordova.getThreadPool().execute(() -> {
+            try {
+                this._lastTechName = fullTechName;
+                this._initIntentTag(fullTechName);
+
+                if (nfcProtocol == null) {
+                    callbackContext.error("Tag does not support " + tech);
+                    return;
+                }
+
+                nfcProtocol.connect();
+                setTimeout(timeout);
+                Log.d(TAG, "NFC Connection successful");
+                callbackContext.success();
+            } catch (IOException ex) {
+                Log.e(TAG, "Tag connection failed", ex);
+                callbackContext.error("Tag connection failed");
+            } catch (Throwable e) {
+                Log.e(TAG, e.getMessage(), e);
+                callbackContext.error(e.getMessage());
+            }
+        });
     }
 
     private void _initIntentTag(final String tech) throws Exception {
@@ -1206,6 +1254,7 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     private void close(CallbackContext callbackContext) {
         cordova.getThreadPool().execute(() -> {
             try {
+                _lastTechName = DEFAULT_NFC_TECH_CLASS_PASS;
                 if (nfcProtocol != null && nfcProtocol.isConnected()) {
                     nfcProtocol.disconnect();
                 }
@@ -1267,13 +1316,13 @@ public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCom
     }
 
     private void _connectIntentTag() throws Exception {
-        this._initIntentTag();
+        this._initIntentTag(this._lastTechName);
         tagTechnology.connect();
     }
 
     private void _connectIntentTagIfNeeded() throws Exception {
         if (tagTechnology == null) {
-            this._initIntentTag();
+            this._initIntentTag(this._lastTechName);
             tagTechnology.connect();
         }
     }

package/www/cordova-interface.d.ts

@@ -7,9 +7,13 @@ export interface CordovaInterface {
      */
     close(): Promise<void>;
     /**
-     * Connect to current nfc tag
+     * Connect to current Tap nfc tag
      */
     connect(tech: string, timeout?: number): Promise<void>;
+    /**
+     * Raw NFC connect
+     */
+    connectRaw(tech: string, timeout?: number): Promise<void>;
     /**
      * Transeive data using Tap NFC communication protocol
      * @param data ArrayBuffer or string of hex data for transcieve

package/www/phonegap-nfc.js

@@ -512,6 +512,13 @@ var nfc = {
         });
     },
 
+
+    connectRaw: function(tech, timeout) {
+        return new Promise(function(resolve, reject) {
+            cordova.exec(resolve, reject, 'NfcPlugin', 'connectRaw', [tech, timeout]);
+        });
+    },
+
     close: function() {
         return new Promise(function(resolve, reject) {
             cordova.exec(resolve, reject, 'NfcPlugin', 'close', []);