From bfccb7c108e791659c691cab2fa74630d4000135 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 28 May 2018 20:02:18 +0300
Subject: xmpp: do not show null when reply quote is empty

---
 juick-server/src/main/java/com/juick/server/XMPPConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'juick-server/src/main/java/com/juick/server')

diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index 72208fa3..a959fa71 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -317,7 +317,7 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
                 : messagesService.getMessage(jmsg.getMid());
         replyTo = replyMessage.getUser().getName();
         com.juick.Message fullReply = messagesService.getReply(jmsg.getMid(), jmsg.getRid());
-        replyQuote = fullReply.getReplyQuote();
+        replyQuote = StringUtils.defaultString(fullReply.getReplyQuote());
 
         String txt = "Reply by @" + jmsg.getUser().getName() + ":\n" + replyQuote + "\n@" + replyTo + " ";
         String attachmentUrl = MessageUtils.attachmentUrl(fullReply);
-- 
cgit v1.2.3