improved ordering of muc participants

3 files changed, 25 insertions, 9 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 8d7c5adbd..d26ecd7c1 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -133,7 +133,7 @@ public class MucOptions {
 
 	}
 
-	public static class User {
+	public static class User implements Comparable<User> {
 		private Role role = Role.NONE;
 		private Affiliation affiliation = Affiliation.NONE;
 		private Jid realJid;
@@ -222,7 +222,13 @@ public class MucOptions {
 		}
 
 		public Contact getContact() {
-			return getAccount().getRoster().getContactFromRoster(getRealJid());
+			if (fullJid != null) {
+				return getAccount().getRoster().getContactFromRoster(realJid);
+			} else if (realJid != null){
+				return getAccount().getRoster().getContact(realJid);
+			} else {
+				return null;
+			}
 		}
 
 		public boolean setAvatar(Avatar avatar) {
@@ -278,6 +284,21 @@ public class MucOptions {
 		public boolean realJidMatchesAccount() {
 			return realJid != null && realJid.equals(options.account.getJid().toBareJid());
 		}
+
+		@Override
+		public int compareTo(User another) {
+			Contact ourContact = getContact();
+			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 Account account;
diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index cf9e10fff..03f19ed82 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -83,7 +83,7 @@ public abstract class AbstractParser {
 			fullJid = null;
 		}
 		Jid realJid = item.getAttributeAsJid("jid");
-		MucOptions.User user = new MucOptions.User(conference.getMucOptions(), fullJid);
+		MucOptions.User user = new MucOptions.User(conference.getMucOptions(), nick == null ? null : fullJid);
 		user.setRealJid(realJid);
 		user.setAffiliation(affiliation);
 		user.setRole(role);
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 245dba159..2e4b94e58 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -579,12 +579,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		membersView.removeAllViews();
 		final ArrayList<User> users = mucOptions.getUsers();
-		Collections.sort(users,new Comparator<User>() {
-			@Override
-			public int compare(User l, User r) {
-				return l.getName() == null || r.getName() == null ? 0 : l.getName().compareToIgnoreCase(r.getName());
-			}
-		});
+		Collections.sort(users);
 		for (final User user : users) {
 			View view = inflater.inflate(R.layout.contact, membersView,false);
 			this.setListItemBackgroundOnView(view);