Only display the number of users in breakout rooms list.

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala

@@ -62,9 +62,7 @@ class JsonMessageSenderActor(val service: MessageSender)
   }
 
   private def handleUpdateBreakoutUsers(msg: UpdateBreakoutUsersOutMessage) {
-    val users = new java.util.ArrayList[BreakoutUserPayload]()
-    msg.users.foreach(x => users.add(new BreakoutUserPayload(x.id, x.name)))
-    val payload = new UpdateBreakoutUsersPayload(msg.meetingId, msg.breakoutId, users)
+    val payload = new UpdateBreakoutUsersPayload(msg.meetingId, msg.breakoutId, msg.numberOfUsers)
     val request = new UpdateBreakoutUsers(payload)
     service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
   }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala

@@ -37,7 +37,7 @@ case class BreakoutRoomOutPayload(breakoutId: String, name: String, parentId: St
 case class BreakoutRoomJoinURLOutMessage(meetingId: String, recorded: Boolean, breakoutId: String, userId: String, joinURL: String) extends IOutMessage
 case class BreakoutRoomStartedOutMessage(meetingId: String, recorded: Boolean, breakout: BreakoutRoomBody) extends IOutMessage
 case class BreakoutRoomBody(name: String, breakoutId: String)
-case class UpdateBreakoutUsersOutMessage(meetingId: String, recorded: Boolean, breakoutId: String, users: Vector[BreakoutUser]) extends IOutMessage
+case class UpdateBreakoutUsersOutMessage(meetingId: String, recorded: Boolean, breakoutId: String, numberOfUsers: Integer) extends IOutMessage
 case class MeetingTimeRemainingUpdate(meetingId: String, recorded: Boolean, timeRemaining: Int) extends IOutMessage
 case class BreakoutRoomEndedOutMessage(meetingId: String, breakoutId: String) extends IOutMessage
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala

@@ -88,7 +88,7 @@ trait BreakoutRoomApp extends SystemConfiguration {
 
   def handleBreakoutRoomUsersUpdate(msg: BreakoutRoomUsersUpdate) {
     breakoutModel.updateBreakoutUsers(msg.breakoutId, msg.users) foreach { room =>
-      outGW.send(new UpdateBreakoutUsersOutMessage(mProps.meetingID, mProps.recorded, msg.breakoutId, room.users))
+      outGW.send(new UpdateBreakoutUsersOutMessage(mProps.meetingID, mProps.recorded, msg.breakoutId, room.users.length))
     }
   }
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala

@@ -177,7 +177,7 @@ object MeetingMessageToJsonConverter {
     payload.put("meetingId", msg.meetingId)
     payload.put("breakoutId", msg.breakoutId)
     payload.put("recorded", msg.recorded)
-    payload.put("users", msg.users.toArray)
+    payload.put("numberOfUsers", msg.numberOfUsers)
 
     val header = Util.buildHeader(UpdateBreakoutUsers.NAME, None)
     Util.buildJson(header, payload)

bbb-common-message/src/main/java/org/bigbluebutton/messages/UpdateBreakoutUsers.java

@@ -6,19 +6,19 @@
 import com.google.gson.Gson;
 
 public class UpdateBreakoutUsers implements IBigBlueButtonMessage {
-  public final static String NAME = "UpdateBreakoutUsers";
-  
-  public final Header header;
-  public final UpdateBreakoutUsersPayload payload;
-  
-  public UpdateBreakoutUsers(UpdateBreakoutUsersPayload payload) {
-    this.header = new Header(NAME);
-    this.payload = payload;
-    
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
+	public final static String NAME = "UpdateBreakoutUsers";
+
+	public final Header header;
+	public final UpdateBreakoutUsersPayload payload;
+
+	public UpdateBreakoutUsers(UpdateBreakoutUsersPayload payload) {
+		this.header = new Header(NAME);
+		this.payload = payload;
+
+	}
+
+	public String toJson() {
+		Gson gson = new Gson();
+		return gson.toJson(this);
+	}
 }

bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/UpdateBreakoutUsersPayload.java

@@ -1,16 +1,15 @@
 package org.bigbluebutton.messages.payload;
 
-import java.util.ArrayList;
-
 public class UpdateBreakoutUsersPayload {
 
-  public final ArrayList<BreakoutUserPayload> users;
-  public final String breakoutId;
-  public final String meetingId;
-
-  public UpdateBreakoutUsersPayload(String meetingId, String breakoutId, ArrayList<BreakoutUserPayload> users) {
-    this.meetingId = meetingId;
-    this.breakoutId = breakoutId;
-    this.users = users;
-  }
+	public final Integer numberOfUsers;
+	public final String breakoutId;
+	public final String meetingId;
+
+	public UpdateBreakoutUsersPayload(String meetingId, String breakoutId,
+			Integer numberOfUsers) {
+		this.meetingId = meetingId;
+		this.breakoutId = breakoutId;
+		this.numberOfUsers = numberOfUsers;
+	}
 }

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java

@@ -564,7 +564,7 @@ private void processUpdateBreakoutUsers(UpdateBreakoutUsers msg) {
 	  Map<String, Object> args = new HashMap<String, Object>();	
 	  args.put("meetingId", msg.payload.meetingId);
 	  args.put("breakoutId", msg.payload.breakoutId);
-	  args.put("users", msg.payload.users);
+	  args.put("numberOfUsers", msg.payload.numberOfUsers);
 
 	  Map<String, Object> message = new HashMap<String, Object>();
 	  Gson gson = new Gson();

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

@@ -133,9 +133,6 @@ package org.bigbluebutton.common
         [Embed(source="assets/images/user.png")]
         public var user:Class;		
 
-        [Embed(source="assets/images/users.png")]
-        public var users:Class;		
-
         [Embed(source="assets/images/administrator.gif")]
         public var admin:Class;
 

bigbluebutton-client/src/org/bigbluebutton/main/model/users/BreakoutRoom.as

@@ -18,8 +18,6 @@
  */
 package org.bigbluebutton.main.model.users {
 
-	import mx.collections.ArrayCollection;
-
 	[Bindable]
 	public class BreakoutRoom {
 		public static const NONE:String = "none";
@@ -32,13 +30,9 @@ package org.bigbluebutton.main.model.users {
 
 		public var name:String;
 
-		public var users:ArrayCollection;
+		public var numberOfUsers:int;
 
 		// Can be one of three following values self, none, other
 		public var listenStatus:String = NONE;
-
-		public function BreakoutRoom() {
-			users = new ArrayCollection();
-		}
 	}
 }

bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as

@@ -536,10 +536,10 @@ package org.bigbluebutton.main.model.users {
 			breakoutRooms.refresh();
 		}
 
-		public function updateBreakoutRoomUsers(breakoutId:String, users:Array):void {
+		public function updateBreakoutRoomUsers(breakoutId:String, users:int):void {
 			var room:Object = getBreakoutRoom(breakoutId);
-			if (room!= null) {
-				BreakoutRoom(room).users = new ArrayCollection(users);
+			if (room != null) {
+				BreakoutRoom(room).numberOfUsers = users;
 			}
 		}
 

bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as

@@ -617,7 +617,7 @@ package org.bigbluebutton.modules.users.services
 
 	private function handleUpdateBreakoutUsers(msg:Object):void{
 		var map:Object = JSON.parse(msg.msg);
-		UserManager.getInstance().getConference().updateBreakoutRoomUsers(map.breakoutId, map.users);
+		UserManager.getInstance().getConference().updateBreakoutRoomUsers(map.breakoutId, map.numberOfUsers);
 	}
 
 	private function handleTimeRemainingUpdate(msg:Object):void{

bigbluebutton-client/src/org/bigbluebutton/modules/users/views/RoomActionsRenderer.mxml

@@ -33,7 +33,7 @@
 
 	<mx:Button id="listenBtn" toggle="true"
 			   width="20" height="20"
-			   icon="{images.transfer}" toolTip="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.listen')}"
+			   icon="{images.transfer}" toolTip="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.transfer')}"
 			   click="listenToBreakoutRoom(event)" visible="{data.listenStatus != BreakoutRoom.OTHER}"/>
 	<mx:Button id="joinImg" width="20" height="20"
 			   icon="{images.join}" toolTip="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.join')}"

bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml

@@ -563,8 +563,7 @@
 					 dragEnabled="false" width="100%" height="100%" draggableColumns="false">
 			<mx:columns>
 				<mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.room')}" />
-				<mx:DataGridColumn dataField="users" headerText="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.users')}"
-								   itemRenderer="org.bigbluebutton.modules.users.views.RoomUsersRenderer"/>
+				<mx:DataGridColumn dataField="numberOfUsers" headerText="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.users')}"/>
 				<mx:DataGridColumn dataField="breakoutId" headerText="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.action')}" 
 								   itemRenderer="org.bigbluebutton.modules.users.views.RoomActionsRenderer"/>
 			</mx:columns>