Split receiveMessages method

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index f70c4e29d33766a405d15fd79e2de413f10359a1..ac0cc02fc03aa98017798236ef3cabbfbf06bcfe 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -193,9 +193,15 @@ public interface Manager extends Closeable {
 
     void requestAllSyncData() throws IOException;
 
 
     void requestAllSyncData() throws IOException;
 

-    void receiveMessages(
-            long timeout, TimeUnit unit, boolean returnOnTimeout, ReceiveMessageHandler handler
-    ) throws IOException;
+    /**
+     * Receive new messages from server, returns if no new message arrive in a timespan of timeout.
+     */
+    void receiveMessages(long timeout, TimeUnit unit, ReceiveMessageHandler handler) throws IOException;
+
+    /**
+     * Receive new messages from server, returns only if the thread is interrupted.
+     */
+    void receiveMessages(ReceiveMessageHandler handler) throws IOException;

 
     void setIgnoreAttachments(boolean ignoreAttachments);
 
 
     void setIgnoreAttachments(boolean ignoreAttachments);
 

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 bec7f52143cf7c902ef2545545f18ca47567c1f3..0421a4010634e931821defe3e6852cead0e51230 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -873,7 +873,16 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void receiveMessages(
+    public void receiveMessages(long timeout, TimeUnit unit, ReceiveMessageHandler handler) throws IOException {
+        receiveMessages(timeout, unit, true, handler);
+    }
+
+    @Override
+    public void receiveMessages(ReceiveMessageHandler handler) throws IOException {
+        receiveMessages(1L, TimeUnit.HOURS, false, handler);
+    }
+
+    private void receiveMessages(

             long timeout, TimeUnit unit, boolean returnOnTimeout, ReceiveMessageHandler handler
     ) throws IOException {
         retryFailedReceivedMessages(handler);
             long timeout, TimeUnit unit, boolean returnOnTimeout, ReceiveMessageHandler handler
     ) throws IOException {
         retryFailedReceivedMessages(handler);

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 9997f56a9e059325658e3b4d5ab81196224bc73f..9627d9fb7ebb9d79a7191e4b0213f464ec1b377a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -23,7 +23,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.List;
 
 import java.io.IOException;
 import java.util.List;

-import java.util.concurrent.TimeUnit;

 
 public class DaemonCommand implements MultiLocalCommand {
 
 
 public class DaemonCommand implements MultiLocalCommand {
 


@@ -135,7 +134,7 @@ public class DaemonCommand implements MultiLocalCommand {
                     final var receiveMessageHandler = outputWriter instanceof JsonWriter
                             ? new JsonDbusReceiveMessageHandler(m, (JsonWriter) outputWriter, conn, objectPath)
                             : new DbusReceiveMessageHandler(m, (PlainTextWriter) outputWriter, conn, objectPath);
                     final var receiveMessageHandler = outputWriter instanceof JsonWriter
                             ? new JsonDbusReceiveMessageHandler(m, (JsonWriter) outputWriter, conn, objectPath)
                             : new DbusReceiveMessageHandler(m, (PlainTextWriter) outputWriter, conn, objectPath);

-                    m.receiveMessages(1, TimeUnit.HOURS, false, receiveMessageHandler);
+                    m.receiveMessages(receiveMessageHandler);

                     break;
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);
                     break;
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 349bd0c415771b93b6ef8cc5cffcc2fba1e781fc..2a95a8803319e9d0db2aa7269e6d015f71d945fa 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -33,7 +33,6 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;

-import java.util.concurrent.TimeUnit;

 
 public class JsonRpcDispatcherCommand implements LocalCommand {
 
 
 public class JsonRpcDispatcherCommand implements LocalCommand {
 


@@ -173,7 +172,7 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
             while (!Thread.interrupted()) {
                 try {
                     final var receiveMessageHandler = new JsonReceiveMessageHandler(m, jsonWriter);
             while (!Thread.interrupted()) {
                 try {
                     final var receiveMessageHandler = new JsonReceiveMessageHandler(m, jsonWriter);

-                    m.receiveMessages(1, TimeUnit.HOURS, false, receiveMessageHandler);
+                    m.receiveMessages(receiveMessageHandler);

                     break;
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);
                     break;
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index b4797be3528611ef7a5248a404b2f27dc2e80c63..e72d809027b9075ef678ac0cd756d34434ebfc69 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -142,17 +142,16 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         double timeout = ns.getDouble("timeout");
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         double timeout = ns.getDouble("timeout");

-        var returnOnTimeout = true;
-        if (timeout < 0) {
-            returnOnTimeout = false;
-            timeout = 3600;
-        }

         boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
         m.setIgnoreAttachments(ignoreAttachments);
         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
         boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
         m.setIgnoreAttachments(ignoreAttachments);
         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);

-            m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, handler);
+            if (timeout < 0) {
+                m.receiveMessages(handler);
+            } else {
+                m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, handler);
+            }

         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
         }
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
         }

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 93d368881a68465c0fef0f5abac2612623135ff2..31e29ac931faa7ac97b1da59c2a61b1471ca8325 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -423,9 +423,14 @@ public class DbusManagerImpl implements Manager {
         signal.sendSyncRequest();
     }
 
         signal.sendSyncRequest();
     }
 

+    @Override
+    public void receiveMessages(final ReceiveMessageHandler handler) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+

     @Override
     public void receiveMessages(
     @Override
     public void receiveMessages(

-            final long timeout, final TimeUnit unit, final boolean returnOnTimeout, final ReceiveMessageHandler handler
+            final long timeout, final TimeUnit unit, final ReceiveMessageHandler handler

     ) throws IOException {
         throw new UnsupportedOperationException();
     }
     ) throws IOException {
         throw new UnsupportedOperationException();
     }