@iotize/device-com-nfc.cordova 3.8.1 → 3.9.0

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

@@ -1,15 +1,15 @@
-package com.chariotsolutions.nfc.plugin;
-
-class NfcPluginError extends Exception {
-
-    String code;
-
-    public String getCode() {
-        return code;
-    }
-
-    public NfcPluginError(String code, String message, Throwable cause) {
-        super(message, cause);
-        this.code = code;
-    }
-}
+package com.chariotsolutions.nfc.plugin;
+
+class NfcPluginError extends Exception {
+
+    String code;
+
+    public String getCode() {
+        return code;
+    }
+
+    public NfcPluginError(String code, String message, Throwable cause) {
+        super(message, cause);
+        this.code = code;
+    }
+}

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

@@ -1,85 +1,85 @@
-//
-//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license. 
-//
-//  PluginResponse.java
-//  device-com-ble.cordova BLE Cordova Plugin
-//
-package com.chariotsolutions.nfc.plugin;
-
-import com.iotize.android.core.util.Helper;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.PluginResult;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public class PluginResponse {
-
-    private static final String TAG = "PluginResponse";
-    private final CallbackContext callbackContext;
-    private final String action;
-
-    public PluginResponse(String action, JSONArray args, CallbackContext callbackContext) {
-        this.callbackContext = callbackContext;
-        this.action = action;
-
-    }
-
-    public void newResult(String data) {
-        PluginResult result = new PluginResult(
-                PluginResult.Status.OK,
-                data
-        );
-        result.setKeepCallback(true);
-        this.callbackContext.sendPluginResult(result);
-    }
-
-    public void newResult(JSONObject data) {
-        PluginResult result = new PluginResult(
-                PluginResult.Status.OK,
-                data
-        );
-        result.setKeepCallback(true);
-        this.callbackContext.sendPluginResult(result);
-    }
-
-    public void newResult(NfcPluginError error) {
-        this.callbackContext.sendPluginResult(new PluginResult(
-                PluginResult.Status.ERROR,
-                JSONBuilder.toJSONObject(error)
-        ));
-    }
-
-    public void success(JSONObject object) {
-        this.callbackContext.success(object);
-    }
-
-    public void success(byte[] response) {
-        this.callbackContext.success(Helper.ByteArrayToHexString(response));
-    }
-
-    public void error(NfcPluginError err) {
-        JSONObject object = JSONBuilder.toJSONObject(err);
-        this.callbackContext.error(object);
-    }
-
-    public void success(boolean isConnected) {
-        this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, isConnected));    }
-
-    public void success() {
-        this.callbackContext.success();
-    }
-
-    public void error(String message) {
-        this.callbackContext.success(message);
-    }
-
-    public void success(String msg) {
-        this.callbackContext.success(msg);
-    }
-
-    public CallbackContext getCallbackContext() {
-        return callbackContext;
-    }
-
-}
+//
+//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license. 
+//
+//  PluginResponse.java
+//  device-com-ble.cordova BLE Cordova Plugin
+//
+package com.chariotsolutions.nfc.plugin;
+
+import com.iotize.android.core.util.Helper;
+
+import org.apache.cordova.CallbackContext;
+import org.apache.cordova.PluginResult;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class PluginResponse {
+
+    private static final String TAG = "PluginResponse";
+    private final CallbackContext callbackContext;
+    private final String action;
+
+    public PluginResponse(String action, JSONArray args, CallbackContext callbackContext) {
+        this.callbackContext = callbackContext;
+        this.action = action;
+
+    }
+
+    public void newResult(String data) {
+        PluginResult result = new PluginResult(
+                PluginResult.Status.OK,
+                data
+        );
+        result.setKeepCallback(true);
+        this.callbackContext.sendPluginResult(result);
+    }
+
+    public void newResult(JSONObject data) {
+        PluginResult result = new PluginResult(
+                PluginResult.Status.OK,
+                data
+        );
+        result.setKeepCallback(true);
+        this.callbackContext.sendPluginResult(result);
+    }
+
+    public void newResult(NfcPluginError error) {
+        this.callbackContext.sendPluginResult(new PluginResult(
+                PluginResult.Status.ERROR,
+                JSONBuilder.toJSONObject(error)
+        ));
+    }
+
+    public void success(JSONObject object) {
+        this.callbackContext.success(object);
+    }
+
+    public void success(byte[] response) {
+        this.callbackContext.success(Helper.ByteArrayToHexString(response));
+    }
+
+    public void error(NfcPluginError err) {
+        JSONObject object = JSONBuilder.toJSONObject(err);
+        this.callbackContext.error(object);
+    }
+
+    public void success(boolean isConnected) {
+        this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, isConnected));    }
+
+    public void success() {
+        this.callbackContext.success();
+    }
+
+    public void error(String message) {
+        this.callbackContext.success(message);
+    }
+
+    public void success(String msg) {
+        this.callbackContext.success(msg);
+    }
+
+    public CallbackContext getCallbackContext() {
+        return callbackContext;
+    }
+
+}

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

