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

package/src/android/gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/src/android/local.properties

@@ -1,8 +1,8 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Dec 09 16:00:29 CET 2019
-sdk.dir=C\:\\Android\\android-sdk
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Dec 09 16:00:29 CET 2019
+sdk.dir=C\:\\Android\\android-sdk

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

@@ -1,60 +1,60 @@
-//
-//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license. 
-//
-//  JSONBuilder.java
-//  device-com-ble.cordova BLE Cordova Plugin
-//
-package com.chariotsolutions.nfc.plugin;
-
-import android.util.Log;
-
-import com.iotize.android.device.device.impl.IoTizeDevice;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import io.reactivex.annotations.NonNull;
-import io.reactivex.annotations.Nullable;
-
-public class JSONBuilder {
-
-    private static final String TAG = "JSONBuilder";
-
-    @NonNull
-    public static JSONObject toJSONObject(NfcPluginError error) {
-        try {
-            JSONObject json = new JSONObject();
-
-            json.put("code", error.getCode());
-            json.put("message", error.getMessage());
-
-            return json;
-        } catch (JSONException e) {
-            Log.e(TAG, "Internal error", e);
-            throw new Error("INTERNAL ERROR: " + e.getMessage(), e);
-        }
-    }
-
-    @Nullable
-    public static JSONObject toJSONObject(@Nullable IoTizeDevice tap) {
-        if (tap != null) {
-            try {
-//                byte[] sessionKey = tap.getSessionKey();
-                byte[] initializationVector = null; // TODO
-                JSONObject json = new JSONObject();
-
-//                json.put("sessionKey", sessionKey);
-                json.put("initializationVector", initializationVector);
-                json.put("name", "TODO");
-                json.put("nfcPairingDone", true);
-
-                return json;
-            } catch (JSONException e) {
-                Log.e(TAG, "Internal error", e);
-                throw new Error("INTERNAL ERROR: " + e.getMessage(), e);
-            }
-        } else {
-            return null;
-        }
-    }
-}
+//
+//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license. 
+//
+//  JSONBuilder.java
+//  device-com-ble.cordova BLE Cordova Plugin
+//
+package com.chariotsolutions.nfc.plugin;
+
+import android.util.Log;
+
+import com.iotize.android.device.device.impl.IoTizeDevice;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import io.reactivex.annotations.NonNull;
+import io.reactivex.annotations.Nullable;
+
+public class JSONBuilder {
+
+    private static final String TAG = "JSONBuilder";
+
+    @NonNull
+    public static JSONObject toJSONObject(NfcPluginError error) {
+        try {
+            JSONObject json = new JSONObject();
+
+            json.put("code", error.getCode());
+            json.put("message", error.getMessage());
+
+            return json;
+        } catch (JSONException e) {
+            Log.e(TAG, "Internal error", e);
+            throw new Error("INTERNAL ERROR: " + e.getMessage(), e);
+        }
+    }
+
+    @Nullable
+    public static JSONObject toJSONObject(@Nullable IoTizeDevice tap) {
+        if (tap != null) {
+            try {
+//                byte[] sessionKey = tap.getSessionKey();
+                byte[] initializationVector = null; // TODO
+                JSONObject json = new JSONObject();
+
+//                json.put("sessionKey", sessionKey);
+                json.put("initializationVector", initializationVector);
+                json.put("name", "TODO");
+                json.put("nfcPairingDone", true);
+
+                return json;
+            } catch (JSONException e) {
+                Log.e(TAG, "Internal error", e);
+                throw new Error("INTERNAL ERROR: " + e.getMessage(), e);
+            }
+        } else {
+            return null;
+        }
+    }
+}

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

