Author: solomax
Date: Mon Feb 27 09:59:36 2017
New Revision: 1784516
URL: http://svn.apache.org/viewvc?rev=1784516&view=rev
Log:
[OPENMEETINGS-1553] more work on mobile client
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1784516&r1=1784515&r2=1784516&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Mon Feb 27 09:59:36 2017
@@ -337,6 +337,10 @@ public class MobileService {
IConnection current = Red5.getConnectionLocal();
Client c =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
c.setAvsettings(avMode);
+ if (!"n".equals(avMode)) {
+ c.setBroadCastID(nextBroadCastId());
+ c.setIsBroadcasting(true);
+ }
c.setVWidth(Double.valueOf(width).intValue());
c.setVHeight(Double.valueOf(height).intValue());
if (interviewPodId > 0) {
@@ -348,7 +352,7 @@ public class MobileService {
hsm.put("message", new String[]{"avsettings", "0", avMode});
Map<String, Object> result = new HashMap<>();
if (!"n".equals(avMode)) {
- result.put("broadcastId", nextBroadCastId());
+ result.put("broadcastId", c.getBroadCastID());
}
scopeAdapter.sendMessageToCurrentScope("sendVarsToMessageWithClient", hsm,
true, false);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1784516&r1=1784515&r2=1784516&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Mon Feb 27 09:59:36 2017
@@ -238,6 +238,16 @@ public class ScopeApplicationAdapter ext
}
rcm.setMobile(true);
rcm.setUserId(sd.getUserId());
+ if (rcm.getUserId() != null) {
+ User u = userDao.get(rcm.getUserId());
+ if (u == null) {
+ log.error("Attempt of unauthorized room
enter: USER not found, client is rejected");
+ return rejectClient();
+ }
+ rcm.setFirstname(u.getFirstname());
+ rcm.setLastname(u.getLastname());
+ rcm.setEmail(u.getAddress() == null ? null :
u.getAddress().getEmail());
+ }
rcm.setSecurityCode(sd.getSessionId());
rcm.setPublicSID(UUID.randomUUID().toString());
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1784516&r1=1784515&r2=1784516&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Mon Feb 27 09:59:36 2017
@@ -337,6 +337,10 @@ public class MobileService {
IConnection current = Red5.getConnectionLocal();
Client c =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
c.setAvsettings(avMode);
+ if (!"n".equals(avMode)) {
+ c.setBroadCastID(nextBroadCastId());
+ c.setIsBroadcasting(true);
+ }
c.setVWidth(Double.valueOf(width).intValue());
c.setVHeight(Double.valueOf(height).intValue());
if (interviewPodId > 0) {
@@ -348,7 +352,7 @@ public class MobileService {
hsm.put("message", new String[]{"avsettings", "0", avMode});
Map<String, Object> result = new HashMap<>();
if (!"n".equals(avMode)) {
- result.put("broadcastId", nextBroadCastId());
+ result.put("broadcastId", c.getBroadCastID());
}
scopeAdapter.sendMessageToCurrentScope("sendVarsToMessageWithClient", hsm,
true, false);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1784516&r1=1784515&r2=1784516&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Mon Feb 27 09:59:36 2017
@@ -238,6 +238,16 @@ public class ScopeApplicationAdapter ext
}
rcm.setMobile(true);
rcm.setUserId(sd.getUserId());
+ if (rcm.getUserId() != null) {
+ User u = userDao.get(rcm.getUserId());
+ if (u == null) {
+ log.error("Attempt of unauthorized room
enter: USER not found, client is rejected");
+ return rejectClient();
+ }
+ rcm.setFirstname(u.getFirstname());
+ rcm.setLastname(u.getLastname());
+ rcm.setEmail(u.getAddress() == null ? null :
u.getAddress().getEmail());
+ }
rcm.setSecurityCode(sd.getSessionId());
rcm.setPublicSID(UUID.randomUUID().toString());
}
