Author: vdegtyarev Date: Fri Jan 16 10:58:48 2015 New Revision: 1652386 URL: http://svn.apache.org/r1652386 Log: Merge openmeetings - 954 : Additional fix - Mobile video is displayed correctly in the interview room.
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1652386&r1=1652385&r2=1652386&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Fri Jan 16 10:58:48 2015 @@ -146,6 +146,7 @@ public class MobileService { room.put("id", r.getId()); room.put("name", r.getName()); room.put("type", type); + room.put("roomTypeId", r.getRoomtype().getId()); if (org != null) { room.put("org", org); } @@ -190,28 +191,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().getId() == 4) { - int pods[] = {-1, -1}; - for (Client rcl : sessionManager.getClientListByRoom(r.getId())) { - 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); @@ -220,7 +201,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);