Commiting with the caption module in a workable state

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala

@@ -15,20 +15,20 @@ trait CaptionApp {
 
     outGW.send(new SendCaptionHistoryReply(mProps.meetingID, mProps.recorded, msg.requesterID, history))
   }
-  
+  /*
   def handleUpdateCaptionInfo(msg: UpdateCaptionInfo) {
-  
-  }
 
+  }
+*/
   def handleEditCaptionHistoryRequest(msg: EditCaptionHistoryRequest) {
     captionModel.editHistory(msg.startIndex, msg.endIndex, msg.locale, msg.text)
 
     outGW.send(new EditCaptionHistoryReply(mProps.meetingID, mProps.recorded, msg.startIndex, msg.endIndex, msg.locale, msg.text))
   }
-  
+
   def checkCaptionOwnerLogOut(userId: String) {
-    var transcript = findTranscriptByOwnerId(userId)
-    
-    if (transcript
+    //var transcript = findTranscriptByOwnerId(userId)
+
+    //if (transcript
   }
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala

@@ -4,27 +4,27 @@ import scala.collection.mutable.ArrayBuffer
 import scala.collection.immutable.HashMap
 
 class CaptionModel {
-  var transcripts = Map[String, Array[String]]()
+  var transcripts = Map[String, String]()
 
   def newTranscript(locale: String, ownerId: String) {
-    transcripts += locale -> Array(locale, "")
+    // transcripts += locale -> Array(ownerId, "")
   }
-
+  /*
   def findLocaleByOwnerId(userId: String): Option[String] {
     transcripts.foreach(t => {
       if (t._2[0] == userId) {
-        return t._1
+        return Some(t._1)
       }
     })
-    
-    
+	
+	return None
   }
-  
+*/
   def getHistory(): Map[String, String] = {
     var history = Map[String, String]()
 
     transcripts.foreach(t => {
-      history += t._1 -> t._2[2]
+      history += t._1 -> t._2
     })
 
     history
@@ -40,6 +40,8 @@ class CaptionModel {
 
         transcripts += locale -> (sText + text + eText)
       }
+    } else {
+      transcripts += locale -> text
     }
   }
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala

@@ -388,7 +388,7 @@ trait UsersApp {
             vu.userId, u.userID, u.externUserID, vu.callerName,
             vu.callerNum, vu.muted, vu.talking, u.listenOnly)));
         }
-        
+
         checkCaptionOwnerLogOut(u.userID)
       }