svn commit: r1652367 - /openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Jan 16 08:44:22 2015
New Revision: 1652367

URL: http://svn.apache.org/r1652367
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=1652367&r1=1652366&r2=1652367&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 08:44:22 2015
@@ -133,6 +133,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);
                                }
                        }
@@ -207,8 +208,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();
@@ -225,12 +227,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);