Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master

1 files changed, 18 insertions, 16 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 399d9fdf..e4bfd6ff 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -25,6 +25,8 @@ import android.widget.Toast;
 import org.openintents.openpgp.util.OpenPgpUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import eu.siacs.conversations.R;
@@ -142,24 +144,17 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 	@Override
 	public void onConversationUpdate() {
-		runOnUiThread(new Runnable() {
-
-			@Override
-			public void run() {
-				updateView();
-			}
-		});
+		refreshUi();
 	}
 
 	@Override
 	public void onMucRosterUpdate() {
-		runOnUiThread(new Runnable() {
+		refreshUi();
+	}
 
-			@Override
-			public void run() {
-				updateView();
-			}
-		});
+	@Override
+	protected void refreshUiReal() {
+		updateView();
 	}
 
 	@Override
@@ -431,9 +426,16 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 		}
 		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		membersView.removeAllViews();
-		for (final User user : mConversation.getMucOptions().getUsers()) {
-			View view = inflater.inflate(R.layout.contact, membersView,
-					false);
+		final ArrayList<User> users = new ArrayList<>();
+		users.addAll(mConversation.getMucOptions().getUsers());
+		Collections.sort(users,new Comparator<User>() {
+			@Override
+			public int compare(User lhs, User rhs) {
+				return lhs.getName().compareToIgnoreCase(rhs.getName());
+			}
+		});
+		for (final User user : users) {
+			View view = inflater.inflate(R.layout.contact, membersView,false);
 			this.setListItemBackgroundOnView(view);
 			view.setOnClickListener(new OnClickListener() {
 				@Override