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

[vd...@apache.org]

Author: vdegtyarev
Date: Fri Jan 16 10:57:59 2015
New Revision: 1652385

URL: http://svn.apache.org/r1652385
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=1652385&r1=1652384&r2=1652385&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 10:57:59 2015
@@ -147,6 +147,7 @@ public class MobileService {
 		room.put("id", r.getRooms_id());
 		room.put("name", r.getName());
 		room.put("type", type);
+		room.put("roomTypeId", r.getRoomtype().getRoomtypes_id());
 		if (org != null) {
 			room.put("org", org);
 		}
@@ -191,28 +192,8 @@ public class MobileService {
 	
 	public Map<String, Object> roomConnect(String SID, Long userId) {
 		Map<String, Object> result = new Hashtable<String, Object>();
-		boolean isInterview = false;
 		User u = userDao.get(userId);
 		Client c = scopeAdapter.setUsernameReconnect(SID, userId, u.getLogin(), u.getFirstname(), u.getLastname(), u.getPictureuri());
-		// TODO check interview room
-		Room r = roomDao.get(Long.parseLong(c.getScope()));
-		if (r.getRoomtype().getRoomtypes_id() == 4) {
-			int pods[] = {-1, -1};
-			for (Client rcl : sessionManager.getClientListByRoom(r.getRooms_id())) {
-				if (!rcl.getStreamid().equals(c.getStreamid()) 
-						&& rcl.getInterviewPodId() != null) {
-					pods[rcl.getInterviewPodId() - 1] = 1;
-				}
-			}
-			if (pods[0] < 0) { 
-				c.setInterviewPodId(1);
-			} else if (pods[1] < 0) {
-				c.setInterviewPodId(2);
-			} else {
-				c.setInterviewPodId(-1);
-			}
-			isInterview = true;
-		}
 		 //TODO check if we need anything here
 		long broadcastId = scopeAdapter.getBroadCastId();
 		c.setSipTransport(true);
@@ -221,7 +202,6 @@ public class MobileService {
 		c.setBroadCastID(broadcastId);
 		c.setIsBroadcasting(true);
 		sessionManager.updateClientByStreamId(c.getStreamid(), c, false, null);
-		result.put("isInterview", isInterview);
 		result.put("broadcastId", broadcastId);
 
 		scopeAdapter.syncMessageToCurrentScope("addNewUser", c, false, false);