svn commit: r1652366 - /openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java

[vd...@apache.org]

Author: vdegtyarev
Date: Fri Jan 16 08:43:33 2015
New Revision: 1652366

URL: http://svn.apache.org/r1652366
Log:
openmeetings - 954 : Additional fix - Mobile video is displayed correctly in the interview room.

Modified:
    openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java

Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java?rev=1652366&r1=1652365&r2=1652366&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java Fri Jan 16 08:43:33 2015
@@ -134,6 +134,7 @@ public class MobileService {
 					add(map, "login", c.getUsername());
 					add(map, "email", c.getEmail());
 					add(map, "avsettings", c.getAvsettings());
+					add(map, "interviewPodId", c.getInterviewPodId());
 					result.add(map);
 				}
 			}
@@ -208,8 +209,9 @@ public class MobileService {
 			} else if (pods[1] < 0) {
 				c.setInterviewPodId(2);
 			} else {
-				isInterview = true;
+				c.setInterviewPodId(-1);
 			}
+			isInterview = true;
 		}
 		 //TODO check if we need anything here
 		long broadcastId = scopeAdapter.getBroadCastId();
@@ -226,12 +228,15 @@ public class MobileService {
 		return result;
 	}
 
-	public Map<String, Object> updateAvMode(String avMode, String width, String height) {
+	public Map<String, Object> updateAvMode(String avMode, String width, String height, Integer interviewPodId) {
 		IConnection current = Red5.getConnectionLocal();
 		Client c = sessionManager.getClientByStreamId(current.getClient().getId(), null);
 		c.setAvsettings(avMode);
 		c.setVWidth(Integer.parseInt(width));
 		c.setVHeight(Integer.parseInt(height));
+		if (interviewPodId > 0) {
+			c.setInterviewPodId(interviewPodId);
+		}
 		sessionManager.updateClientByStreamId(c.getStreamid(), c, false, null);
 		HashMap<String, Object> hsm = new HashMap<String, Object>();
 		hsm.put("client", c);