diff --git a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar index e2d0e23e400619b664ad505d200c875648aed35f..c5041b794a8002da51fcfd0eaca573cd7fcc6019 100755 Binary files a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar and b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar differ diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml index 9864b2cb880d681cb7017f4c6d069d7084191815..3027e12033fa637866f20f0d7fdc48d1dc9b3e5f 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml @@ -101,13 +101,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. private function init():void { dsOptions = new DeskshareOptions(); baseIndex = dsOptions.baseTabIndex; + javaRequiredString = "bbb.desktopPublish.javaRequiredLabel.unknown"; + btnFSPublish.enabled = false; + btnRegionPublish.enabled = false; if (ExternalInterface.available && ExternalInterface.call("isJavaEnabled") && ExternalInterface.call("isJavaVersionAppropriateForDeskshare")) { javaRequiredString = "bbb.desktopPublish.javaRequiredLabel.verified"; - } else { - javaRequiredString = "bbb.desktopPublish.javaRequiredLabel.unknown"; + btnFSPublish.enabled = true; + btnRegionPublish.enabled = true; } } diff --git a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java index 666258e6da98d6bc8eba461140f83e565d2d8a7f..0cbecbe4514afc9ee1633255419e2b99cf378940 100755 --- a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java +++ b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java @@ -127,21 +127,7 @@ public class DeskShareApplet extends JApplet implements ClientListener { public void start() { System.out.println("Desktop Sharing Applet Starting"); super.start(); - - System.out.println("**** JAVA VERSION = [" + getJavaVersionRuntime() + "]"); - - Pattern p = Pattern.compile(JAVA_VERSION_PATTERN); - Matcher matcher = p.matcher(getJavaVersionRuntime()); - if (matcher.matches()) { - int jreVersion = Integer.valueOf(matcher.group(1).trim()).intValue(); - if (jreVersion < MIN_JRE_VERSION) { - displayJavaWarning(VERSION_ERROR_MSG); - } else { - allowDesktopSharing(); - } - } else { - displayJavaWarning(VERSION_ERROR_MSG); - } + allowDesktopSharing(); } private void allowDesktopSharing() {