Fixed TransferUserToVoiceConfRequestMessage properties names.

bigbluebutton · Jan 28, 2016 · edef663 · edef663
1 parent cda1e80
commit edef663
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/...esl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java b/...esl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
@@ -86,8 +86,8 @@ private void processMuteVoiceUserRequestMessage(String json) {
 	private void processTransferUserToVoiceConfRequestMessage(String json) {
 		TransferUserToVoiceConfRequestMessage msg = TransferUserToVoiceConfRequestMessage
 				.fromJson(json);
-		fsApp.transferUserToMeeting(msg.voiceConfId, msg.breakoutVoiceConfId,
-				msg.voiceUserId, msg.toBreakout);
+		fsApp.transferUserToMeeting(msg.voiceConfId, msg.targetVoiceConfId,
+				msg.voiceUserId, msg.forward);
 	}
 
 	private void processStartRecordingVoiceConfRequestMessage(String json) {

diff --git a/...rc/main/java/org/bigbluebutton/common/messages/TransferUserToVoiceConfRequestMessage.java b/...rc/main/java/org/bigbluebutton/common/messages/TransferUserToVoiceConfRequestMessage.java
@@ -28,29 +28,29 @@ public class TransferUserToVoiceConfRequestMessage {
 	public static final String VERSION = "0.0.1";
 
 	public static final String VOICE_CONF_ID = "voice_conf_id";
-	public static final String BREAKOUT_VOICE_CONF_ID = "meeting_id";
+	public static final String TARGET_VOICE_CONF_ID = "target_voice_conf_id";
 	public static final String VOICE_USER_ID = "voice_user_id";
-	public static final String TO_BREAKOUT = "mute";
+	public static final String FORWARD = "forward";
 
 	public final String voiceConfId;
-	public final String breakoutVoiceConfId;
+	public final String targetVoiceConfId;
 	public final String voiceUserId;
-	public final Boolean toBreakout;
+	public final Boolean forward;
 
 	public TransferUserToVoiceConfRequestMessage(String voiceConfId,
 			String breakoutVoiceConfId, String voiceUserId, Boolean toBreakout) {
 		this.voiceConfId = voiceConfId;
-		this.breakoutVoiceConfId = breakoutVoiceConfId;
+		this.targetVoiceConfId = breakoutVoiceConfId;
 		this.voiceUserId = voiceUserId;
-		this.toBreakout = toBreakout;
+		this.forward = toBreakout;
 	}
 
 	public String toJson() {
 		HashMap<String, Object> payload = new HashMap<String, Object>();
 		payload.put(VOICE_CONF_ID, voiceConfId);
-		payload.put(BREAKOUT_VOICE_CONF_ID, breakoutVoiceConfId);
+		payload.put(TARGET_VOICE_CONF_ID, targetVoiceConfId);
 		payload.put(VOICE_USER_ID, voiceUserId);
-		payload.put(TO_BREAKOUT, toBreakout);
+		payload.put(FORWARD, forward);
 
 		java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(
 				TRANSFER_USER_TO_VOICE_CONF_REQUEST, VERSION, null);
@@ -70,18 +70,18 @@ public static TransferUserToVoiceConfRequestMessage fromJson(String message) {
 				String messageName = header.get("name").getAsString();
 				if (TRANSFER_USER_TO_VOICE_CONF_REQUEST.equals(messageName)) {
 					if (payload.has(VOICE_CONF_ID)
-							&& payload.has(BREAKOUT_VOICE_CONF_ID)
+							&& payload.has(TARGET_VOICE_CONF_ID)
 							&& payload.has(VOICE_USER_ID)
-							&& payload.has(TO_BREAKOUT)) {
+							&& payload.has(FORWARD)) {
 						String id = payload.get(VOICE_CONF_ID).getAsString();
-						String breakoutVoiceConfId = payload.get(
-								BREAKOUT_VOICE_CONF_ID).getAsString();
+						String targetVoiceConfId = payload.get(
+								TARGET_VOICE_CONF_ID).getAsString();
 						String voiceUserId = payload.get(VOICE_USER_ID)
 								.getAsString();
-						Boolean toBreakout = payload.get(TO_BREAKOUT)
+						Boolean forward = payload.get(FORWARD)
 								.getAsBoolean();
 						return new TransferUserToVoiceConfRequestMessage(id,
-								breakoutVoiceConfId, voiceUserId, toBreakout);
+								targetVoiceConfId, voiceUserId, forward);
 					}
 				}
 			}

diff --git a/bbb-fsesl-client/build.sbt b/bbb-fsesl-client/build.sbt
@@ -19,7 +19,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/sc
 
 libraryDependencies ++= {
   Seq(
-	  "org.jboss.netty"           %  "netty"             % "3.2.1.Final",
+	  "org.jboss.netty"          %  "netty"             % "3.2.1.Final",
 	  "junit"                    %  "junit"             % "4.11",
 	  "ch.qos.logback"           %  "logback-classic"   % "1.0.3"
 	)}

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/RoomActionsRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/RoomActionsRenderer.mxml
@@ -33,7 +33,7 @@
 
 	<mx:Button id="listenImg" width="20" height="20"
 			   icon="{images.listen}" toolTip="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.listen')}"
-			   mouseDown="listenToBreakoutRoom(event)" mouseUp="listenToBreakoutRoom(event)" mouseOut="listenToBreakoutRoom(event)"/>
+			   mouseDown="listenToBreakoutRoom(event)" mouseUp="listenToBreakoutRoom(event)"/>
 	<mx:Button id="joinImg" width="20" height="20"
 			   icon="{images.join}" toolTip="{ResourceUtil.getInstance().getString('bbb.users.roomsGrid.join')}"
 			   click="requestBreakoutJoinUrl(event)"/>