@@ -1,140 +1,140 @@
-package com.chariotsolutions.nfc.plugin;
-
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.Tag;
-import android.nfc.tech.Ndef;
-import android.util.Log;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class Util {
-
-    static final String TAG = "NfcPlugin";
-
-    static JSONObject ndefToJSON(Ndef ndef) {
-        JSONObject json = new JSONObject();
-
-        if (ndef != null) {
-            try {
-
-                Tag tag = ndef.getTag();
-                // tag is going to be null for NDEF_FORMATABLE until NfcUtil.parseMessage is refactored
-                if (tag != null) {
-                    json.put("id", byteArrayToJSON(tag.getId()));
-                    json.put("techTypes", new JSONArray(Arrays.asList(tag.getTechList())));
-                }
-
-                json.put("type", translateType(ndef.getType()));
-                json.put("maxSize", ndef.getMaxSize());
-                json.put("isWritable", ndef.isWritable());
-                json.put("ndefMessage", messageToJSON(ndef.getCachedNdefMessage()));
-                // Workaround for bug in ICS (Android 4.0 and 4.0.1) where
-                // mTag.getTagService(); of the Ndef object sometimes returns null
-                // see http://issues.mroland.at/index.php?do=details&task_id=47
-                try {
-                  json.put("canMakeReadOnly", ndef.canMakeReadOnly());
-                } catch (NullPointerException e) {
-                  json.put("canMakeReadOnly", JSONObject.NULL);
-                }
-            } catch (JSONException e) {
-                Log.e(TAG, "Failed to convert ndef into json: " + ndef.toString(), e);
-            }
-        }
-        return json;
-    }
-
-    static JSONObject tagToJSON(Tag tag) {
-        JSONObject json = new JSONObject();
-
-        if (tag != null) {
-            try {
-                json.put("id", byteArrayToJSON(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);
-            }
-        }
-        return json;
-    }
-
-    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;
-        }
-        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) {
-            json.put(aByte);
-        }
-        return json;
-    }
-
-    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>();
-
-        for (NdefRecord ndefRecord : message.getRecords()) {
-            list.add(recordToJSON(ndefRecord));
-        }
-
-        return new JSONArray(list);
-    }
-
-    static JSONObject recordToJSON(NdefRecord record) {
-        JSONObject json = new JSONObject();
-        try {
-            json.put("tnf", record.getTnf());
-            json.put("type", byteArrayToJSON(record.getType()));
-            json.put("id", byteArrayToJSON(record.getId()));
-            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);
-        }
-        return json;
-    }
-
-}
+package com.chariotsolutions.nfc.plugin;
+
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.Tag;
+import android.nfc.tech.Ndef;
+import android.util.Log;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class Util {
+
+    static final String TAG = "NfcPlugin";
+
+    static JSONObject ndefToJSON(Ndef ndef) {
+        JSONObject json = new JSONObject();
+
+        if (ndef != null) {
+            try {
+
+                Tag tag = ndef.getTag();
+                // tag is going to be null for NDEF_FORMATABLE until NfcUtil.parseMessage is refactored
+                if (tag != null) {
+                    json.put("id", byteArrayToJSON(tag.getId()));
+                    json.put("techTypes", new JSONArray(Arrays.asList(tag.getTechList())));
+                }
+
+                json.put("type", translateType(ndef.getType()));
+                json.put("maxSize", ndef.getMaxSize());
+                json.put("isWritable", ndef.isWritable());
+                json.put("ndefMessage", messageToJSON(ndef.getCachedNdefMessage()));
+                // Workaround for bug in ICS (Android 4.0 and 4.0.1) where
+                // mTag.getTagService(); of the Ndef object sometimes returns null
+                // see http://issues.mroland.at/index.php?do=details&task_id=47
+                try {
+                  json.put("canMakeReadOnly", ndef.canMakeReadOnly());
+                } catch (NullPointerException e) {
+                  json.put("canMakeReadOnly", JSONObject.NULL);
+                }
+            } catch (JSONException e) {
+                Log.e(TAG, "Failed to convert ndef into json: " + ndef.toString(), e);
+            }
+        }
+        return json;
+    }
+
+    static JSONObject tagToJSON(Tag tag) {
+        JSONObject json = new JSONObject();
+
+        if (tag != null) {
+            try {
+                json.put("id", byteArrayToJSON(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);
+            }
+        }
+        return json;
+    }
+
+    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;
+        }
+        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) {
+            json.put(aByte);
+        }
+        return json;
+    }
+
+    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>();
+
+        for (NdefRecord ndefRecord : message.getRecords()) {
+            list.add(recordToJSON(ndefRecord));
+        }
+
+        return new JSONArray(list);
+    }
+
+    static JSONObject recordToJSON(NdefRecord record) {
+        JSONObject json = new JSONObject();
+        try {
+            json.put("tnf", record.getTnf());
+            json.put("type", byteArrayToJSON(record.getType()));
+            json.put("id", byteArrayToJSON(record.getId()));
+            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);
+        }
+        return json;
+    }
+
+}

