BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deleted all code for handling guests.

Browse Source
This commit is contained in:
Ghaz Triki 2016-04-08 22:30:57 +01:00
parent a57b65c4a7
commit 2fe06dcd15
26 changed files with 5 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/flash/air-client/locale/en_US/resources.properties
View File

@ -18,7 +18,6 @@ login.error.authTokenInvalid=Authentication token is incorrect.
login.button.tryAgain=Try again
notification.title=BigBlueButton
notification.message=A meeting is running
participants.guests=Guests
participants.title=Participants
participants.conversations=Conversations
participants.online=Online
@ -104,7 +103,6 @@ lockSettings.publicChat = Public Chat
lockSettings.privateChat = Private Chat
lockSettings.layout = Web layout
lockSettings.apply = Apply
guest.waitMessage=You are a guest, please wait moderator approval.
deskshare.noDeskshare = No desktop stream to display
deskshare.title = Desktop Sharing
cameraSettings.title=Video

2
clients/flash/air-client/locale/pt_BR/resources.properties
View File

@ -12,7 +12,6 @@ login.error.invalidURL=URL inválida.\nPor favor contate o administrador do sist
login.button.tryAgain=Tentar novamente
notification.title=BigBlueButton
notification.message=Reunião em andamento
participants.guests=Convidados
participants.title=Participantes
participants.status.presenter=Apresentador
participants.status.moderator=Moderador
@ -83,7 +82,6 @@ lockSettings.publicChat = Chat público
lockSettings.privateChat = Chat privado
lockSettings.layout =Layout web
lockSettings.apply = Aplicar
guest.waitMessage=Você é um convidado, por favor aguarde a aprovação do moderador da sessão.
deskshare.noDeskshare = Nenhuma tela para exibir
deskshare.title=Compartilhamento de tela
cameraSettings.title=Configurações da câmera

13
clients/flash/air-client/src/Default.css
View File

