upgrade to latest jitsi code

igniterealtime · Feb 15, 2022 · 093e608 · 093e608
1 parent 43da0df
commit 093e608
Show file tree

Hide file tree

Showing 11 changed files with 146,357 additions and 143,376 deletions.
diff --git a/classes/jicofo/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar b/classes/jicofo/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar
diff --git a/classes/jicofo/jicofo-1.1-SNAPSHOT.jar b/classes/jicofo/jicofo-1.1-SNAPSHOT.jar
diff --git a/classes/jvb/jitsi-videobridge-2.1-SNAPSHOT-jar-with-dependencies.jar b/classes/jvb/jitsi-videobridge-2.1-SNAPSHOT-jar-with-dependencies.jar
diff --git a/classes/jvb/jitsi-videobridge-2.1-SNAPSHOT.jar b/classes/jvb/jitsi-videobridge-2.1-SNAPSHOT.jar
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
                         <goal>wget</goal>
                     </goals>
                     <configuration>
-                        <url>https://download.jitsi.org/jitsi-meet/src/jitsi-meet-1.0.5666.tar.bz2</url>
+                        <url>https://download.jitsi.org/jitsi-meet/src/jitsi-meet-1.0.5864.tar.bz2</url>
                         <unpack>true</unpack>
                         <outputDirectory>${project.basedir}/classes</outputDirectory>
                     </configuration>

diff --git a/src/webapp/collab.js b/src/webapp/collab.js
@@ -301,7 +301,7 @@ var collab = (function (coop) {
             Cursor._cursors[clientId] = cursor;
 
             if (APP.conference.isLocalId(clientId)) {
-                cursor.setName(APP.conference.getLocalDisplayName());
+                cursor.setName(ofmeet.getLocalDisplayName());
                 cursor.setColor(getConference().getLocalParticipantProperty('cursorColor'));
             } else {
                 let participant = getParticipant(clientId);

diff --git a/src/webapp/custom_ofmeet.js b/src/webapp/custom_ofmeet.js
@@ -319,16 +319,6 @@ var ofmeet = (function (ofm) {
             enter_room_button.parentNode.appendChild(button);
         }
     }
-
-	function getLocalDisplayName() {
-		const settings = JSON.parse(localStorage.getItem("features/base/settings"));
-		return settings?.displayName;
-	}
-
-	function getParticipantDisplayName(id) {
-		const participant = APP.conference.getParticipantById(APP.conference.getMyUserId());
-		return participant?._displayName;
-	}
 
     function preSetup() {
         if (!APP.connection) {
@@ -1171,7 +1161,17 @@ var ofmeet = (function (ofm) {
     function getConferenceJid() {
         return getConference()?.room?.roomjid;
     }
+
+	function getLocalDisplayName() {
+		const settings = JSON.parse(localStorage.getItem("features/base/settings"));
+		return settings?.displayName;
+	}
 
+	function getParticipantDisplayName(id) {
+		const participant = APP.conference.getParticipantById(APP.conference.getMyUserId());
+		return participant?._displayName;
+	}
+
     function getAllParticipants() {
         const state = APP.store.getState();
         return (state["features/base/participants"].remote);
@@ -3720,6 +3720,8 @@ var ofmeet = (function (ofm) {
 
     ofm.recording = false;
 	ofm.getAllParticipants = getAllParticipants;
+	ofm.getLocalDisplayName = getLocalDisplayName;
+	ofm.getParticipantDisplayName = getParticipantDisplayName;
 
     return ofm;
 

diff --git a/src/webapp/libs/app.bundle.min-old.js b/src/webapp/libs/app.bundle.min-old.js
diff --git a/src/webapp/libs/app.bundle.min.js b/src/webapp/libs/app.bundle.min.js
diff --git a/src/webapp/libs/lib-jitsi-meet.min-old.js b/src/webapp/libs/lib-jitsi-meet.min-old.js
diff --git a/src/webapp/libs/lib-jitsi-meet.min.js b/src/webapp/libs/lib-jitsi-meet.min.js