Merge pull request #49 from spark/bugfix/npe-on-cancel-click

Prevents NullPointerException when clicking cancel
particle-iot · Aug 18, 2017 · 2edcde3 · 2edcde3
2 parents 7b78f0a + 9b867fb
commit 2edcde3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/devicesetup/src/main/java/io/particle/android/sdk/devicesetup/ui/ConnectingActivity.java b/devicesetup/src/main/java/io/particle/android/sdk/devicesetup/ui/ConnectingActivity.java
@@ -127,7 +127,9 @@ protected void onCreate(Bundle savedInstanceState) {
         Ui.setText(this, R.id.network_name, networkToConnectTo.ssid);
         Button cancelButton = Ui.findView(this, R.id.action_cancel);
         cancelButton.setOnClickListener(v -> {
-            connectingProcessWorkerTask.cancel(false);
+            if (connectingProcessWorkerTask != null) {
+                connectingProcessWorkerTask.cancel(false);
+            }
             finish();
         });