do not put default nick into bookmark if none has been set before

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 68aa128b6..1918d73d0 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -61,6 +61,7 @@ import de.pixart.messenger.entities.Bookmark;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.ListItem;
+import de.pixart.messenger.entities.MucOptions;
 import de.pixart.messenger.entities.Presence;
 import de.pixart.messenger.services.QuickConversationsService;
 import de.pixart.messenger.services.XmppConnectionService;
@@ -1002,8 +1003,8 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
             } else {
                 final Bookmark bookmark = new Bookmark(account, conferenceJid.asBareJid());
                 bookmark.setAutojoin(getBooleanPreference("autojoin", R.bool.autojoin));
-                String nick = conferenceJid.getResource();
-                if (nick != null && !nick.isEmpty()) {
+                final String nick = conferenceJid.getResource();
+                if (nick != null && !nick.isEmpty() && !nick.equals(MucOptions.defaultNick(account))) {
                     bookmark.setNick(nick);
                 }
                 account.getBookmarks().add(bookmark);