Skip to content

Commit

Permalink
Refactored the way that conference transfer between the parent room a…
Browse files Browse the repository at this point in the history 
…nd breakout room is requested.
  • Loading branch information
@GhaziTriki
GhaziTriki committed Feb 3, 2016
1 parent 6bcfd75 commit 2fb347b
Show file tree
Hide file tree
Showing 15 changed files with 109 additions and 107 deletions.
2 changes: 1 addition & 1 deletion akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
View file
Expand Up @@ -81,7 +81,7 @@ class BigBlueButtonInGW(
def handleJsonMessage(json: String) { def handleJsonMessage(json: String) {
JsonMessageDecoder.decode(json) match { JsonMessageDecoder.decode(json) match {
case Some(validMsg) => forwardMessage(validMsg) case Some(validMsg) => forwardMessage(validMsg)
case None => log.error("Unhandled message: {}", json) case None => log.error("Unhandled json message: {}", json)
} }
} }


Expand Down
2 changes: 1 addition & 1 deletion akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
View file
Expand Up @@ -580,7 +580,7 @@ class MessageSenderActor(val service: MessageSender)
} }


private def handleTransferUserToMeeting(msg: TransferUserToMeeting) { private def handleTransferUserToMeeting(msg: TransferUserToMeeting) {
val m = new TransferUserToVoiceConfRequestMessage(msg.voiceConfId, msg.breakoutVoiceConfId, msg.userId, msg.forward); val m = new TransferUserToVoiceConfRequestMessage(msg.voiceConfId, msg.targetVoiceConfId, msg.userId);
service.send(MessagingConstants.TO_VOICE_CONF_SYSTEM_CHAN, m.toJson()) service.send(MessagingConstants.TO_VOICE_CONF_SYSTEM_CHAN, m.toJson())
} }


