diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala index f3e67cee63b8791f75dab2edddfc4b52abe30e92..4b2943126bbeb9a0694997b9d685f940732af6df 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala @@ -94,7 +94,7 @@ class JsonMessageSenderActor(val service: MessageSender) private def handleCreateBreakoutRoom(msg: CreateBreakoutRoom) { val payload = new CreateBreakoutRoomRequestPayload(msg.room.breakoutId, msg.room.parentId, msg.room.name, msg.room.voiceConfId, msg.room.viewerPassword, msg.room.moderatorPassword, - msg.room.durationInMinutes, msg.room.defaultPresentationURL) + msg.room.durationInMinutes, msg.room.defaultPresentationURL, msg.room.record) val request = new CreateBreakoutRoomRequest(payload) service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson()) } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala index 480d3c0b289689ce8c7012b0c04437b6c1bdd875..61ab41f016b739fa3c12f7f7d196460e67ad3bf5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala @@ -33,7 +33,7 @@ case class CreateBreakoutRoom(meetingId: String, recorded: Boolean, room: Breako case class EndBreakoutRoom(breakoutId: String) extends IOutMessage case class BreakoutRoomOutPayload(breakoutId: String, name: String, parentId: String, voiceConfId: String, durationInMinutes: Int, moderatorPassword: String, viewerPassword: String, - defaultPresentationURL: String) + defaultPresentationURL: String, record: Boolean) 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) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala index e05025df0e293e5c7b046e4204718c02753cb72a..a2c4787c99118d292824414f6e71f14afa364deb 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala @@ -44,7 +44,7 @@ trait BreakoutRoomApp extends SystemConfiguration { val r = breakoutModel.createBreakoutRoom(breakoutMeetingId, room.name, voiceConfId, room.users, presURL) val p = new BreakoutRoomOutPayload(r.id, r.name, mProps.meetingID, r.voiceConfId, msg.durationInMinutes, bbbWebModeratorPassword, bbbWebViewerPassword, - r.defaultPresentationURL) + r.defaultPresentationURL, mProps.recorded) outGW.send(new CreateBreakoutRoom(mProps.meetingID, mProps.recorded, p)) } meetingModel.breakoutRoomsdurationInMinutes = msg.durationInMinutes; diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java index 0339521928ae4c60627a9b2896846be14cdb8ba0..39d0ed3183c3a86440dacb17d19dc7ea15c025fb 100755 --- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java +++ b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java @@ -9,10 +9,11 @@ public class CreateBreakoutRoomRequestPayload { public final String moderatorPassword; public final Integer durationInMinutes; // The duration of the breakout room public final String defaultPresentationURL; + public final Boolean record; public CreateBreakoutRoomRequestPayload(String breakoutId, String parentId, String name, String voiceConfId, String viewerPassword, String moderatorPassword, - Integer duration, String defaultPresentationURL) { + Integer duration, String defaultPresentationURL, Boolean record) { this.breakoutId = breakoutId; this.parentId = parentId; this.name = name; @@ -21,5 +22,6 @@ public class CreateBreakoutRoomRequestPayload { this.moderatorPassword = moderatorPassword; this.durationInMinutes = duration; this.defaultPresentationURL = defaultPresentationURL; + this.record = record; } } diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java index a66e276d660cc9d2e45886f8ff646000ab778d1d..3cad660f2e26251f83485ecd85accf25c5bcb993 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java @@ -524,6 +524,7 @@ public class MeetingService implements MessageListener { params.put("moderatorPW", message.moderatorPassword); params.put("voiceBridge", message.voiceConfId); params.put("duration", message.durationInMinutes.toString()); + params.put("record", message.record.toString()); Meeting breakout = paramsProcessorUtil.processCreateParams(params); diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java index c71253b8db131c1c6dc5409c234d789dbbea387b..c4115b553307b5ff88f9daf57124ca92c415cf2a 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java @@ -79,7 +79,8 @@ public class MeetingMessageHandler implements MessageHandler { msg.payload.viewerPassword, msg.payload.moderatorPassword, msg.payload.durationInMinutes, - msg.payload.defaultPresentationURL)); + msg.payload.defaultPresentationURL, + msg.payload.record)); } } diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java index d9dcb3deba62c1299ece5ab49964b46c61220fbc..5cbed332ef5e41156c284c44c68fd2bdef373ebf 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java @@ -1,6 +1,5 @@ package org.bigbluebutton.api.messaging.messages; - public class CreateBreakoutRoom implements IMessage { public final String breakoutId; @@ -11,10 +10,11 @@ public class CreateBreakoutRoom implements IMessage { public final String moderatorPassword; public final Integer durationInMinutes; // The duration of the breakout room public final String defaultPresentationURL; + public final Boolean record; public CreateBreakoutRoom(String breakoutId, String parentId, String name, String voiceConfId, String viewerPassword, String moderatorPassword, - Integer duration, String defaultPresentationURL) { + Integer duration, String defaultPresentationURL, Boolean record) { this.breakoutId = breakoutId; this.parentId = parentId; this.name = name; @@ -23,5 +23,6 @@ public class CreateBreakoutRoom implements IMessage { this.moderatorPassword = moderatorPassword; this.durationInMinutes = duration; this.defaultPresentationURL = defaultPresentationURL; + this.record = record; } }