Merge pull request #278 from ano95/bug/member-list

Fix JSON in member list
RocketChat · May 8, 2017 · 0e331c3 · 0e331c3
2 parents d642f07 + 0d412ef
commit 0e331c3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...src/main/java/chat/rocket/android/fragment/chatroom/dialog/UsersOfRoomDialogFragment.java b/...src/main/java/chat/rocket/android/fragment/chatroom/dialog/UsersOfRoomDialogFragment.java
@@ -164,7 +164,13 @@ private void onUpdateGetUsersOfRoomProcedure(GetUsersOfRoomsProcedure procedure)
         JSONArray array = new JSONArray(procedure.getRecords());
         ArrayList<String> users = new ArrayList<>();
         for (int i = 0; i < array.length(); i++) {
-          users.add(array.getString(i));
+          Object userObject = array.get(i);
+          if (userObject instanceof JSONObject) {
+            JSONObject user = (JSONObject) userObject;
+            users.add(user.getString("username"));
+          } else {
+            users.add((String) userObject);
+          }
         }
         onRenderUsers(users);
       } catch (JSONException exception) {