aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-03 19:24:11 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-03 19:24:11 +0200
commit7398424f3ba5c36ffab9a92ddd10cb3cf8eb42e0 (patch)
tree463227caadb45cf9508fa61a974c09948ae5fe11 /src/main/java
parente26d84254979101374c5abb4a8788c9dd7e6349d (diff)
trim nick from bookmark before checking if it's empty
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/MucOptions.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index d0848370..c71afd99 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -504,8 +504,8 @@ public class MucOptions {
public String getProposedNick() {
if (conversation.getBookmark() != null
&& conversation.getBookmark().getNick() != null
- && !conversation.getBookmark().getNick().isEmpty()) {
- return conversation.getBookmark().getNick();
+ && !conversation.getBookmark().getNick().trim().isEmpty()) {
+ return conversation.getBookmark().getNick().trim();
} else if (!conversation.getJid().isBareJid()) {
return conversation.getJid().getResourcepart();
} else {