Expand Down
2 changes: 1 addition & 1 deletion akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
View file
Expand Up @@ -28,7 +28,7 @@ object UserMessagesProtocol extends DefaultJsonProtocol {
implicit val createBreakoutRoomsFormat = jsonFormat3(CreateBreakoutRooms) implicit val createBreakoutRoomsFormat = jsonFormat3(CreateBreakoutRooms)
implicit val breakoutRoomsListMessageFormat = jsonFormat1(BreakoutRoomsListMessage) implicit val breakoutRoomsListMessageFormat = jsonFormat1(BreakoutRoomsListMessage)
implicit val requestBreakoutJoinURLInMessageFormat = jsonFormat3(RequestBreakoutJoinURLInMessage) implicit val requestBreakoutJoinURLInMessageFormat = jsonFormat3(RequestBreakoutJoinURLInMessage)
implicit val transferUserToMeetingRequestFormat = jsonFormat4(TransferUserToMeetingRequest) implicit val transferUserToMeetingRequestFormat = jsonFormat3(TransferUserToMeetingRequest)
implicit val endBreakoutRoomsFormat = jsonFormat1(EndAllBreakoutRooms) implicit val endBreakoutRoomsFormat = jsonFormat1(EndAllBreakoutRooms)
implicit val inMsgHeaderFormat = jsonFormat1(InMessageHeader) implicit val inMsgHeaderFormat = jsonFormat1(InMessageHeader)
implicit val outMsgHeaderFormat = jsonFormat1(OutMsgHeader) implicit val outMsgHeaderFormat = jsonFormat1(OutMsgHeader)
Expand Down
2 changes: 1 addition & 1 deletion akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
View file
Expand Up @@ -60,7 +60,7 @@ case class EndAllBreakoutRooms(meetingId: String) extends InMessage
// Sent by breakout actor to tell meeting actor that breakout room has been ended // Sent by breakout actor to tell meeting actor that breakout room has been ended
case class BreakoutRoomEnded(meetingId: String, breakoutRoomId: String) extends InMessage case class BreakoutRoomEnded(meetingId: String, breakoutRoomId: String) extends InMessage
// Sent by user actor to ask for voice conference transfer // Sent by user actor to ask for voice conference transfer
case class TransferUserToMeetingRequest(meetingId: String, breakoutId: String, userId: String, listen: Boolean) extends InMessage case class TransferUserToMeetingRequest(meetingId: String, targetMeetingId: String, userId: String) extends InMessage


//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
// Lock // Lock
Expand Down
2 changes: 1 addition & 1 deletion akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
View file
Expand Up @@ -69,7 +69,7 @@ case class MuteVoiceUser(meetingID: String, recorded: Boolean, requesterID: Stri
case class UserVoiceMuted(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage case class UserVoiceMuted(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage
case class UserVoiceTalking(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage case class UserVoiceTalking(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage
case class EjectVoiceUser(meetingID: String, recorded: Boolean, requesterID: String, userId: String, voiceConfId: String, voiceUserId: String) extends IOutMessage case class EjectVoiceUser(meetingID: String, recorded: Boolean, requesterID: String, userId: String, voiceConfId: String, voiceUserId: String) extends IOutMessage
case class TransferUserToMeeting(voiceConfId: String, breakoutVoiceConfId: String, userId: String, forward: Boolean) extends IOutMessage case class TransferUserToMeeting(voiceConfId: String, targetVoiceConfId: String, userId: String) extends IOutMessage
case class UserJoinedVoice(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage case class UserJoinedVoice(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage
case class UserLeftVoice(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage case class UserLeftVoice(meetingID: String, recorded: Boolean, confNum: String, user: UserVO) extends IOutMessage


Expand Down
34 changes: 30 additions & 4 deletions akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
View file
Expand Up @@ -28,12 +28,12 @@ trait BreakoutRoomApp extends SystemConfiguration {
} }
presURL presURL
} }

def handleBreakoutRoomsList(msg:BreakoutRoomsListMessage) { def handleBreakoutRoomsList(msg: BreakoutRoomsListMessage) {
val breakoutRooms = breakoutModel.getRooms().toVector map { r => new BreakoutRoomBody(r.name, r.id) } val breakoutRooms = breakoutModel.getRooms().toVector map { r => new BreakoutRoomBody(r.name, r.id) }
outGW.send(new BreakoutRoomsListOutMessage(mProps.meetingID, breakoutRooms)); outGW.send(new BreakoutRoomsListOutMessage(mProps.meetingID, breakoutRooms));
} }

def handleCreateBreakoutRooms(msg: CreateBreakoutRooms) { def handleCreateBreakoutRooms(msg: CreateBreakoutRooms) {
var i = 0 var i = 0
for (room <- msg.rooms) { for (room <- msg.rooms) {
Expand Down Expand Up @@ -80,7 +80,7 @@ trait BreakoutRoomApp extends SystemConfiguration {
def sendBreakoutRoomStarted(meetingId: String, breakoutName: String, breakoutId: String, voiceConfId: String) { def sendBreakoutRoomStarted(meetingId: String, breakoutName: String, breakoutId: String, voiceConfId: String) {
outGW.send(new BreakoutRoomStartedOutMessage(meetingId, mProps.recorded, new BreakoutRoomBody(breakoutName, breakoutId))) outGW.send(new BreakoutRoomStartedOutMessage(meetingId, mProps.recorded, new BreakoutRoomBody(breakoutName, breakoutId)))
} }

def handleBreakoutRoomEnded(msg: BreakoutRoomEnded) { def handleBreakoutRoomEnded(msg: BreakoutRoomEnded) {
breakoutModel.remove(msg.breakoutRoomId) breakoutModel.remove(msg.breakoutRoomId)
outGW.send(new BreakoutRoomEndedOutMessage(msg.meetingId, msg.breakoutRoomId)) outGW.send(new BreakoutRoomEndedOutMessage(msg.meetingId, msg.breakoutRoomId))
Expand All @@ -99,6 +99,32 @@ trait BreakoutRoomApp extends SystemConfiguration {
new BreakoutRoomUsersUpdate(mProps.externalMeetingID, mProps.meetingID, breakoutUsers))) new BreakoutRoomUsersUpdate(mProps.externalMeetingID, mProps.meetingID, breakoutUsers)))
} }


def handleTransferUserToMeeting(msg: TransferUserToMeetingRequest) {
var targetVoiceBridge: String = msg.targetMeetingId
// If the current room is a parent room we fetch the voice bridge from the breakout room
if (!mProps.isBreakout) {
breakoutModel.getBreakoutRoom(msg.targetMeetingId) match {
case Some(b) => {
targetVoiceBridge = b.voiceConfId;
}
case None => // do nothing
}
} // if it is a breakout room, the target voice bridge is the same after removing the last digit
else {
targetVoiceBridge = mProps.voiceBridge.dropRight(1)
}
// We check the iser from the mode
usersModel.getUser(msg.userId) match {
case Some(u) => {
if (u.voiceUser.joined) {
log.info("Transferring user userId=" + u.userID + " from voiceBridge=" + mProps.voiceBridge + " to targetVoiceConf=" + targetVoiceBridge)
outGW.send(new TransferUserToMeeting(mProps.voiceBridge, targetVoiceBridge, u.voiceUser.userId))
}
}
case None => // do nothing
}
}

def handleEndAllBreakoutRooms(msg: EndAllBreakoutRooms) { def handleEndAllBreakoutRooms(msg: EndAllBreakoutRooms) {
breakoutModel.getRooms().foreach { room => breakoutModel.getRooms().foreach { room =>
outGW.send(new EndBreakoutRoom(room.id)) outGW.send(new EndBreakoutRoom(room.id))
Expand Down
18 changes: 0 additions & 18 deletions akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
View file
Expand Up @@ -161,24 +161,6 @@ trait UsersApp {
case None => // do nothing case None => // do nothing
} }
} }

def handleTransferUserToMeeting(msg: TransferUserToMeetingRequest) {
log.info("Received transfer user to meeting request. meetingId=" + mProps.meetingID + " breakoutId=" + msg.breakoutId + " userId=" + msg.userId + " toBreakout=" + msg.listen)
breakoutModel.getBreakoutRoom(msg.breakoutId) match {
case Some(b) => {
usersModel.getUser(msg.userId) match {
case Some(u) => {
if (u.voiceUser.joined) {
log.info("Transferring user between meetingId=" + mProps.meetingID + " userId=" + u.userID + " and breakoutId=" + b.id)
outGW.send(new TransferUserToMeeting(mProps.voiceBridge, b.voiceConfId, u.voiceUser.userId, msg.listen))
}
}
case None => // do nothing
}
}
case None => // do nothing
}
}


def handleGetLockSettings(msg: GetLockSettings) { def handleGetLockSettings(msg: GetLockSettings) {
//println("*************** Reply with current lock settings ********************") //println("*************** Reply with current lock settings ********************")
Expand Down
91 changes: 49 additions & 42 deletions ...esl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
View file
@@ -1,6 +1,5 @@
package org.bigbluebutton.freeswitch.pubsub.receivers; package org.bigbluebutton.freeswitch.pubsub.receivers;



import org.bigbluebutton.common.messages.EjectAllUsersFromVoiceConfRequestMessage; import org.bigbluebutton.common.messages.EjectAllUsersFromVoiceConfRequestMessage;
import org.bigbluebutton.common.messages.EjectUserFromVoiceConfRequestMessage; import org.bigbluebutton.common.messages.EjectUserFromVoiceConfRequestMessage;
import org.bigbluebutton.common.messages.GetUsersFromVoiceConfRequestMessage; import org.bigbluebutton.common.messages.GetUsersFromVoiceConfRequestMessage;
Expand All @@ -15,16 +14,18 @@


public class RedisMessageReceiver { public class RedisMessageReceiver {


public static final String TO_VOICE_CONF_CHANNEL = "bigbluebutton:to-voice-conf"; public static final String TO_VOICE_CONF_CHANNEL = "bigbluebutton:to-voice-conf";
public static final String TO_VOICE_CONF_PATTERN = TO_VOICE_CONF_CHANNEL + ":*"; public static final String TO_VOICE_CONF_PATTERN = TO_VOICE_CONF_CHANNEL
public static final String TO_VOICE_CONF_SYSTEM_CHAN = TO_VOICE_CONF_CHANNEL + ":system"; + ":*";

public static final String TO_VOICE_CONF_SYSTEM_CHAN = TO_VOICE_CONF_CHANNEL
+ ":system";

private final FreeswitchApplication fsApp; private final FreeswitchApplication fsApp;

public RedisMessageReceiver(FreeswitchApplication fsApp) { public RedisMessageReceiver(FreeswitchApplication fsApp) {
this.fsApp = fsApp; this.fsApp = fsApp;
} }

public void handleMessage(String pattern, String channel, String message) { public void handleMessage(String pattern, String channel, String message) {
if (channel.equalsIgnoreCase(TO_VOICE_CONF_SYSTEM_CHAN)) { if (channel.equalsIgnoreCase(TO_VOICE_CONF_SYSTEM_CHAN)) {
JsonParser parser = new JsonParser(); JsonParser parser = new JsonParser();
Expand All @@ -36,67 +37,73 @@ public void handleMessage(String pattern, String channel, String message) {
if (header.has("name")) { if (header.has("name")) {
String messageName = header.get("name").getAsString(); String messageName = header.get("name").getAsString();
switch (messageName) { switch (messageName) {
case EjectAllUsersFromVoiceConfRequestMessage.EJECT_ALL_VOICE_USERS_REQUEST: case EjectAllUsersFromVoiceConfRequestMessage.EJECT_ALL_VOICE_USERS_REQUEST:
processEjectAllVoiceUsersRequestMessage(message); processEjectAllVoiceUsersRequestMessage(message);
break; break;
case EjectUserFromVoiceConfRequestMessage.EJECT_VOICE_USER_REQUEST: case EjectUserFromVoiceConfRequestMessage.EJECT_VOICE_USER_REQUEST:
processEjectVoiceUserRequestMessage(message); processEjectVoiceUserRequestMessage(message);
break; break;
case GetUsersFromVoiceConfRequestMessage.GET_VOICE_USERS_REQUEST: case GetUsersFromVoiceConfRequestMessage.GET_VOICE_USERS_REQUEST:
processGetVoiceUsersRequestMessage(message); processGetVoiceUsersRequestMessage(message);
break; break;
case MuteUserInVoiceConfRequestMessage.MUTE_VOICE_USER_REQUEST: case MuteUserInVoiceConfRequestMessage.MUTE_VOICE_USER_REQUEST:
processMuteVoiceUserRequestMessage(message); processMuteVoiceUserRequestMessage(message);
break; break;
case TransferUserToVoiceConfRequestMessage.TRANSFER_USER_TO_VOICE_CONF_REQUEST: case TransferUserToVoiceConfRequestMessage.TRANSFER_USER_TO_VOICE_CONF_REQUEST:
processTransferUserToVoiceConfRequestMessage(message); processTransferUserToVoiceConfRequestMessage(message);
break; break;
case StartRecordingVoiceConfRequestMessage.START_RECORD_VOICE_CONF_REQUEST: case StartRecordingVoiceConfRequestMessage.START_RECORD_VOICE_CONF_REQUEST:
processStartRecordingVoiceConfRequestMessage(message); processStartRecordingVoiceConfRequestMessage(message);
break; break;
case StopRecordingVoiceConfRequestMessage.STOP_RECORD_VOICE_CONF_REQUEST: case StopRecordingVoiceConfRequestMessage.STOP_RECORD_VOICE_CONF_REQUEST:
processStopRecordingVoiceConfRequestMessage(message); processStopRecordingVoiceConfRequestMessage(message);
break; break;
} }
} }
} }
} }
} }

private void processEjectAllVoiceUsersRequestMessage(String json) { private void processEjectAllVoiceUsersRequestMessage(String json) {
EjectAllUsersFromVoiceConfRequestMessage msg = EjectAllUsersFromVoiceConfRequestMessage.fromJson(json); EjectAllUsersFromVoiceConfRequestMessage msg = EjectAllUsersFromVoiceConfRequestMessage
.fromJson(json);
fsApp.ejectAll(msg.voiceConfId); fsApp.ejectAll(msg.voiceConfId);
} }

private void processEjectVoiceUserRequestMessage(String json) { private void processEjectVoiceUserRequestMessage(String json) {
EjectUserFromVoiceConfRequestMessage msg = EjectUserFromVoiceConfRequestMessage.fromJson(json); EjectUserFromVoiceConfRequestMessage msg = EjectUserFromVoiceConfRequestMessage
.fromJson(json);
fsApp.eject(msg.voiceConfId, msg.voiceUserId); fsApp.eject(msg.voiceConfId, msg.voiceUserId);
} }

private void processGetVoiceUsersRequestMessage(String json) { private void processGetVoiceUsersRequestMessage(String json) {
GetUsersFromVoiceConfRequestMessage msg = GetUsersFromVoiceConfRequestMessage.fromJson(json); GetUsersFromVoiceConfRequestMessage msg = GetUsersFromVoiceConfRequestMessage
.fromJson(json);
fsApp.getAllUsers(msg.voiceConfId); fsApp.getAllUsers(msg.voiceConfId);
} }

private void processMuteVoiceUserRequestMessage(String json) { private void processMuteVoiceUserRequestMessage(String json) {
MuteUserInVoiceConfRequestMessage msg = MuteUserInVoiceConfRequestMessage.fromJson(json); MuteUserInVoiceConfRequestMessage msg = MuteUserInVoiceConfRequestMessage
.fromJson(json);
fsApp.muteUser(msg.voiceConfId, msg.voiceUserId, msg.mute); fsApp.muteUser(msg.voiceConfId, msg.voiceUserId, msg.mute);
} }

private void processTransferUserToVoiceConfRequestMessage(String json) { private void processTransferUserToVoiceConfRequestMessage(String json) {
TransferUserToVoiceConfRequestMessage msg = TransferUserToVoiceConfRequestMessage TransferUserToVoiceConfRequestMessage msg = TransferUserToVoiceConfRequestMessage
.fromJson(json); .fromJson(json);
fsApp.transferUserToMeeting(msg.voiceConfId, msg.targetVoiceConfId, fsApp.transferUserToMeeting(msg.voiceConfId, msg.targetVoiceConfId,
msg.voiceUserId, msg.forward); msg.voiceUserId);
} }

private void processStartRecordingVoiceConfRequestMessage(String json) { private void processStartRecordingVoiceConfRequestMessage(String json) {
StartRecordingVoiceConfRequestMessage msg = StartRecordingVoiceConfRequestMessage.fromJson(json); StartRecordingVoiceConfRequestMessage msg = StartRecordingVoiceConfRequestMessage
.fromJson(json);
fsApp.startRecording(msg.voiceConfId, msg.meetingId); fsApp.startRecording(msg.voiceConfId, msg.meetingId);
} }

private void processStopRecordingVoiceConfRequestMessage(String json) { private void processStopRecordingVoiceConfRequestMessage(String json) {
StopRecordingVoiceConfRequestMessage msg = StopRecordingVoiceConfRequestMessage.fromJson(json); StopRecordingVoiceConfRequestMessage msg = StopRecordingVoiceConfRequestMessage
.fromJson(json);
fsApp.stopRecording(msg.voiceConfId, msg.meetingId, msg.recordStream); fsApp.stopRecording(msg.voiceConfId, msg.meetingId, msg.recordStream);
} }
} }
4 changes: 2 additions & 2 deletions ...sl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
View file
Expand Up @@ -74,9 +74,9 @@ public void muteUser(String voiceConfId, String voiceUserId, Boolean mute) {
} }


public void transferUserToMeeting(String voiceConfId, public void transferUserToMeeting(String voiceConfId,
String targetVoiceConfId, String voiceUserId, Boolean forward) { String targetVoiceConfId, String voiceUserId) {
TransferUsetToMeetingCommand tutmc = new TransferUsetToMeetingCommand( TransferUsetToMeetingCommand tutmc = new TransferUsetToMeetingCommand(
voiceConfId, targetVoiceConfId, voiceUserId, forward, USER); voiceConfId, targetVoiceConfId, voiceUserId, USER);
queueMessage(tutmc); queueMessage(tutmc);
} }


Expand Down
14 changes: 3 additions & 11 deletions ...a/org/bigbluebutton/freeswitch/voice/freeswitch/actions/TransferUsetToMeetingCommand.java
View file
Expand Up @@ -23,25 +23,17 @@ public class TransferUsetToMeetingCommand extends FreeswitchCommand {


private final String targetRoom; private final String targetRoom;
private final String participant; private final String participant;
private final Boolean forward;


public TransferUsetToMeetingCommand(String room, String targetRoom, public TransferUsetToMeetingCommand(String room, String targetRoom,
String participant, Boolean forward, String requesterId) { String participant, String requesterId) {
super(room, requesterId); super(room, requesterId);
this.targetRoom = targetRoom; this.targetRoom = targetRoom;
this.participant = participant; this.participant = participant;
this.forward = forward;
} }


@Override @Override
public String getCommandArgs() { public String getCommandArgs() {
String action = ""; return room + SPACE + "transfer" + SPACE + targetRoom + SPACE
if (forward) + participant;
action = room + SPACE + "transfer" + SPACE + targetRoom;
else {
action = targetRoom + SPACE + "transfer" + SPACE + room;
}

return action + SPACE + participant;
} }
} }
1 change: 0 additions & 1 deletion ...ge/src/main/java/org/bigbluebutton/common/messages/MuteUserInVoiceConfRequestMessage.java
View file
Expand Up @@ -63,6 +63,5 @@ public static MuteUserInVoiceConfRequestMessage fromJson(String message) {
} }
} }
return null; return null;

} }
} }
13 changes: 3 additions & 10 deletions ...rc/main/java/org/bigbluebutton/common/messages/TransferUserToVoiceConfRequestMessage.java
View file
Expand Up @@ -30,27 +30,23 @@ public class TransferUserToVoiceConfRequestMessage {
public static final String VOICE_CONF_ID = "voice_conf_id"; public static final String VOICE_CONF_ID = "voice_conf_id";
public static final String TARGET_VOICE_CONF_ID = "target_voice_conf_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 VOICE_USER_ID = "voice_user_id";
public static final String FORWARD = "forward";


public final String voiceConfId; public final String voiceConfId;
public final String targetVoiceConfId; public final String targetVoiceConfId;
public final String voiceUserId; public final String voiceUserId;
public final Boolean forward;


public TransferUserToVoiceConfRequestMessage(String voiceConfId, public TransferUserToVoiceConfRequestMessage(String voiceConfId,
String breakoutVoiceConfId, String voiceUserId, Boolean toBreakout) { String breakoutVoiceConfId, String voiceUserId) {
this.voiceConfId = voiceConfId; this.voiceConfId = voiceConfId;
this.targetVoiceConfId = breakoutVoiceConfId; this.targetVoiceConfId = breakoutVoiceConfId;
this.voiceUserId = voiceUserId; this.voiceUserId = voiceUserId;
this.forward = toBreakout;
} }


public String toJson() { public String toJson() {
HashMap<String, Object> payload = new HashMap<String, Object>(); HashMap<String, Object> payload = new HashMap<String, Object>();
payload.put(VOICE_CONF_ID, voiceConfId); payload.put(VOICE_CONF_ID, voiceConfId);
payload.put(TARGET_VOICE_CONF_ID, targetVoiceConfId); payload.put(TARGET_VOICE_CONF_ID, targetVoiceConfId);
payload.put(VOICE_USER_ID, voiceUserId); payload.put(VOICE_USER_ID, voiceUserId);
payload.put(FORWARD, forward);


java.util.HashMap<String, Object> header = MessageBuilder.buildHeader( java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(
TRANSFER_USER_TO_VOICE_CONF_REQUEST, VERSION, null); TRANSFER_USER_TO_VOICE_CONF_REQUEST, VERSION, null);
Expand All @@ -71,17 +67,14 @@ public static TransferUserToVoiceConfRequestMessage fromJson(String message) {
if (TRANSFER_USER_TO_VOICE_CONF_REQUEST.equals(messageName)) { if (TRANSFER_USER_TO_VOICE_CONF_REQUEST.equals(messageName)) {
if (payload.has(VOICE_CONF_ID) if (payload.has(VOICE_CONF_ID)
&& payload.has(TARGET_VOICE_CONF_ID) && payload.has(TARGET_VOICE_CONF_ID)
&& payload.has(VOICE_USER_ID) && payload.has(VOICE_USER_ID)) {
&& payload.has(FORWARD)) {
String id = payload.get(VOICE_CONF_ID).getAsString(); String id = payload.get(VOICE_CONF_ID).getAsString();
String targetVoiceConfId = payload.get( String targetVoiceConfId = payload.get(
TARGET_VOICE_CONF_ID).getAsString(); TARGET_VOICE_CONF_ID).getAsString();
String voiceUserId = payload.get(VOICE_USER_ID) String voiceUserId = payload.get(VOICE_USER_ID)
.getAsString(); .getAsString();
Boolean forward = payload.get(FORWARD)
.getAsBoolean();
return new TransferUserToVoiceConfRequestMessage(id, return new TransferUserToVoiceConfRequestMessage(id,
targetVoiceConfId, voiceUserId, forward); targetVoiceConfId, voiceUserId);
} }
} }
} }
Expand Down
21 changes: 10 additions & 11 deletions ...n-message/src/main/java/org/bigbluebutton/messages/payload/ListenInOnBreakoutPayload.java
View file
Expand Up @@ -2,15 +2,14 @@


public class ListenInOnBreakoutPayload { public class ListenInOnBreakoutPayload {


public final String meetingId; public final String meetingId;
public final String breakoutId; public final String targetMeetingId;
public final String userId; public final String userId;
public final Boolean listen;

public ListenInOnBreakoutPayload(String meetingId, String breakoutId,
public ListenInOnBreakoutPayload(String meetingId, String breakoutId, String userId, Boolean listen) { String userId) {
this.meetingId = meetingId; this.meetingId = meetingId;
this.breakoutId = breakoutId; this.targetMeetingId = breakoutId;
this.userId = userId; this.userId = userId;
this.listen = listen; }
}
} }

0 comments on commit 2fb347b

Please sign in to comment.