sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up getProposedNick

This commit is contained in:
iNPUTmice 2014-12-03 00:00:25 +01:00
parent 9152e1ac95
commit 39a3f372dd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/entities/MucOptions.java
View File

@ -281,14 +281,13 @@ public class MucOptions {
public String getProposedNick() { public String getProposedNick() {
if (conversation.getBookmark() != null if (conversation.getBookmark() != null
&& conversation.getBookmark().getNick() != null) { && conversation.getBookmark().getNick() != null
&& !conversation.getBookmark().getNick().isEmpty()) {
return conversation.getBookmark().getNick(); return conversation.getBookmark().getNick();
} else if (!conversation.getContactJid().isBareJid()) {
return conversation.getContactJid().getResourcepart();
} else { } else {
if (!conversation.getContactJid().isBareJid()) { return account.getUsername();
return conversation.getContactJid().getResourcepart();
} else {
return account.getUsername();
}
} }
} }