Merge branch 'dev' into medtronic_andy

app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java

@@ -94,7 +94,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             } else if (editTextPref.getText() != null) {
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
                 pref.setSummary(editTextPref.getText());
-            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().trim())) {
+            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && (editTextPref.getText() == null || TextUtils.isEmpty(editTextPref.getText().trim()))) {
                 pref.setSummary(MainApp.gs(R.string.smscommunicator_allowednumbers_summary));
             }
         }

app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java

@@ -160,6 +160,7 @@ public class InsightPairingActivity extends AppCompatActivity implements Insight
     private void startBLScan() {
         if (!scanning) {
             BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+            if (bluetoothAdapter != null) {
                 if (!bluetoothAdapter.isEnabled()) bluetoothAdapter.enable();
                 IntentFilter intentFilter = new IntentFilter();
                 intentFilter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
@@ -169,11 +170,15 @@ public class InsightPairingActivity extends AppCompatActivity implements Insight
                 scanning = true;
             }
         }
+    }
 
     private void stopBLScan() {
         if (scanning) {
             unregisterReceiver(broadcastReceiver);
-            BluetoothAdapter.getDefaultAdapter().cancelDiscovery();
+            BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+            if (bluetoothAdapter != null) {
+                bluetoothAdapter.cancelDiscovery();
+            }
             scanning = false;
         }
     }

app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java

@@ -190,8 +190,9 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         }
         // prepare task for execution in 1 sec
         // cancel waiting task to prevent sending multiple posts
-        if (callback.getPost() != null)
+        ScheduledFuture<?> scheduledFuture =  callback.getPost();
-            callback.getPost().cancel(false);
+        if (scheduledFuture != null)
+            scheduledFuture.cancel(false);
         Runnable task = new PostRunnable();
         final int sec = 1;
         callback.setPost(eventWorker.schedule(task, sec, TimeUnit.SECONDS));

app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java

@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.LinkedList;
 
+import javax.annotation.Nullable;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
@@ -143,11 +145,11 @@ public class CommandQueue {
         return queue.size();
     }
 
-    public Command performing() {
+    Command performing() {
         return performing;
     }
 
-    public void resetPerforming() {
+    void resetPerforming() {
         performing = null;
     }
 

app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java

@@ -141,6 +141,7 @@ public class QueueThread extends Thread {
                     // Pickup 1st command and set performing variable
                     if (queue.size() > 0) {
                         queue.pickup();
+                        if (queue.performing() != null) {
                             if (L.isEnabled(L.PUMPQUEUE))
                                 log.debug("performing " + queue.performing().status());
                             MainApp.bus().post(new EventQueueChanged());
@@ -152,6 +153,7 @@ public class QueueThread extends Thread {
                             continue;
                         }
                     }
+                }
 
                 if (queue.size() == 0 && queue.performing() == null) {
                     long secondsFromLastCommand = (System.currentTimeMillis() - lastCommandTime) / 1000;
@@ -173,7 +175,7 @@ public class QueueThread extends Thread {
                 }
             }
         } finally {
-            if (mWakeLock != null)
+            if (mWakeLock != null && mWakeLock.isHeld())
                 mWakeLock.release();
             if (L.isEnabled(L.PUMPQUEUE))
                 log.debug("thread end");

app/src/test/java/info/AAPSMocker.java

@@ -150,6 +150,7 @@ public class AAPSMocker {
         when(MainApp.gs(R.string.pumpsuspended)).thenReturn("Pump suspended");
         when(MainApp.gs(R.string.cob)).thenReturn("COB");
         when(MainApp.gs(R.string.value_unavailable_short)).thenReturn("n/a");
+        when(MainApp.gs(R.string.pumpNotInitialized)).thenReturn("Pump not initialized!");
     }
 
     public static MainApp mockMainApp() {