Prevent crash when outgoingQueueIdlingResource is idle on message deq…

…ueue success
owntracks · Aug 18, 2021 · a12842d · a12842d
1 parent 0a65c3c
commit a12842d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/project/app/src/main/java/org/owntracks/android/services/MessageProcessor.java b/project/app/src/main/java/org/owntracks/android/services/MessageProcessor.java
@@ -102,7 +102,6 @@ public MessageProcessor(
                 outgoingQueueIdlingResource.increment();
             }
         }
-
     }
 
     synchronized public void initialize() {
@@ -291,7 +290,15 @@ private void sendAvailableMessages() {
                     Thread.sleep(retryWait);
                     retryWait = Math.min(2 * retryWait, SEND_FAILURE_BACKOFF_MAX_WAIT);
                 } else {
-                    outgoingQueueIdlingResource.decrement();
+                    synchronized (outgoingQueueIdlingResource) {
+                        try {
+                            if (!outgoingQueueIdlingResource.isIdleNow()) {
+                                outgoingQueueIdlingResource.decrement();
+                            }
+                        } catch (IllegalStateException e) {
+                            Timber.w(e, "outgoingQueueIdlingResource is invalid");
+                        }
+                    }
                 }
             } catch (InterruptedException e) {
                 Timber.i(e, "Outgoing message loop interrupted");