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

simplified muc users ordering

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

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

@ -301,17 +301,18 @@ 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()); private String getComparableName() {
} else if (ourContact != null) { Contact contact = getContact();
return ourContact.getDisplayName().compareToIgnoreCase(another.getName()); if (contact != null) {
} else { return contact.getDisplayName();
return getName().compareToIgnoreCase(another.getName()); } else {
} String name = getName();
return name == null ? "" : name;
} }
} }