Disconnect websocket when receiving is done

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 9e81f2069c3186a03d149f01cfffb9696c4e1560..94a3f4bea4477617d897300c9f5e323e54c5c5e5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -920,6 +920,7 @@ public class ManagerImpl implements Manager {
             return;
         }
         receiveThread = new Thread(() -> {
             return;
         }
         receiveThread = new Thread(() -> {

+            logger.debug("Starting receiving messages");

             while (!Thread.interrupted()) {
                 try {
                     receiveMessagesInternal(1L, TimeUnit.HOURS, false, (envelope, e) -> {
             while (!Thread.interrupted()) {
                 try {
                     receiveMessagesInternal(1L, TimeUnit.HOURS, false, (envelope, e) -> {


@@ -938,12 +939,14 @@ public class ManagerImpl implements Manager {
                     logger.warn("Receiving messages failed, retrying", e);
                 }
             }
                     logger.warn("Receiving messages failed, retrying", e);
                 }
             }

+            logger.debug("Finished receiving messages");

             hasCaughtUpWithOldMessages = false;
             synchronized (messageHandlers) {
                 receiveThread = null;
 
                 // Check if in the meantime another handler has been registered
                 if (!messageHandlers.isEmpty()) {
             hasCaughtUpWithOldMessages = false;
             synchronized (messageHandlers) {
                 receiveThread = null;
 
                 // Check if in the meantime another handler has been registered
                 if (!messageHandlers.isEmpty()) {

+                    logger.debug("Another handler has been registered, starting receive thread again");

                     startReceiveThreadIfRequired();
                 }
             }
                     startReceiveThreadIfRequired();
                 }
             }


@@ -1114,6 +1117,7 @@ public class ManagerImpl implements Manager {
         }
         handleQueuedActions(queuedActions);
         queuedActions.clear();
         }
         handleQueuedActions(queuedActions);
         queuedActions.clear();

+        dependencies.getSignalWebSocket().disconnect();

     }
 
     @Override
     }
 
     @Override