Add null check and change some formatting

[signal-cli] / src / main / java / org / asamk / signal / ReceiveMessageHandler.java

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index f961fa1fdbed5cdcee7692eb995ca8dfa282085d..711f503dbc3e8e543d2b6700889fe949acce128c 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -449,7 +449,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             System.out.println("Quote: (" + quote.getId() + ")");
             System.out.println(" Author: " + m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier());
             System.out.println(" Text: " + quote.getText());
-            if (quote.getMentions().size() > 0) {
+            if (quote.getMentions() != null && quote.getMentions().size() > 0) {
                 System.out.println(" Mentions: ");
                 for (SignalServiceDataMessage.Mention mention : quote.getMentions()) {
                     printMention(mention, m);
@@ -488,15 +488,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     }
 
     private void printMention(SignalServiceDataMessage.Mention mention, Manager m) {
-        System.out.println("- "
-                + m.resolveSignalServiceAddress(
-                        new SignalServiceAddress(mention.getUuid(), null)
-                ).getLegacyIdentifier()
-                + ": "
-                + mention.getStart()
-                + " (length: "
-                + mention.getLength()
-                + ")");
+        System.out.println("- " + m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null))
+                .getLegacyIdentifier() + ": " + mention.getStart() + " (length: " + mention.getLength() + ")");
     }
 
     private void printAttachment(SignalServiceAttachment attachment) {