Author: solomax
Date: Tue Feb 28 05:10:04 2017
New Revision: 1784690
URL: http://svn.apache.org/viewvc?rev=1784690&view=rev
Log:
[OPENMEETINGS-1553] mobile login is fixed one more time
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784690&r1=1784689&r2=1784690&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Tue Feb 28 05:10:04 2017
@@ -253,7 +253,10 @@ public class Application extends Authent
if (!rcl.isScreenClient() && (!rcl.isMobile() ||
(rcl.isMobile() && rcl.getUserId() != null))) {
Client client = getOnlineClient(rcl.getPublicSID());
if (client == null) {
- if (rcl.isMobile()) {
+ if (!Strings.isEmpty(rcl.getSecurityCode())) {
+ client =
getOnlineClient(rcl.getSecurityCode());
+ }
+ if (client == null && rcl.isMobile()) {
//Mobile client enters the room
client = new Client(rcl,
getBean(UserDao.class));
addOnlineUser(client);
@@ -263,13 +266,10 @@ public class Application extends Authent
WebSocketHelper.sendRoom(new
RoomMessage(client.getRoomId(), client.getUserId(),
RoomMessage.Type.roomEnter));
}
//FIXME TODO rights
- } else if
(!Strings.isEmpty(rcl.getSecurityCode())) {
- client =
getOnlineClient(rcl.getSecurityCode());
- if (client != null &&
!client.hasRight(Right.audio) && !client.hasRight(Right.video)) {
- log.warn("Parent client has no
AV rights, going reject client");
- return null;
- }
- } else {
+ } else if (client == null) {
+ return null;
+ } else if (!client.hasRight(Right.audio) &&
!client.hasRight(Right.video)) {
+ log.warn("Parent client has no AV
rights, going reject client");
return null;
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784690&r1=1784689&r2=1784690&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Tue Feb 28 05:10:04 2017
@@ -253,7 +253,10 @@ public class Application extends Authent
if (!rcl.isScreenClient() && (!rcl.isMobile() ||
(rcl.isMobile() && rcl.getUserId() != null))) {
Client client = getOnlineClient(rcl.getPublicSID());
if (client == null) {
- if (rcl.isMobile()) {
+ if (!Strings.isEmpty(rcl.getSecurityCode())) {
+ client =
getOnlineClient(rcl.getSecurityCode());
+ }
+ if (client == null && rcl.isMobile()) {
//Mobile client enters the room
client = new Client(rcl,
getBean(UserDao.class));
addOnlineUser(client);
@@ -263,13 +266,10 @@ public class Application extends Authent
WebSocketHelper.sendRoom(new
RoomMessage(client.getRoomId(), client.getUserId(),
RoomMessage.Type.roomEnter));
}
//FIXME TODO rights
- } else if
(!Strings.isEmpty(rcl.getSecurityCode())) {
- client =
getOnlineClient(rcl.getSecurityCode());
- if (client != null &&
!client.hasRight(Right.audio) && !client.hasRight(Right.video)) {
- log.warn("Parent client has no
AV rights, going reject client");
- return null;
- }
- } else {
+ } else if (client == null) {
+ return null;
+ } else if (!client.hasRight(Right.audio) &&
!client.hasRight(Right.video)) {
+ log.warn("Parent client has no AV
rights, going reject client");
return null;
}
}
