Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1756586&r1=1756585&r2=1756586&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Wed Aug 17 07:35:54 2016 @@ -613,7 +613,7 @@ public class ScreenSharerFrame extends J remoteEnabled.setBackground(Color.WHITE); remoteEnabled.setSelected(core.isRemoteEnabled()); remoteEnabled.setBounds(10, 10, 450, 24); - remoteEnabled.setEnabled(core.allowRemote); + remoteEnabled.setEnabled(core.isRemoteEnabled()); remoteEnabled.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) {
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1756586&r1=1756585&r2=1756586&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp Wed Aug 17 07:35:54 2016 @@ -46,6 +46,7 @@ <argument>$allowRemote</argument> <argument>$allowRecording</argument> <argument>$allowPublishing</argument> + <argument>$native</argument> <argument>$keystore</argument> <argument>$password</argument> </application-desc> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1756586&r1=1756585&r2=1756586&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java Wed Aug 17 07:35:54 2016 @@ -107,7 +107,7 @@ public class StartSharingButton extends throw new RuntimeException(String.format("Invalid room id passed %s, expected, %s", path, roomId)); } Protocol protocol = Protocol.valueOf(url.getScheme()); - app = addKeystore(app, protocol).replace("$codebase", baseUrl + "screenshare") + app = addKeystore(rc, app, protocol).replace("$codebase", baseUrl + "screenshare") .replace("$applicationName", cfgDao.getAppName()) .replace("$url", _url) .replace("$publicSid", publicSid) @@ -149,7 +149,7 @@ public class StartSharingButton extends return result.toString(); } - private static String addKeystore(String app, Protocol protocol) { + private static String addKeystore(Client rc, String app, Protocol protocol) { log.debug("RTMP Sharer Keystore :: start"); String keystore = "--dummy--", password = "--dummy--"; if (Protocol.rtmps == protocol) { @@ -187,7 +187,8 @@ public class StartSharingButton extends } } } - return app.replace("$keystore", CDATA_BEGIN + keystore + CDATA_END) + return app.replace("$native", "" + rc.isNativeSsl()) + .replace("$keystore", CDATA_BEGIN + keystore + CDATA_END) .replace("$password", CDATA_BEGIN + password + CDATA_END); } }
