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/07/26 07:59:22 UTC

openmeetings git commit: [OPENMEETINGS-1664] SIP seems to work as expected

Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x 45b7578e7 -> 188f158b7


[OPENMEETINGS-1664] SIP seems to work as expected


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/188f158b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/188f158b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/188f158b

Branch: refs/heads/3.3.x
Commit: 188f158b7caf286a9f941cf9a96dbc0c2f633f7d
Parents: 45b7578
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Jul 26 14:59:13 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Jul 26 14:59:13 2017 +0700

----------------------------------------------------------------------
 .../org/apache/openmeetings/db/dao/room/SipDao.java |   1 -
 .../org/apache/openmeetings/util/OmFileHelper.java  |   8 +++++++-
 .../apache/openmeetings/web/app/Application.java    |   5 +++--
 .../web/room/activities/ActivitiesPanel.java        |   2 +-
 .../web/util/ProfileImageResourceReference.java     |   6 ++++--
 .../src/main/webapp/default/_profile_phone.png      | Bin 1112 -> 0 bytes
 openmeetings-web/src/main/webapp/images/phone.png   | Bin 0 -> 1112 bytes
 7 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
index 33c5636..67c773b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
@@ -40,7 +40,6 @@ public class SipDao {
 	private static final Logger log = Red5LoggerFactory.getLogger(SipDao.class);
 	public static final String ASTERISK_OM_FAMILY = "openmeetings";
 	public static final String ASTERISK_OM_KEY = "rooms";
-	public static final Long SIP_USER_ID = -1L;
 	public static final String SIP_FIRST_NAME = "SIP Transport";
 	public static final String SIP_USER_NAME = "--SIP--";
 	private String sipHostname;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 3771375..b68276f 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -74,6 +74,10 @@ public class OmFileHelper {
 	public static final String BCKP_ROOM_FILES = "roomFiles";
 	public static final String BCKP_RECORD_FILES = "recordingFiles";
 
+	//Sip related stuff
+	public static final Long SIP_USER_ID = -1L;
+	public static final String SIP_PICTURE_URI = "phone.png";
+
 	public static void setOmHome(File omHome) {
 		OmFileHelper.OM_HOME = omHome;
 	}
@@ -137,7 +141,9 @@ public class OmFileHelper {
 
 	public static File getUserProfilePicture(Long userId, String uri) {
 		File img = null;
-		if (userId != null) {
+		if (SIP_USER_ID.equals(userId)) {
+			img = new File(getImagesDir(), SIP_PICTURE_URI);
+		} else if (userId != null) {
 			img = new File(getUploadProfilesUserDir(userId), uri == null ? "" : profileImagePrefix + uri);
 		}
 		if (img == null || !img.exists() || img.isDirectory()) {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 72b3a4e..48e8dbe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -20,8 +20,8 @@ package org.apache.openmeetings.web.app;
 
 import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
 import static org.apache.openmeetings.db.dao.room.SipDao.SIP_FIRST_NAME;
-import static org.apache.openmeetings.db.dao.room.SipDao.SIP_USER_ID;
 import static org.apache.openmeetings.db.dao.room.SipDao.SIP_USER_NAME;
+import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_XFRAME_SAMEORIGIN;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
@@ -324,7 +324,8 @@ public class Application extends AuthenticatedWebApplication implements IApplica
 					}
 					//FIXME TODO rights
 				} else if (client == null && rcl.isSipTransport()) {
-					rcl.setPicture_uri("phone.png");
+					rcl.setUsername(SIP_USER_NAME);
+					rcl.setUserId(SIP_USER_ID);
 					//SipTransport enters the room
 					User u = new User();
 					u.setId(SIP_USER_ID);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index 7080258..054c739 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -19,8 +19,8 @@
 package org.apache.openmeetings.web.room.activities;
 
 import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
-import static org.apache.openmeetings.db.dao.room.SipDao.SIP_USER_ID;
 import static org.apache.openmeetings.db.dao.room.SipDao.SIP_FIRST_NAME;
+import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.web.app.Application.getBean;
 import static org.apache.openmeetings.web.app.Application.getOnlineClient;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
index a5de7c0..871cc12 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.web.util;
 
+import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.web.app.Application.getBean;
 
@@ -75,7 +77,7 @@ public class ProfileImageResourceReference extends ResourceReference {
 
 	@Override
 	public IResource getResource() {
-		return new ByteArrayResource("image/jpeg") {
+		return new ByteArrayResource(JPG_MIME_TYPE) {
 			private static final long serialVersionUID = 1L;
 			private Long userId = null;
 			private String uri = null;
@@ -87,7 +89,7 @@ public class ProfileImageResourceReference extends ResourceReference {
 					PageParameters params = attributes.getParameters();
 					try {
 						userId = params.get("id").toOptionalLong();
-						uri = getBean(UserDao.class).get(userId).getPictureuri();
+						uri = SIP_USER_ID.equals(userId) ? null : getBean(UserDao.class).get(userId).getPictureuri();
 					} catch (Exception e) {
 						// no-op, junk filter
 					}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-web/src/main/webapp/default/_profile_phone.png
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/default/_profile_phone.png b/openmeetings-web/src/main/webapp/default/_profile_phone.png
deleted file mode 100644
index 9ed6449..0000000
Binary files a/openmeetings-web/src/main/webapp/default/_profile_phone.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/188f158b/openmeetings-web/src/main/webapp/images/phone.png
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/images/phone.png b/openmeetings-web/src/main/webapp/images/phone.png
new file mode 100644
index 0000000..9ed6449
Binary files /dev/null and b/openmeetings-web/src/main/webapp/images/phone.png differ