You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/06 07:36:09 UTC

svn commit: r1785595 - in /openmeetings/application: branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/

Author: solomax
Date: Mon Mar  6 07:36:09 2017
New Revision: 1785595

URL: http://svn.apache.org/viewvc?rev=1785595&view=rev
Log:
[OPENMEETINGS-1590] broadcast mode is not being overriden for mobile

Modified:
    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/red5/ScopeApplicationAdapter.java

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=1785595&r1=1785594&r2=1785595&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 Mar  6 07:36:09 2017
@@ -733,7 +733,7 @@ public class ScopeApplicationAdapter ext
 				c.setScreenPublishStarted(true);
 				sessionManager.updateClientByStreamId(streamid, c, false, null);
 			}
-			if (!Strings.isEmpty(c.getSecurityCode())) {
+			if (!c.isMobile() && !Strings.isEmpty(c.getSecurityCode())) {
 				c.setBroadCastID(Long.parseLong(stream.getPublishedName()));
 				c.setAvsettings("av");
 				c.setIsBroadcasting(true);

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=1785595&r1=1785594&r2=1785595&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 Mar  6 07:36:09 2017
@@ -733,7 +733,7 @@ public class ScopeApplicationAdapter ext
 				c.setScreenPublishStarted(true);
 				sessionManager.updateClientByStreamId(streamid, c, false, null);
 			}
-			if (!Strings.isEmpty(c.getSecurityCode())) {
+			if (!c.isMobile() && !Strings.isEmpty(c.getSecurityCode())) {
 				c.setBroadCastID(Long.parseLong(stream.getPublishedName()));
 				c.setAvsettings("av");
 				c.setIsBroadcasting(true);