Refactor dbus receive message handler

diff --git a/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java
index ff7a56cf545186ca8ba7a098a2740ac35246990a..ccf72538d1f810a0d7f972b48665fbbf57d0a1ca 100644 (file)
--- a/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java
@@ -1,25 +1,123 @@
 package org.asamk.signal;
 
+import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.groups.GroupUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 
-public class DbusReceiveMessageHandler extends ReceiveMessageHandler {
+import java.util.ArrayList;
+import java.util.List;
 
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+
+public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
+
+    private final Manager m;
     private final DBusConnection conn;
     private final String objectPath;
 
-    public DbusReceiveMessageHandler(Manager m, PlainTextWriter writer, DBusConnection conn, final String objectPath) {
-        super(m, writer);
+    public DbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) {
+        this.m = m;
         this.conn = conn;
         this.objectPath = objectPath;
     }
 
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-        super.handleMessage(envelope, content, exception);
+        if (envelope.isReceipt()) {
+            try {
+                conn.sendMessage(new Signal.ReceiptReceived(objectPath, envelope.getTimestamp(),
+                        // A receipt envelope always has a source address
+                        getLegacyIdentifier(envelope.getSourceAddress())));
+            } catch (DBusException e) {
+                e.printStackTrace();
+            }
+        } else if (content != null) {
+            final var sender = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid()
+                    ? envelope.getSourceAddress()
+                    : content.getSender();
+            if (content.getReceiptMessage().isPresent()) {
+                final var receiptMessage = content.getReceiptMessage().get();
+                if (receiptMessage.isDeliveryReceipt()) {
+                    for (long timestamp : receiptMessage.getTimestamps()) {
+                        try {
+                            conn.sendMessage(new Signal.ReceiptReceived(objectPath,
+                                    timestamp,
+                                    getLegacyIdentifier(sender)));
+                        } catch (DBusException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } else if (content.getDataMessage().isPresent()) {
+                var message = content.getDataMessage().get();
+
+                var groupId = getGroupId(message);
+                if (!message.isEndSession() && (
+                        groupId == null
+                                || message.getGroupContext().get().getGroupV1Type() == null
+                                || message.getGroupContext().get().getGroupV1Type() == SignalServiceGroup.Type.DELIVER
+                )) {
+                    try {
+                        conn.sendMessage(new Signal.MessageReceived(objectPath,
+                                message.getTimestamp(),
+                                getLegacyIdentifier(sender),
+                                groupId != null ? groupId : new byte[0],
+                                message.getBody().isPresent() ? message.getBody().get() : "",
+                                getAttachments(message, m)));
+                    } catch (DBusException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } else if (content.getSyncMessage().isPresent()) {
+                var sync_message = content.getSyncMessage().get();
+                if (sync_message.getSent().isPresent()) {
+                    var transcript = sync_message.getSent().get();
+
+                    if (transcript.getDestination().isPresent() || transcript.getMessage()
+                            .getGroupContext()
+                            .isPresent()) {
+                        var message = transcript.getMessage();
+                        var groupId = getGroupId(message);
+
+                        try {
+                            conn.sendMessage(new Signal.SyncMessageReceived(objectPath,
+                                    transcript.getTimestamp(),
+                                    getLegacyIdentifier(sender),
+                                    transcript.getDestination().isPresent()
+                                            ? getLegacyIdentifier(transcript.getDestination().get())
+                                            : "",
+                                    groupId != null ? groupId : new byte[0],
+                                    message.getBody().isPresent() ? message.getBody().get() : "",
+                                    getAttachments(message, m)));
+                        } catch (DBusException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static byte[] getGroupId(final SignalServiceDataMessage message) {
+        return message.getGroupContext().isPresent() ? GroupUtils.getGroupId(message.getGroupContext().get())
+                .serialize() : null;
+    }
 
-        JsonDbusReceiveMessageHandler.sendReceivedMessageToDbus(envelope, content, conn, objectPath, m);
+    static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {
+        var attachments = new ArrayList<String>();
+        if (message.getAttachments().isPresent()) {
+            for (var attachment : message.getAttachments().get()) {
+                if (attachment.isPointer()) {
+                    attachments.add(m.getAttachmentFile(attachment.asPointer().getRemoteId()).getAbsolutePath());
+                }
+            }
+        }
+        return attachments;
     }
 }

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
deleted file mode 100644 (file)
index 9433d20..0000000
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.asamk.signal;
-
-import org.asamk.Signal;
-import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupUtils;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.exceptions.DBusException;
-import org.whispersystems.signalservice.api.messages.SignalServiceContent;
-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.asamk.signal.util.Util.getLegacyIdentifier;
-
-public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
-
-    private final DBusConnection conn;
-
-    private final String objectPath;
-
-    public JsonDbusReceiveMessageHandler(
-            Manager m, JsonWriter jsonWriter, DBusConnection conn, final String objectPath
-    ) {
-        super(m, jsonWriter);
-        this.conn = conn;
-        this.objectPath = objectPath;
-    }
-
-    static void sendReceivedMessageToDbus(
-            SignalServiceEnvelope envelope,
-            SignalServiceContent content,
-            DBusConnection conn,
-            final String objectPath,
-            Manager m
-    ) {
-        if (envelope.isReceipt()) {
-            try {
-                conn.sendMessage(new Signal.ReceiptReceived(objectPath, envelope.getTimestamp(),
-                        // A receipt envelope always has a source address
-                        getLegacyIdentifier(envelope.getSourceAddress())));
-            } catch (DBusException e) {
-                e.printStackTrace();
-            }
-        } else if (content != null) {
-            final var sender = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid()
-                    ? envelope.getSourceAddress()
-                    : content.getSender();
-            if (content.getReceiptMessage().isPresent()) {
-                final var receiptMessage = content.getReceiptMessage().get();
-                if (receiptMessage.isDeliveryReceipt()) {
-                    for (long timestamp : receiptMessage.getTimestamps()) {
-                        try {
-                            conn.sendMessage(new Signal.ReceiptReceived(objectPath,
-                                    timestamp,
-                                    getLegacyIdentifier(sender)));
-                        } catch (DBusException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } else if (content.getDataMessage().isPresent()) {
-                var message = content.getDataMessage().get();
-
-                var groupId = getGroupId(message);
-                if (!message.isEndSession() && (
-                        groupId == null
-                                || message.getGroupContext().get().getGroupV1Type() == null
-                                || message.getGroupContext().get().getGroupV1Type() == SignalServiceGroup.Type.DELIVER
-                )) {
-                    try {
-                        conn.sendMessage(new Signal.MessageReceived(objectPath,
-                                message.getTimestamp(),
-                                getLegacyIdentifier(sender),
-                                groupId != null ? groupId : new byte[0],
-                                message.getBody().isPresent() ? message.getBody().get() : "",
-                                JsonDbusReceiveMessageHandler.getAttachments(message, m)));
-                    } catch (DBusException e) {
-                        e.printStackTrace();
-                    }
-                }
-            } else if (content.getSyncMessage().isPresent()) {
-                var sync_message = content.getSyncMessage().get();
-                if (sync_message.getSent().isPresent()) {
-                    var transcript = sync_message.getSent().get();
-
-                    if (transcript.getDestination().isPresent() || transcript.getMessage()
-                            .getGroupContext()
-                            .isPresent()) {
-                        var message = transcript.getMessage();
-                        var groupId = getGroupId(message);
-
-                        try {
-                            conn.sendMessage(new Signal.SyncMessageReceived(objectPath,
-                                    transcript.getTimestamp(),
-                                    getLegacyIdentifier(sender),
-                                    transcript.getDestination().isPresent()
-                                            ? getLegacyIdentifier(transcript.getDestination().get())
-                                            : "",
-                                    groupId != null ? groupId : new byte[0],
-                                    message.getBody().isPresent() ? message.getBody().get() : "",
-                                    JsonDbusReceiveMessageHandler.getAttachments(message, m)));
-                        } catch (DBusException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private static byte[] getGroupId(final SignalServiceDataMessage message) {
-        return message.getGroupContext().isPresent() ? GroupUtils.getGroupId(message.getGroupContext().get())
-                .serialize() : null;
-    }
-
-    static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {
-        var attachments = new ArrayList<String>();
-        if (message.getAttachments().isPresent()) {
-            for (var attachment : message.getAttachments().get()) {
-                if (attachment.isPointer()) {
-                    attachments.add(m.getAttachmentFile(attachment.asPointer().getRemoteId()).getAbsolutePath());
-                }
-            }
-        }
-        return attachments;
-    }
-
-    @Override
-    public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-        super.handleMessage(envelope, content, exception);
-
-        sendReceivedMessageToDbus(envelope, content, conn, objectPath, m);
-    }
-}

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index a121c7e93de4f31bc9dfb60b7fe480baf8299169..0b165774540546e1e5cf0427e6e44bf631b5bade 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -6,11 +6,12 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.DbusReceiveMessageHandler;
-import org.asamk.signal.JsonDbusReceiveMessageHandler;
+import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.PlainTextWriter;
+import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;
@@ -131,11 +132,13 @@ public class DaemonCommand implements MultiLocalCommand {
 
         logger.info("Exported dbus object: " + objectPath);
 
-        final var receiveMessageHandler = outputWriter instanceof JsonWriter ? new JsonDbusReceiveMessageHandler(m,
-                (JsonWriter) outputWriter,
-                conn,
-                objectPath) : new DbusReceiveMessageHandler(m, (PlainTextWriter) outputWriter, conn, objectPath);
-        m.addReceiveHandler(receiveMessageHandler);
+        final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
+                (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
+        m.addReceiveHandler(handler);
+
+        final var dbusMessageHandler = new DbusReceiveMessageHandler(m, conn, objectPath);
+        m.addReceiveHandler(dbusMessageHandler);
+
         return initThread;
     }
 }