From 090faad3743ca7134a0ce398a9d2b62d84477e86 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 16 Dec 2017 22:33:34 +0100
Subject: support error messages in quick edit dialog

---
 .../java/de/pixart/messenger/services/XmppConnectionService.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index bc3f6e0bf..3a32f02a0 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -2537,9 +2537,12 @@ public class XmppConnectionService extends Service {
         return false;
     }
 
-    public void renameInMuc(final Conversation conversation, final String nick, final UiCallback<Conversation> callback) {
+    public boolean renameInMuc(final Conversation conversation, final String nick, final UiCallback<Conversation> callback) {
         final MucOptions options = conversation.getMucOptions();
         final Jid joinJid = options.createJoinJid(nick);
+        if (joinJid == null) {
+            return false;
+        }
         if (options.online()) {
             Account account = conversation.getAccount();
             options.setOnRenameListener(new OnRenameListener() {
@@ -2584,6 +2587,7 @@ public class XmppConnectionService extends Service {
                 joinMuc(conversation);
             }
         }
+        return true;
     }
 
     public void leaveMuc(Conversation conversation) {
-- 
cgit v1.2.3