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

don’t use xmpp or jabber as default muc nick

Browse source
This commit is contained in:
Daniel Gultsch 2017-08-23 10:06:32 +02:00
parent 26f7702c39
commit 94e0c6b38c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package eu.siacs.conversations.entities;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -20,6 +21,8 @@ import eu.siacs.conversations.xmpp.pep.Avatar;
@SuppressLint("DefaultLocale") @SuppressLint("DefaultLocale")
public class MucOptions { public class MucOptions {
private static List<String> LOCALPART_BLACKLIST = Arrays.asList("xmpp","jabber");
private boolean mAutoPushConfiguration = true; private boolean mAutoPushConfiguration = true;
public Account getAccount() { public Account getAccount() {
@ -594,7 +597,7 @@ public class MucOptions {
} }
} }
public String getProposedNick() { private String getProposedNick() {
if (conversation.getBookmark() != null if (conversation.getBookmark() != null
&& conversation.getBookmark().getNick() != null && conversation.getBookmark().getNick() != null
&& !conversation.getBookmark().getNick().trim().isEmpty()) { && !conversation.getBookmark().getNick().trim().isEmpty()) {
@ -602,7 +605,14 @@ public class MucOptions {
} else if (!conversation.getJid().isBareJid()) { } else if (!conversation.getJid().isBareJid()) {
return conversation.getJid().getResourcepart(); return conversation.getJid().getResourcepart();
} else { } else {
return account.getUsername(); Jid jid = account.getJid();
if (LOCALPART_BLACKLIST.contains(jid.getLocalpart())) {
final String domain = jid.getDomainpart();
final int index = domain.lastIndexOf('.');
return index > 1 ? domain.substring(0,index) : domain;
} else {
return jid.getLocalpart();
}
} }
} }