Author: solomax
Date: Mon Feb 27 10:54:58 2017
New Revision: 1784524
URL: http://svn.apache.org/viewvc?rev=1784524&view=rev
Log:
no jira: more work on screen-sharing, button seems to be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1784524&r1=1784523&r2=1784524&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Mon Feb 27 10:54:58 2017
@@ -557,8 +557,10 @@ public class RoomPanel extends BasePanel
public boolean screenShareAllowed() {
Room r = getRoom();
+ org.apache.openmeetings.db.entity.room.Client rcl =
RoomBroadcaster.getClient(getMainPanel().getClient().getUid());
return Room.Type.interview != r.getType() &&
!r.isHidden(RoomElement.ScreenSharing)
- && r.isAllowRecording() &&
getClient().hasRight(Right.share) && getSharingUser() == null;
+ && r.isAllowRecording() &&
getClient().hasRight(Right.share)
+ && getSharingUser() == null && rcl != null &&
rcl.getUserId() != null;
}
public RoomSidebar getSidebar() {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1784524&r1=1784523&r2=1784524&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
Mon Feb 27 10:54:58 2017
@@ -95,7 +95,7 @@ public class StartSharingButton extends
app = IOUtils.toString(jnlp, UTF_8);
String publicSid = c.getUid();
Client rc = getClient(publicSid);
- if (rc == null) {
+ if (rc == null || rc.getUserId() == null) {
throw new
RuntimeException(String.format("Unable to find client by publicSID '%s'",
publicSid));
}
String _url = rc.getTcUrl();
@@ -128,13 +128,14 @@ public class StartSharingButton extends
.replace("$allowRecording", "" +
(rc.getUserId() > 0 && room.isAllowRecording() && rc.isAllowRecording() && (0
== sessionManager.getRecordingCount(roomId))))
.replace("$allowPublishing", "" + (0 ==
sessionManager.getPublishingCount(roomId)))
;
+
+ StringResourceStream srs = new
StringResourceStream(app, "application/x-java-jnlp-file");
+ srs.setCharset(UTF_8);
+ download.setResourceStream(srs);
+ download.initiate(target);
} catch (Exception e) {
log.error("Unexpected error while creating jnlp file",
e);
}
- StringResourceStream srs = new StringResourceStream(app,
"application/x-java-jnlp-file");
- srs.setCharset(UTF_8);
- download.setResourceStream(srs);
- download.initiate(target);
}
private static String getLabels(int ... ids) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1784524&r1=1784523&r2=1784524&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Mon Feb 27 10:54:58 2017
@@ -568,8 +568,10 @@ public class RoomPanel extends BasePanel
public boolean screenShareAllowed() {
Room r = getRoom();
+ org.apache.openmeetings.db.entity.room.Client rcl =
RoomBroadcaster.getClient(getMainPanel().getClient().getUid());
return Room.Type.interview != r.getType() &&
!r.isHidden(RoomElement.ScreenSharing)
- && r.isAllowRecording() &&
getClient().hasRight(Right.share) && getSharingUser() == null;
+ && r.isAllowRecording() &&
getClient().hasRight(Right.share)
+ && getSharingUser() == null && rcl != null &&
rcl.getUserId() != null;
}
public RoomSidebar getSidebar() {
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=1784524&r1=1784523&r2=1784524&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
Mon Feb 27 10:54:58 2017
@@ -95,7 +95,7 @@ public class StartSharingButton extends
app = IOUtils.toString(jnlp, UTF_8);
String publicSid = c.getUid();
Client rc = getClient(publicSid);
- if (rc == null) {
+ if (rc == null || rc.getUserId() == null) {
throw new
RuntimeException(String.format("Unable to find client by publicSID '%s'",
publicSid));
}
String _url = rc.getTcUrl();
@@ -128,13 +128,14 @@ public class StartSharingButton extends
.replace("$allowRecording", "" +
(rc.getUserId() > 0 && room.isAllowRecording() && rc.isAllowRecording() && (0
== sessionManager.getRecordingCount(roomId))))
.replace("$allowPublishing", "" + (0 ==
sessionManager.getPublishingCount(roomId)))
;
+
+ StringResourceStream srs = new
StringResourceStream(app, "application/x-java-jnlp-file");
+ srs.setCharset(UTF_8);
+ download.setResourceStream(srs);
+ download.initiate(target);
} catch (Exception e) {
log.error("Unexpected error while creating jnlp file",
e);
}
- StringResourceStream srs = new StringResourceStream(app,
"application/x-java-jnlp-file");
- srs.setCharset(UTF_8);
- download.setResourceStream(srs);
- download.initiate(target);
}
private static String getLabels(int ... ids) {
