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

sort muc users by affiliation, name. fixes #1913

Browse source
This commit is contained in:
Daniel Gultsch 2016-06-14 14:41:32 +02:00
parent 95a51ea2e0
commit f9600b950f
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,6 +296,11 @@ public class MucOptions {
@Override @Override
public int compareTo(User another) { public int compareTo(User another) {
if (another.getAffiliation().outranks(getAffiliation())) {
return 1;
} else if (getAffiliation().outranks(another.getAffiliation())) {
return -1;
} else {
Contact ourContact = getContact(); Contact ourContact = getContact();
Contact anotherContact = another.getContact(); Contact anotherContact = another.getContact();
if (ourContact != null && anotherContact != null) { if (ourContact != null && anotherContact != null) {
@ -308,6 +313,7 @@ public class MucOptions {
return getName().compareToIgnoreCase(another.getName()); return getName().compareToIgnoreCase(another.getName());
} }
} }
}
public Jid getRealJid() { public Jid getRealJid() {
return realJid; return realJid;