narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

clean up getProposedNick

Browse source
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

7
src/main/java/eu/siacs/conversations/entities/MucOptions.java
View file

@ -281,16 +281,15 @@ 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 { } else if (!conversation.getContactJid().isBareJid()) {
if (!conversation.getContactJid().isBareJid()) {
return conversation.getContactJid().getResourcepart(); return conversation.getContactJid().getResourcepart();
} else { } else {
return account.getUsername(); return account.getUsername();
} }
} }
}
public String getActualNick() { public String getActualNick() {
if (this.self.getName() != null) { if (this.self.getName() != null) {