@@ -131,104 +131,117 @@ public class NfcPlugin extends CordovaPlugin {
 
     @Override
     public boolean execute(String action, JSONArray data, CallbackContext callbackContext) throws JSONException {
+        try {
+            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
-        if (action.equalsIgnoreCase(SHOW_SETTINGS)) {
-            showSettings(callbackContext);
-            return true;
-        }
+            // 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
-        }
+            // the channel is set up when the plugin starts
+            if (action.equalsIgnoreCase(CHANNEL)) {
+                channelCallback = callbackContext;
+                return true; // short circuit
+            }
 
-        if (!getNfcStatus().equals(STATUS_NFC_OK)) {
-            callbackContext.error(getNfcStatus());
-            return true; // short circuit
-        }
+            if (!getNfcStatus().equals(STATUS_NFC_OK)) {
+                callbackContext.error(getNfcStatus());
+                return true; // short circuit
+            }
 
-        createPendingIntent();
+            createPendingIntent();
 
-        if (action.equalsIgnoreCase(READER_MODE)) {
-            int flags = data.getInt(0);
-            readerMode(flags, callbackContext);
+            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(REGISTER_NFC_TAP_DEVICE)) {
+            } else if (action.equalsIgnoreCase(REGISTER_MIME_TYPE)) {
+                registerMimeType(data, callbackContext);
+            } else if (action.equalsIgnoreCase(REGISTER_NFC_TAP_DEVICE)) {
 //            JSONObject jsonStringOptions = data.getJSONObject(0);
-            registerTapDevice(callbackContext);
-        } else if (action.equalsIgnoreCase(REMOVE_MIME_TYPE)) {
-            removeMimeType(data, callbackContext);
+                registerTapDevice(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)) {
+                registerNdef(callbackContext);
+            } else if (action.equalsIgnoreCase(REMOVE_NDEF)) {
+                removeNdef(callbackContext);
 
-        } else if (action.equalsIgnoreCase(REGISTER_NDEF_FORMATABLE)) {
-            registerNdefFormatable(callbackContext);
+            } else if (action.equalsIgnoreCase(REGISTER_NDEF_FORMATABLE)) {
+                registerNdefFormatable(callbackContext);
 
-        } else if (action.equals(REGISTER_DEFAULT_TAG)) {
-            registerDefaultTag(callbackContext);
+            } else if (action.equals(REGISTER_DEFAULT_TAG)) {
+                registerDefaultTag(callbackContext);
 
-        } else if (action.equals(REMOVE_DEFAULT_TAG)) {
-            removeDefaultTag(callbackContext);
+            } else if (action.equals(REMOVE_DEFAULT_TAG)) {
+                removeDefaultTag(callbackContext);
 
-        } else if (action.equalsIgnoreCase(WRITE_TAG)) {
-            writeTag(data, callbackContext);
+            } else if (action.equalsIgnoreCase(WRITE_TAG)) {
+                writeTag(data, callbackContext);
 
-        } else if (action.equalsIgnoreCase(ERASE_TAG)) {
-            eraseTag(callbackContext);
+            } else if (action.equalsIgnoreCase(ERASE_TAG)) {
+                eraseTag(callbackContext);
 
-        } else if (action.equalsIgnoreCase(INIT)) {
-            init(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(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_TAP)) {
-            String tech = data.getString(0);
-            int timeout = data.optInt(1, -1);
-            connectTap(tech, timeout, callbackContext);
+            } 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);
-            connectRaw(tech, timeout, callbackContext);
+            } else if (action.equalsIgnoreCase(CONNECT_RAW)) {
+                String tech = data.getString(0);
+                int timeout = data.optInt(1, -1);
+                connectRaw(tech, timeout, callbackContext);
 
-        } else if (action.equalsIgnoreCase(TRANSCEIVE)) {
-            CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
+            } else if (action.equalsIgnoreCase(TRANSCEIVE)) {
+                CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
 
-            byte[] command = args.getArrayBuffer(0);
-            transceiveRaw(command, callbackContext);
+                byte[] command = args.getArrayBuffer(0);
+                transceiveRaw(command, callbackContext);
 
-        } else if (action.equalsIgnoreCase(TRANSCEIVE_TAP)) {
-            CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
+            } else if (action.equalsIgnoreCase(TRANSCEIVE_TAP)) {
+                CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
 
-            byte[] command = args.getArrayBuffer(0);
-            transceiveTap(command, callbackContext);
+                byte[] command = args.getArrayBuffer(0);
+                transceiveTap(command, callbackContext);
 
-        } else if (action.equalsIgnoreCase(CLOSE)) {
-            close(callbackContext);
+            } else if (action.equalsIgnoreCase(CLOSE)) {
+                close(callbackContext);
 
-        } else if (action.equalsIgnoreCase(SET_TAP_DEVICE_DISCOVERY_ENABLED)) {
-            CordovaArgs args = new CordovaArgs(data);
-            this._isTapDeviceDiscoveryEnabled = args.getBoolean(0);
-        } else {
-            // invalid action
-            callbackContext.error("Invalid NFC action \"" + action +"\"");
-            return false;
+            } else if (action.equalsIgnoreCase(SET_TAP_DEVICE_DISCOVERY_ENABLED)) {
+                CordovaArgs args = new CordovaArgs(data);
+                this._isTapDeviceDiscoveryEnabled = args.getBoolean(0);
+            } else {
+                // invalid action
+                callbackContext.error("Invalid NFC action \"" + action + "\"");
+                return false;
+            }
+            return true;
+        }
+        catch (SecurityException err) {
+            if (err.getMessage().startsWith("Permission Denial")) {
+                callbackContext.error("NFC Tag lost!");
+            }
+            else {
+                callbackContext.error(err.getMessage());
+            }
+            return true;
+        }
+        catch (Throwable err) {
+            callbackContext.error(err.getMessage());
+            return true;
         }
-
-        return true;
     }
 
     private String getNfcStatus() {
@@ -492,11 +505,9 @@ public class NfcPlugin extends CordovaPlugin {
                         callbackContext.error("Tag doesn't support NDEF");
                     }
                 }
-            } catch (FormatException e) {
-                callbackContext.error(e.getMessage());
-            } catch (TagLostException e) {
-                callbackContext.error(e.getMessage());
-            } catch (IOException e) {
+            } catch (SecurityException e) {
+                callbackContext.error("NFC Tag lost!");
+            } catch (Throwable e) {
                 callbackContext.error(e.getMessage());
             }
         });
@@ -1054,7 +1065,7 @@ public class NfcPlugin extends CordovaPlugin {
                 }
                 callbackContext.success();
 
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 Log.e(TAG, "Error closing nfc connection", ex);
                 callbackContext.error("Error closing nfc connection " + ex.getLocalizedMessage());
             }
@@ -1142,7 +1153,7 @@ public class NfcPlugin extends CordovaPlugin {
                 }
                 byte[] response = nfcProtocol.send(data);
                 callbackContext.success(Helper.ByteArrayToHexString(response));
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 Log.e(TAG, e.getMessage(), e);
                 callbackContext.error(e.getMessage());
             }

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;
+    }
+}