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

simplified muc users ordering

This commit is contained in:
Daniel Gultsch 2016-07-04 19:30:19 +02:00
parent ac8aa63916
commit cdee91363c
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,18 +301,19 @@ public class MucOptions {
} else if (getAffiliation().outranks(another.getAffiliation())) { } else if (getAffiliation().outranks(another.getAffiliation())) {
return -1; return -1;
} else { } else {
Contact ourContact = getContact(); return getComparableName().compareToIgnoreCase(another.getComparableName());
Contact anotherContact = another.getContact();
if (ourContact != null && anotherContact != null) {
return ourContact.compareTo(anotherContact);
} else if (ourContact == null && anotherContact != null) {
return getName().compareToIgnoreCase(anotherContact.getDisplayName());
} else if (ourContact != null) {
return ourContact.getDisplayName().compareToIgnoreCase(another.getName());
} else {
return getName().compareToIgnoreCase(another.getName());
} }
} }
private String getComparableName() {
Contact contact = getContact();
if (contact != null) {
return contact.getDisplayName();
} else {
String name = getName();
return name == null ? "" : name;
}
} }
public Jid getRealJid() { public Jid getRealJid() {