CommandQueue synchronized

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

@@ -101,17 +101,21 @@ public class CommandQueue {
     }
 
     private synchronized void removeAll(Command.CommandType type) {
+        synchronized (queue) {
             for (int i = queue.size() - 1; i >= 0; i--) {
                 if (queue.get(i).commandType == type) {
                     queue.remove(i);
                 }
             }
         }
+    }
 
     private synchronized boolean isLastScheduled(Command.CommandType type) {
+        synchronized (queue) {
             if (queue.size() > 0 && queue.get(queue.size() - 1).commandType == type) {
                 return true;
             }
+        }
         return false;
     }
 
@@ -119,27 +123,34 @@ public class CommandQueue {
         // inject as a first command
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Adding as first: " + command.getClass().getSimpleName() + " - " + command.status());
+        synchronized (queue) {
             queue.addFirst(command);
         }
+    }
 
     private synchronized void add(Command command) {
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Adding: " + command.getClass().getSimpleName() + " - " + command.status());
+        synchronized (queue) {
             queue.add(command);
         }
+    }
 
     synchronized void pickup() {
+        synchronized (queue) {
             performing = queue.poll();
         }
+    }
 
     synchronized void clear() {
         performing = null;
+        synchronized (queue) {
             for (int i = 0; i < queue.size(); i++) {
                 queue.get(i).cancel();
             }
-
             queue.clear();
         }
+    }
 
     public int size() {
         return queue.size();
@@ -181,11 +192,13 @@ public class CommandQueue {
 
     public synchronized boolean bolusInQueue() {
         if (isRunning(Command.CommandType.BOLUS)) return true;
+        synchronized (queue) {
             for (int i = 0; i < queue.size(); i++) {
                 if (queue.get(i).commandType == Command.CommandType.BOLUS) {
                     return true;
                 }
             }
+        }
         return false;
     }
 
@@ -440,11 +453,13 @@ public class CommandQueue {
     public synchronized boolean statusInQueue() {
         if (isRunning(Command.CommandType.READSTATUS))
             return true;
+        synchronized (queue) {
             for (int i = 0; i < queue.size(); i++) {
                 if (queue.get(i).commandType == Command.CommandType.READSTATUS) {
                     return true;
                 }
             }
+        }
         return false;
     }
 
@@ -528,16 +543,19 @@ public class CommandQueue {
     public Spanned spannedStatus() {
         String s = "";
         int line = 0;
-        if (performing != null) {
+        Command perf = performing;
-            s += "<b>" + performing.status() + "</b>";
+        if (perf != null) {
+            s += "<b>" + perf.status() + "</b>";
             line++;
         }
+        synchronized (queue) {
             for (int i = 0; i < queue.size(); i++) {
                 if (line != 0)
                     s += "<br>";
                 s += queue.get(i).status();
                 line++;
             }
+        }
         return Html.fromHtml(s);
     }