- Fixed emojiStatus not set correctly in server.

- Upgraded bbb-common-message version.
s2it-globo · Aug 26, 2015 · 2fb8296 · 2fb8296
1 parent 988d8cf
commit 2fb8296
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt
@@ -4,7 +4,7 @@ name := "bbb-apps-akka"
 
 organization := "org.bigbluebutton"
 
-version := "0.0.1"
+version := "0.0.2"
 
 scalaVersion  := "2.11.6"
 
@@ -50,7 +50,7 @@ libraryDependencies ++= {
 	  "com.google.code.gson"      %  "gson"              % "1.7.1",
 	  "redis.clients"             %  "jedis"             % "2.7.2",
       "org.apache.commons"        %  "commons-lang3"     % "3.2",
-      "org.bigbluebutton"         %  "bbb-common-message" % "0.0.13"
+      "org.bigbluebutton"         %  "bbb-common-message" % "0.0.14"
 	)}
 
 seq(Revolver.settings: _*)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
@@ -18,7 +18,6 @@ import org.bigbluebutton.core.service.recorder.RecorderApplication
 import org.bigbluebutton.common.messages.IBigBlueButtonMessage
 import org.bigbluebutton.common.messages.StartCustomPollRequestMessage
 import org.bigbluebutton.common.messages.PubSubPingMessage
-import org.bigbluebutton.core.api.UserEmojiStatus
 
 class BigBlueButtonInGW(val system: ActorSystem, recorderApp: RecorderApplication, messageSender: MessageSender, voiceEventRecorder: VoiceEventRecorder) extends IBigBlueButtonInGW {
   val log = system.log

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
@@ -209,7 +209,7 @@ trait UsersApp {
     usersModel.getUser(msg.userId) foreach { user =>
       val uvo = user.copy()
       usersModel.addUser(uvo)
-      outGW.send(new UserChangedEmojiStatus(mProps.meetingID, mProps.recorded, uvo.emojiStatus, uvo.userID))
+      outGW.send(new UserChangedEmojiStatus(mProps.meetingID, mProps.recorded, msg.emojiStatus, uvo.userID))
     }
   }
 

diff --git a/bbb-common-message/build.sbt b/bbb-common-message/build.sbt
@@ -4,7 +4,7 @@ name := "bbb-common-message"
 
 organization := "org.bigbluebutton"
 
-version := "0.0.13"
+version := "0.0.14"
 
 // We want to have our jar files in lib_managed dir.
 // This way we'll have the right path when we import

diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
@@ -105,7 +105,7 @@ dependencies {
    compile 'com.google.code.gson:gson:1.7.1'
    providedCompile 'org.apache.commons:commons-lang3:3.2'
 
-  compile 'org.bigbluebutton:bbb-common-message:0.0.13'
+  compile 'org.bigbluebutton:bbb-common-message:0.0.14'
 }
 
 test {

diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
@@ -291,7 +291,8 @@ private void processPresenterAssignedMessage(PresenterAssignedMessage msg) {
 	private void processUserEmojiStatusMessage(UserEmojiStatusMessage msg) {	  			
 		Map<String, Object> args = new HashMap<String, Object>();	
 		args.put("userId", msg.userId);
-
+		args.put("emojiStatus", msg.emojiStatus);
+
 		Map<String, Object> message = new HashMap<String, Object>();
 		Gson gson = new Gson();
 		message.put("msg", gson.toJson(args));
@@ -303,7 +304,7 @@ private void processUserEmojiStatusMessage(UserEmojiStatusMessage msg) {
 	private void processUserListeningOnlyMessage(UserListeningOnlyMessage msg) {	  			
 		Map<String, Object> args = new HashMap<String, Object>();	
 		args.put("userId", msg.userId);
-		 args.put("listenOnly", msg.listenOnly);
+		args.put("listenOnly", msg.listenOnly);
 
 		Map<String, Object> message = new HashMap<String, Object>();
 		Gson gson = new Gson();