@ -114,19 +114,6 @@ s|Button.sendButtonStyle
skinClass : ClassReference("org.bigbluebutton.air.main.views.skins.SendMsgBtnSkin");
}
s|Button.guestResponseButtonStyle
{
height : 50;
weight : 0.1;
radiusX : 2;
radiusY : 2;
backgroundColor : #F4F4F4;
onClickBackgroundColor : #DBDBDB;
strokeColor : #CCCCCC;
strokeWeight : 0.2;
skinClass : ClassReference("org.bigbluebutton.air.main.views.skins.GuestResponseBtnSkin");
}
s|SkinnableContainer.topToolBarStyle
{
gradientColor : #2A2D33;

3
clients/flash/air-client/src/org/bigbluebutton/air/AppConfig.as
View File

@ -3,7 +3,6 @@ package org.bigbluebutton.air {
import org.bigbluebutton.air.main.commands.AuthenticationCommandAIR;
import org.bigbluebutton.air.main.commands.ConnectingFinishedCommandAIR;
import org.bigbluebutton.air.main.commands.DisconnectUserCommandAIR;
import org.bigbluebutton.air.main.commands.GuestWaitingForApprovalCommandAIR;
import org.bigbluebutton.air.main.models.IUserUISession;
import org.bigbluebutton.air.main.models.UserUISession;
import org.bigbluebutton.air.video.commands.ShareCameraCommand;
@ -24,7 +23,6 @@ package org.bigbluebutton.air {
import org.bigbluebutton.lib.main.commands.ConnectSignal;
import org.bigbluebutton.lib.main.commands.ConnectingFinishedSignal;
import org.bigbluebutton.lib.main.commands.DisconnectUserSignal;
import org.bigbluebutton.lib.main.commands.GuestWaitingForApprovalSignal;
import org.bigbluebutton.lib.main.commands.LockUserCommand;
import org.bigbluebutton.lib.main.commands.LockUserSignal;
import org.bigbluebutton.lib.main.commands.PresenterCommand;
@ -94,7 +92,6 @@ package org.bigbluebutton.air {
signalCommandMap.map(CameraQualitySignal).toCommand(CameraQualityCommand);
signalCommandMap.map(DisconnectUserSignal).toCommand(DisconnectUserCommandAIR);
signalCommandMap.map(ConnectingFinishedSignal).toCommand(ConnectingFinishedCommandAIR);
signalCommandMap.map(GuestWaitingForApprovalSignal).toCommand(GuestWaitingForApprovalCommandAIR);
signalCommandMap.map(PresenterSignal).toCommand(PresenterCommand);
signalCommandMap.map(ChangeRoleSignal).toCommand(ChangeRoleCommand);
signalCommandMap.map(LockUserSignal).toCommand(LockUserCommand);

4
clients/flash/air-client/src/org/bigbluebutton/air/common/PageEnum.as
View File

@ -8,7 +8,6 @@ package org.bigbluebutton.air.common {
import org.bigbluebutton.air.deskshare.views.DeskshareView;
import org.bigbluebutton.air.main.views.disconnectpage.DisconnectPageView;
import org.bigbluebutton.air.main.views.exit.ExitPageView;
import org.bigbluebutton.air.main.views.guest.GuestPageView;
import org.bigbluebutton.air.main.views.loginpage.LoginPageView;
import org.bigbluebutton.air.main.views.profile.ProfileView;
import org.bigbluebutton.air.presentation.views.PresentationView;
@ -42,8 +41,6 @@ package org.bigbluebutton.air.common {
public static const DISCONNECT:String = "Disconnect";
public static const GUEST:String = "Guest";
public static const DESKSHARE:String = "Deskshare";
public static const CAMERASETTINGS:String = "CameraSettings";
@ -77,7 +74,6 @@ package org.bigbluebutton.air.common {
dic[PARTICIPANTS] = ParticipantsView;
dic[SELECT_PARTICIPANT] = SelectParticipantView;
dic[DISCONNECT] = DisconnectPageView;
dic[GUEST] = GuestPageView;
dic[DESKSHARE] = DeskshareView;
dic[CAMERASETTINGS] = CameraSettingsView;
dic[AUDIOSETTINGS] = AudioSettingsView;

3
clients/flash/air-client/src/org/bigbluebutton/air/main/MainConfig.as
View File

@ -8,8 +8,6 @@ package org.bigbluebutton.air.main {
import org.bigbluebutton.air.main.views.disconnectpage.IDisconnectPageView;
import org.bigbluebutton.air.main.views.exit.ExitPageViewMediator;
import org.bigbluebutton.air.main.views.exit.IExitPageView;
import org.bigbluebutton.air.main.views.guest.GuestPageViewMediator;
import org.bigbluebutton.air.main.views.guest.IGuestPageView;
import org.bigbluebutton.air.main.views.loginpage.ILoginPageView;
import org.bigbluebutton.air.main.views.loginpage.LoginPageViewMediator;
import org.bigbluebutton.air.main.views.menubuttons.IMenuButtonsView;
@ -71,7 +69,6 @@ package org.bigbluebutton.air.main {
mediatorMap.map(IChangeStatusPopUp).toMediator(ChangeStatusPopUpMediator);
mediatorMap.map(IExitPageView).toMediator(ExitPageViewMediator);
mediatorMap.map(ITopBarView).toMediator(TopBarViewMediator);
mediatorMap.map(IGuestPageView).toMediator(GuestPageViewMediator);
}
/**

1
clients/flash/air-client/src/org/bigbluebutton/air/main/commands/ConnectingFinishedCommandAIR.as
View File

@ -20,7 +20,6 @@ package org.bigbluebutton.air.main.commands {
public var conferenceParameters:IConferenceParameters;
override public function execute():void {
// remove guest page (if it is there)
userUISession.popPage();
if (FlexGlobals.topLevelApplication.hasOwnProperty("topActionBar") && FlexGlobals.topLevelApplication.hasOwnProperty("bottomMenu")) {
FlexGlobals.topLevelApplication.topActionBar.visible = true;

19
clients/flash/air-client/src/org/bigbluebutton/air/main/commands/GuestWaitingForApprovalCommandAIR.as
View File

@ -1,19 +0,0 @@
package org.bigbluebutton.air.main.commands {
import org.bigbluebutton.air.common.PageEnum;
import org.bigbluebutton.air.main.models.IUserUISession;
import robotlegs.bender.bundles.mvcs.Command;
public class GuestWaitingForApprovalCommandAIR extends Command {
[Inject]
public var userUISession:IUserUISession
override public function execute():void {
userUISession.pushPage(PageEnum.GUEST);
userUISession.loading = false;
}
}
}

35
clients/flash/air-client/src/org/bigbluebutton/air/main/views/skins/GuestResponseBtnSkin.mxml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<s:Skin xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark">
<!-- host component -->
<fx:Metadata>
[HostComponent("spark.components.Button")]
</fx:Metadata>
<!-- states -->
<s:states>
<s:State name="disabled" />
<s:State name="down" />
<s:State name="over" />
<s:State name="up" />
</s:states>
<s:Rect top="0"
bottom="0"
right="0"
left="0">
<s:stroke>
<s:SolidColorStroke color="{hostComponent.getStyle('strokeColor')}"
weight="{hostComponent.getStyle('strokeWeight')}"
alpha="0.5" />
</s:stroke>
<s:fill>
<s:SolidColor color="{hostComponent.getStyle('backgroundColor')}"
color.down="{hostComponent.getStyle('onClickBackgroundColor')}" />
</s:fill>
</s:Rect>
<s:BitmapImage source="{getStyle('backgroundImage')}"
horizontalCenter="0"
verticalCenter="0" />
</s:Skin>

2
clients/flash/air-client/src/org/bigbluebutton/air/settings/views/cameraprofiles/CameraProfileItemRenderer.mxml
View File

@ -6,8 +6,6 @@
<fx:Script>
<![CDATA[
private var guestID:String;
override public function set data(obj:Object):void {
super.data = obj;
if (obj) {

10
clients/flash/air-client/src/org/bigbluebutton/air/users/views/participants/IParticipantsView.as
View File

@ -1,17 +1,11 @@
package org.bigbluebutton.air.users.views.participants {
import spark.components.List;
import org.bigbluebutton.air.common.views.IView;
import spark.components.Button;
import spark.components.List;
import spark.components.supportClasses.SkinnableComponent;
public interface IParticipantsView extends IView {
function get list():List;
function get guestsList():List;
function get allGuests():SkinnableComponent;
function get allowAllButton():Button;
function get denyAllButton():Button;
function get conversationsList():List;
}
}

18
clients/flash/air-client/src/org/bigbluebutton/air/users/views/participants/ParticipantsView.as
View File

@ -1,7 +1,5 @@
package org.bigbluebutton.air.users.views.participants {
import spark.components.Button;
import spark.components.List;
import spark.components.supportClasses.SkinnableComponent;
public class ParticipantsView extends ParticipantsViewBase implements IParticipantsView {
@ -9,22 +7,6 @@ package org.bigbluebutton.air.users.views.participants {
return participantslist;
}
public function get guestsList():List {
return guestslist;
}
public function get allGuests():SkinnableComponent {
return allguests;
}
public function get allowAllButton():Button {
return allowAllButton0;
}
public function get denyAllButton():Button {
return denyAllButton0;
}
public function get conversationsList():List {
return conversationslist;
}

79
clients/flash/air-client/src/org/bigbluebutton/air/users/views/participants/ParticipantsViewMediator.as
View File

@ -1,6 +1,5 @@
package org.bigbluebutton.air.users.views.participants {
import flash.events.MouseEvent;
import flash.utils.Dictionary;
import mx.collections.ArrayCollection;
@ -12,7 +11,6 @@ package org.bigbluebutton.air.users.views.participants {
import org.bigbluebutton.air.common.PageEnum;
import org.bigbluebutton.air.common.TransitionAnimationEnum;
import org.bigbluebutton.air.main.models.IUserUISession;
import org.bigbluebutton.air.users.views.participants.guests.GuestResponseEvent;
import org.bigbluebutton.lib.chat.models.IChatMessagesSession;
import org.bigbluebutton.lib.chat.models.PrivateChatMessage;
import org.bigbluebutton.lib.main.models.IUserSession;
@ -42,12 +40,8 @@ package org.bigbluebutton.air.users.views.participants {
protected var dataProvider:ArrayCollection;
protected var dataProviderGuests:ArrayCollection;
protected var dicUserIdtoUser:Dictionary;
protected var dicUserIdtoGuest:Dictionary
private var _userMe:User;
private var _usersAdded:Array = new Array();
@ -68,25 +62,7 @@ package org.bigbluebutton.air.users.views.participants {
userSession.userList.userAddedSignal.add(addUser);
userSession.userList.userRemovedSignal.add(userRemoved);
setPageTitle();
dataProviderGuests = new ArrayCollection();
view.guestsList.dataProvider = dataProviderGuests;
view.guestsList.addEventListener(GuestResponseEvent.GUEST_RESPONSE, onSelectGuest);
view.conversationsList.addEventListener(IndexChangeEvent.CHANGE, onSelectChat);
view.allowAllButton.addEventListener(MouseEvent.CLICK, allowAllGuests);
view.denyAllButton.addEventListener(MouseEvent.CLICK, denyAllGuests);
dicUserIdtoGuest = new Dictionary();
var guests:ArrayCollection = userSession.guestList.users;
for each (var guest:User in guests) {
addGuest(guest);
}
userSession.guestList.userAddedSignal.add(addGuest);
userSession.guestList.userRemovedSignal.add(guestRemoved);
if (_userMe.role == User.MODERATOR && dataProviderGuests.length > 0) {
view.guestsList.visible = true;
view.guestsList.includeInLayout = true;
view.allGuests.visible = true;
view.allGuests.includeInLayout = true;
}
userUISession.pushPage(PageEnum.PARTICIPANTS);
initializeDataProviderConversations();
}
@ -177,18 +153,6 @@ package org.bigbluebutton.air.users.views.participants {
setPageTitle();
}
private function addGuest(guest:Object):void {
dataProviderGuests.addItem(guest);
dataProviderGuests.refresh();
dicUserIdtoGuest[guest.userID] = guest;
if (_userMe.role == User.MODERATOR && dataProviderGuests.length > 0) {
view.guestsList.visible = true;
view.guestsList.includeInLayout = true;
view.allGuests.visible = true;
view.allGuests.includeInLayout = true;
}
}
private function userRemoved(userID:String):void {
var user:User = dicUserIdtoUser[userID] as User;
var index:uint = dataProvider.getItemIndex(user);
@ -197,34 +161,8 @@ package org.bigbluebutton.air.users.views.participants {
setPageTitle();
}
private function guestRemoved(userID:String):void {
var guest:User = dicUserIdtoGuest[userID] as User;
if (guest) {
var index:uint = dataProviderGuests.getItemIndex(guest);
dataProviderGuests.removeItemAt(index);
dicUserIdtoGuest[guest.userID] = null;
if (_userMe.role == User.MODERATOR && dataProviderGuests.length == 0 && view && view.guestsList != null) {
view.guestsList.includeInLayout = false;
view.guestsList.visible = false;
view.allGuests.includeInLayout = false;
view.allGuests.visible = false;
}
}
}
private function userChanged(user:User, property:String = null):void {
dataProvider.refresh();
if (_userMe.role == User.MODERATOR && dataProviderGuests.length > 0) {
view.guestsList.visible = true;
view.guestsList.includeInLayout = true;
view.allGuests.visible = true;
view.allGuests.includeInLayout = true;
} else {
view.guestsList.visible = false;
view.guestsList.includeInLayout = false;
view.allGuests.visible = false;
view.allGuests.includeInLayout = false;
}
}
protected function onSelectParticipant(event:IndexChangeEvent):void {
@ -234,18 +172,6 @@ package org.bigbluebutton.air.users.views.participants {
}
}
protected function onSelectGuest(event:GuestResponseEvent):void {
usersService.responseToGuest(event.guestID, event.allow);
}
protected function allowAllGuests(event:MouseEvent):void {
usersService.responseToAllGuests(true);
}
protected function denyAllGuests(event:MouseEvent):void {
usersService.responseToAllGuests(false);
}
/**
* Count participants and set page title accordingly
**/
@ -257,10 +183,7 @@ package org.bigbluebutton.air.users.views.participants {
override public function destroy():void {
view.list.removeEventListener(IndexChangeEvent.CHANGE, onSelectParticipant);
view.guestsList.removeEventListener(GuestResponseEvent.GUEST_RESPONSE, onSelectGuest);
view.conversationsList.removeEventListener(IndexChangeEvent.CHANGE, onSelectChat);
view.allowAllButton.removeEventListener(MouseEvent.CLICK, allowAllGuests);
view.denyAllButton.removeEventListener(MouseEvent.CLICK, denyAllGuests);
for each (var chatObject:PrivateChatMessage in chatMessagesSession.privateChats) {
chatObject.privateChat.chatMessageChangeSignal.remove(populateList);
@ -269,8 +192,6 @@ package org.bigbluebutton.air.users.views.participants {
userSession.userList.userChangeSignal.remove(userChanged);
userSession.userList.userAddedSignal.remove(addUser);
userSession.userList.userRemovedSignal.remove(userRemoved);
userSession.guestList.userAddedSignal.remove(addGuest);
userSession.guestList.userRemovedSignal.remove(guestRemoved);
super.destroy();
view.dispose();
view = null;

39
clients/flash/common-library/src/org/bigbluebutton/lib/main/commands/ConnectCommand.as
View File

@ -8,9 +8,7 @@ package org.bigbluebutton.lib.main.commands {
import org.bigbluebutton.lib.main.models.IConferenceParameters;
import org.bigbluebutton.lib.main.models.IUserSession;
import org.bigbluebutton.lib.main.models.Room;
import org.bigbluebutton.lib.main.models.UserSession;
import org.bigbluebutton.lib.main.services.IBigBlueButtonConnection;
import org.bigbluebutton.lib.main.utils.DisconnectEnum;
import org.bigbluebutton.lib.presentation.services.IPresentationService;
import org.bigbluebutton.lib.user.services.IUsersService;
import org.bigbluebutton.lib.video.commands.ShareCameraSignal;
@ -61,9 +59,6 @@ package org.bigbluebutton.lib.main.commands {
[Inject]
public var connectingFinishedSignal:ConnectingFinishedSignal;
[Inject]
public var guestWaitingForApprovalSignal:GuestWaitingForApprovalSignal;
[Inject]
public var connectingFailedSignal:ConnectingFailedSignal;
@ -114,44 +109,12 @@ package org.bigbluebutton.lib.main.commands {
private function onAuthTokenReply(tokenValid:Boolean):void {
userSession.authTokenSignal.remove(onAuthTokenReply);
if (tokenValid) {
if (conferenceParameters.isGuestDefined() && conferenceParameters.guest) {
userSession.guestPolicySignal.add(onGuestPolicyResponse);
usersService.getGuestPolicy();
} else {
joiningMeetingSuccess();
}
joiningMeetingSuccess();
} else {
// TODO disconnect
}
}
private function onGuestPolicyResponse(policy:String):void {
if (policy == UserSession.GUEST_POLICY_ALWAYS_ACCEPT) {
onGuestAllowed();
} else if (policy == UserSession.GUEST_POLICY_ALWAYS_DENY) {
onGuestDenied();
} else if (policy == UserSession.GUEST_POLICY_ASK_MODERATOR) {
guestWaitingForApprovalSignal.dispatch();
userSession.guestEntranceSignal.add(onGuestEntranceResponse);
}
}
private function onGuestEntranceResponse(allowed:Boolean):void {
if (allowed) {
onGuestAllowed();
} else {
onGuestDenied();
}
}
private function onGuestAllowed():void {
joiningMeetingSuccess();
}
private function onGuestDenied():void {
disconnectUserSignal.dispatch(DisconnectEnum.CONNECTION_STATUS_MODERATOR_DENIED);
}
private function joiningMeetingSuccess():void {
updateRooms();
// Set up remaining message sender and receivers:

9
clients/flash/common-library/src/org/bigbluebutton/lib/main/commands/GuestWaitingForApprovalSignal.as
View File

@ -1,9 +0,0 @@
package org.bigbluebutton.lib.main.commands {
import org.osflash.signals.Signal;
public class GuestWaitingForApprovalSignal extends Signal {
public function GuestWaitingForApprovalSignal() {
super();
}
}
}

19
clients/flash/common-library/src/org/bigbluebutton/lib/main/models/ConferenceParameters.as
View File

@ -79,10 +79,6 @@ package org.bigbluebutton.lib.main.models {
private var _record:Boolean;
private var _guest:Boolean;
private var _guestDefined:Boolean;
private var _authToken:String;
private var _metadata:Object;
@ -262,19 +258,6 @@ package org.bigbluebutton.lib.main.models {
metadata = metadata;
}
public function get guest():Boolean {
return _guest;
}
public function set guest(value:Boolean):void {
_guest = value;
_changedSignal.dispatch();
}
public function isGuestDefined():Boolean {
return _guestDefined;
}
public function load(obj:Object):void {
_meetingName = obj.conferenceName;
_externMeetingID = obj.externMeetingID;
@ -290,9 +273,7 @@ package org.bigbluebutton.lib.main.models {
_internalUserID = obj.internalUserId;
_logoutUrl = obj.logoutUrl;
_record = !(obj.record == "false");
_guest = (obj.guest == "true");
_avatarUrl = obj.avatarURL;
_guestDefined = (obj.guest != undefined);
_authToken = obj.authToken;
_changedSignal.dispatch();
_metadata = new Object();

3
clients/flash/common-library/src/org/bigbluebutton/lib/main/models/IConferenceParameters.as
View File

@ -37,9 +37,6 @@ package org.bigbluebutton.lib.main.models {
function set userid(userid:String):void;
function get record():Boolean;
function set record(record:Boolean):void;
function get guest():Boolean;
function set guest(value:Boolean):void;
function isGuestDefined():Boolean;
function get authToken():String;
function set authToken(authToken:String):void;
function get metadata():Object;

4
clients/flash/common-library/src/org/bigbluebutton/lib/main/models/IUserSession.as
View File

@ -26,8 +26,6 @@ package org.bigbluebutton.lib.main.models {
function set userList(userList:UserList):void;
function get phoneOptions():PhoneOptions;
function set phoneOptions(value:PhoneOptions):void;
function get guestList():UserList;
function set guestList(userList:UserList):void;
function get voiceConnection():IVoiceConnection;
function set voiceConnection(value:IVoiceConnection):void;
function get mainConnection():IBigBlueButtonConnection;
@ -39,8 +37,6 @@ package org.bigbluebutton.lib.main.models {
function get deskshareConnection():IDeskshareConnection;
function set deskshareConnection(value:IDeskshareConnection):void;
function get presentationList():PresentationList;
function get guestPolicySignal():ISignal;
function get guestEntranceSignal():ISignal;
function get successJoiningMeetingSignal():ISignal;
function get failureJoiningMeetingSignal():ISignal;
function get loadedMessageHistorySignal():ISignal;

29
clients/flash/common-library/src/org/bigbluebutton/lib/main/models/UserSession.as
View File

@ -15,12 +15,6 @@ package org.bigbluebutton.lib.main.models {
import org.osflash.signals.Signal;
public class UserSession implements IUserSession {
public static const GUEST_POLICY_ASK_MODERATOR:String = "ASK_MODERATOR";
public static const GUEST_POLICY_ALWAYS_DENY:String = "ALWAYS_DENY";
public static const GUEST_POLICY_ALWAYS_ACCEPT:String = "ALWAYS_ACCEPT";
protected var _config:Config;
protected var _userId:String;
@ -37,8 +31,6 @@ package org.bigbluebutton.lib.main.models {
protected var _userList:UserList;
protected var _guestList:UserList;
protected var _presentationList:PresentationList;
protected var _recording:Boolean;
@ -59,12 +51,8 @@ package org.bigbluebutton.lib.main.models {
protected var _pushToTalk:Boolean;
protected var _guestPolicySignal:ISignal = new Signal();
protected var _loadedMessageHistorySignal:ISignal = new Signal();
protected var _guestEntranceSignal:ISignal = new Signal();
protected var _successJoiningMeetingSignal:ISignal = new Signal();
protected var _failureJoiningMeetingSignal:ISignal = new Signal();
@ -109,14 +97,6 @@ package org.bigbluebutton.lib.main.models {
_userList = userList;
}
public function set guestList(userList:UserList):void {
_guestList = userList;
}
public function get guestList():UserList {
return _guestList;
}
public function get lockSettings():LockSettings {
return _lockSettings;
}
@ -214,7 +194,6 @@ package org.bigbluebutton.lib.main.models {
public function UserSession() {
_userList = new UserList();
_guestList = new UserList();
_presentationList = new PresentationList();
_lockSettings = new LockSettings();
userList.userChangeSignal.add(userChangedHandler);
@ -224,18 +203,10 @@ package org.bigbluebutton.lib.main.models {
return _presentationList
}
public function get guestEntranceSignal():ISignal {
return _guestEntranceSignal;
}
public function get loadedMessageHistorySignal():ISignal {
return _loadedMessageHistorySignal;
}
public function get guestPolicySignal():ISignal {
return _guestPolicySignal;
}
public function get successJoiningMeetingSignal():ISignal {
return _successJoiningMeetingSignal;
}

4
clients/flash/common-library/src/org/bigbluebutton/lib/main/services/BigBlueButtonConnection.as
View File

@ -94,10 +94,6 @@ package org.bigbluebutton.lib.main.services {
var uri:String = _applicationURI + "/" + _conferenceParameters.room;
var lockSettings:Object = {disableCam: false, disableMic: false, disablePrivateChat: false, disablePublicChat: false, lockedLayout: false, lockOnJoin: false, lockOnJoinConfigurable: false};
var connectParams:Array = [_conferenceParameters.username, _conferenceParameters.role, _conferenceParameters.room, _conferenceParameters.voicebridge, _conferenceParameters.record, _conferenceParameters.externUserID, _conferenceParameters.internalUserID, _conferenceParameters.muteOnStart, lockSettings];
if (_conferenceParameters.isGuestDefined()) {
trace(_conferenceParameters.guest);
connectParams.push(_conferenceParameters.guest);
}
trace(connectParams);
baseConnection.connect.apply(null, new Array(uri).concat(connectParams));
}

2
clients/flash/common-library/src/org/bigbluebutton/lib/main/services/LoginService.as
View File

@ -94,7 +94,7 @@ package org.bigbluebutton.lib.main.services {
protected function afterEnter(result:Object):void {
if (result.returncode == 'SUCCESS') {
trace("Join SUCCESS");
var user:Object = {username: result.fullname, conference: result.conference, conferenceName: result.confname, externMeetingID: result.externMeetingID, meetingID: result.meetingID, externUserID: result.externUserID, internalUserId: result.internalUserID, role: result.role, room: result.room, authToken: result.authToken, record: result.record, webvoiceconf: result.webvoiceconf, dialnumber: result.dialnumber, voicebridge: result.voicebridge, mode: result.mode, welcome: result.welcome, logoutUrl: result.logoutUrl, defaultLayout: result.defaultLayout, avatarURL: result.avatarURL, guest: result.guest};
var user:Object = {username: result.fullname, conference: result.conference, conferenceName: result.confname, externMeetingID: result.externMeetingID, meetingID: result.meetingID, externUserID: result.externUserID, internalUserId: result.internalUserID, role: result.role, room: result.room, authToken: result.authToken, record: result.record, webvoiceconf: result.webvoiceconf, dialnumber: result.dialnumber, voicebridge: result.voicebridge, mode: result.mode, welcome: result.welcome, logoutUrl: result.logoutUrl, defaultLayout: result.defaultLayout, avatarURL: result.avatarURL};
user.customdata = new Object();
if (result.customdata) {
for (var key:String in result.customdata) {

20
clients/flash/common-library/src/org/bigbluebutton/lib/user/models/User.as
View File

@ -190,25 +190,5 @@ package org.bigbluebutton.lib.user.models {
public function set listenOnly(value:Boolean):void {
_listenOnly = value;
}
private var _guest:Boolean;
public function get guest():Boolean {
return _guest;
}
public function set guest(value:Boolean):void {
_guest = value;
}
private var _waitingForAcceptance:Boolean;
public function get waitingForAcceptance():Boolean {
return _waitingForAcceptance;
}
public function set waitingForAcceptance(value:Boolean):void {
_waitingForAcceptance = value;
}
}
}

3
clients/flash/common-library/src/org/bigbluebutton/lib/user/services/IUsersService.as
View File

@ -11,9 +11,6 @@ package org.bigbluebutton.lib.user.services {
function emojiStatus(status:String):void;
function clearUserStatus(userID:String):void
function addStream(userID:String, streamName:String):void;
function getGuestPolicy():void
function responseToGuest(userID:String, response:Boolean):void
function responseToAllGuests(response:Boolean):void
function removeStream(userID:String, streamName:String):void;
function queryForRecordingStatus():void;
function changeRecordingStatus(userID:String, recording:Boolean):void;

37
clients/flash/common-library/src/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as
View File

@ -74,13 +74,6 @@ package org.bigbluebutton.lib.user.services {
case "userEmojiStatus":
handleEmojiStatusHand(message);
break;
case "guest_access_denied":
case "response_to_guest":
handleGuestResponse(message);
break;
case "get_guest_policy_reply":
handleGuestPolicy(message);
break;
case "validateAuthTokenTimedOut":
handleValidateAuthTokenTimedOut(message);
break;
@ -187,21 +180,6 @@ package org.bigbluebutton.lib.user.services {
userSession.userList.roleChange(msg.userID, msg.role);
}
private function handleGuestPolicy(m:Object):void {
var msg:Object = JSON.parse(m.msg);
trace("guestPolicy");
userSession.guestPolicySignal.dispatch(msg.guestPolicy);
}
private function handleGuestResponse(m:Object):void {
var msg:Object = JSON.parse(m.msg);
trace("GuestResponse: " + ObjectUtil.toString(msg));
userSession.guestList.removeUser(msg.userId);
if (msg.userId == userSession.userId) {
userSession.guestEntranceSignal.dispatch(msg.response);
}
}
private function handleEmojiStatusHand(m:Object):void {
var msg:Object = JSON.parse(m.msg);
trace("UsersMessageReceiver::handleEmojiStatusHand() -- user [" + msg.userId + "," + msg.emojiStatus + "] ");
@ -244,8 +222,6 @@ package org.bigbluebutton.lib.user.services {
user.isLeavingFlag = false;
user.listenOnly = newUser.listenOnly;
user.muted = newUser.voiceUser.muted;
user.guest = newUser.guest;
user.waitingForAcceptance = newUser.waitingForAcceptance;
var status:String = newUser.status;
if (newUser.raiseHand) {
user.status = User.RAISE_HAND;
@ -276,24 +252,13 @@ package org.bigbluebutton.lib.user.services {
break;
}
}
if (user.waitingForAcceptance) {
userSession.guestList.addUser(user);
} else {
userSession.guestList.removeUser(user.userID);
//if we are adding the userMe and he is already in the userList,we don't dispatch the guest signal
// because we have already been accepted and connected
if (!userSession.userList.getUser(user.userID) && user.userID == userSession.userId && user.guest) {
userSession.guestEntranceSignal.dispatch(true);
}
userSession.userList.addUser(user);
}
userSession.userList.addUser(user);
}
private function handleParticipantLeft(m:Object):void {
var msg:Object = JSON.parse(m.msg);
trace(LOG + "handleParticipantLeft() -- user [" + msg.user.userId + "] has left the meeting");
userSession.userList.removeUser(msg.user.userId);
userSession.guestList.removeUser(msg.user.userId);
}
private function handleAssignPresenterCallback(m:Object):void {

18
clients/flash/common-library/src/org/bigbluebutton/lib/user/services/UsersMessageSender.as
View File

@ -142,24 +142,6 @@ package org.bigbluebutton.lib.user.services {
userSession.mainConnection.sendMessage("joinMeeting", defaultSuccessResponse, defaultFailureResponse, internalUserID);
}
public function getGuestPolicy():void {
trace("getGuestPolicy");
userSession.mainConnection.sendMessage("participants.getGuestPolicy", defaultSuccessResponse, defaultFailureResponse);
}
public function responseToGuest(userId:String, response:Boolean):void {
trace("responseToGuest - guestID:[" + userId + "] response:[" + response + "]");
var message:Object = new Object();
message["userId"] = userId;
message["response"] = response;
userSession.mainConnection.sendMessage("participants.responseToGuest", defaultSuccessResponse, defaultFailureResponse, message);
}
public function responseToAllGuests(response:Boolean):void {
trace("responseToAllGuests - response:[" + response + "]");
responseToGuest(null, response);
}
public function changeRole(userID:String, role:String):void {
trace("UsersMessageSender::setParticipantRole() -- Sending [participants.setParticipantRole] message to server.. with message [userID:" + userID + ", role:" + role + "]");
var message:Object = new Object();

12
clients/flash/common-library/src/org/bigbluebutton/lib/user/services/UsersService.as
View File

@ -149,18 +149,6 @@ package org.bigbluebutton.lib.user.services {
usersMessageSender.sendJoinMeetingMessage(conferenceParameters.internalUserID);
}
public function getGuestPolicy():void {
usersMessageSender.getGuestPolicy();
}
public function responseToGuest(userId:String, response:Boolean):void {
usersMessageSender.responseToGuest(userId, response);
}
public function responseToAllGuests(response:Boolean):void {
usersMessageSender.responseToAllGuests(response);
}
public function validateToken():void {
usersMessageSender.validateToken(conferenceParameters.internalUserID, conferenceParameters.authToken);
}