3 files changed, 4 insertions(+), 0 deletions(-)

M src/main/java/eu/siacs/conversations/entities/MucOptions.java
M src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
M src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java

@@ 568,6 568,8 @@ public class MucOptions {
     }
 
     public static List<User> sub(final List<User> users, final int max) {
+        if (users.size() < max) return users;
+
         final var subset = new ArrayList<User>();
         final var addresses = new HashSet<Jid>();
         for (final var user : users) {

@@ 802,6 802,7 @@ public class ConferenceDetailsActivity extends XmppActivity
                     R.drawable.ic_notifications_none_24dp);
         }
         final List<User> users = mucOptions.getUsers();
+        users.add(mucOptions.getSelf());
         Collections.sort(
                 users,
                 (a, b) -> {

@@ 62,6 62,7 @@ public class MucUsersActivity extends XmppActivity implements XmppConnectionServ
     private void loadAndSubmitUsers() {
         if (mConversation != null) {
             allUsers = mConversation.getMucOptions().getUsers(true, mConversation.getMucOptions().getSelf().ranks(Affiliation.ADMIN));
+            allUsers.add(mConversation.getMucOptions().getSelf());
             submitFilteredList(mSearchEditText != null ? mSearchEditText.getText().toString() : null);
         }
     }