package/src/ios/AppDelegate+NFC.swift

@@ -1,51 +1,51 @@
-//
-//  AppDelegate+NFC.swift
-//  PhoneGap NFC - Cordova Plugin
-//
-//  Copyright © 2019 dev@iotize.com. All rights reserved.
-
-import CoreNFC
-
-extension AppDelegate {
-    
-    override open func application(_ application: UIApplication,
-                     continue userActivity: NSUserActivity,
-                     restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
-        
-        NSLog("Extending UIApplicationDelegate")
-        
-        guard userActivity.activityType == NSUserActivityTypeBrowsingWeb else {
-            return false
-        }
-        
-        // Confirm that the NSUserActivity object contains a valid NDEF message.
-        if #available(iOS 12.0, *) {
-            let ndefMessage = userActivity.ndefMessagePayload
-            guard ndefMessage.records.count > 0,
-            ndefMessage.records[0].typeNameFormat != .empty else {
-                return false
-            }
-            let nfcPluginInstance: NfcPlugin = self.viewController.getCommandInstance("NfcPlugin") as! NfcPlugin
-            var resolved: Bool = false;
-            NSLog(nfcPluginInstance.debugDescription);
-            
-            DispatchQueue.global().async {
-                let waitingTimeInterval: Double = 0.1;
-                print("<NFC> Did start timeout")
-                for _ in 1...2000 { // 5?s timeout
-                    if ( !nfcPluginInstance.isListeningNDEF ) {
-                    Thread.sleep(forTimeInterval: waitingTimeInterval)
-                    } else {
-                        let jsonDictionary = ndefMessage.ndefMessageToJSON()
-                        nfcPluginInstance.sendThroughChannel(jsonDictionary: jsonDictionary)
-                        resolved = true
-                        return
-                    }
-                }
-        }
-            return resolved
-        } else {
-            return false
-        }
-    }
-}
+//
+//  AppDelegate+NFC.swift
+//  PhoneGap NFC - Cordova Plugin
+//
+//  Copyright © 2019 dev@iotize.com. All rights reserved.
+
+import CoreNFC
+
+extension AppDelegate {
+    
+    override open func application(_ application: UIApplication,
+                     continue userActivity: NSUserActivity,
+                     restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
+        
+        NSLog("Extending UIApplicationDelegate")
+        
+        guard userActivity.activityType == NSUserActivityTypeBrowsingWeb else {
+            return false
+        }
+        
+        // Confirm that the NSUserActivity object contains a valid NDEF message.
+        if #available(iOS 12.0, *) {
+            let ndefMessage = userActivity.ndefMessagePayload
+            guard ndefMessage.records.count > 0,
+            ndefMessage.records[0].typeNameFormat != .empty else {
+                return false
+            }
+            let nfcPluginInstance: NfcPlugin = self.viewController.getCommandInstance("NfcPlugin") as! NfcPlugin
+            var resolved: Bool = false;
+            NSLog(nfcPluginInstance.debugDescription);
+            
+            DispatchQueue.global().async {
+                let waitingTimeInterval: Double = 0.1;
+                print("<NFC> Did start timeout")
+                for _ in 1...2000 { // 5?s timeout
+                    if ( !nfcPluginInstance.isListeningNDEF ) {
+                    Thread.sleep(forTimeInterval: waitingTimeInterval)
+                    } else {
+                        let jsonDictionary = ndefMessage.ndefMessageToJSON()
+                        nfcPluginInstance.sendThroughChannel(jsonDictionary: jsonDictionary)
+                        resolved = true
+                        return
+                    }
+                }
+        }
+            return resolved
+        } else {
+            return false
+        }
+    }
+}