From 9a2fcd27e00114f9c19eb752bbbd88e4b9513381 Mon Sep 17 00:00:00 2001
From: Mario Jr <mariogasparoni@gmail.com>
Date: Thu, 19 Nov 2020 23:11:39 -0300
Subject: [PATCH 1/2] Revert "Prevent Error 1006 when user has two or more
 occurrences of ':' (colon) in your name"

This reverts commit 0a601359bbc8c45eafc784da08f49d1e6162cfa1.
---
 bigbluebutton-html5/imports/api/audio/client/bridge/sip.js | 5 +----
 .../ui/components/nav-bar/talking-indicator/container.jsx  | 7 +------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 89eab9b430..c03c7489ac 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -145,13 +145,10 @@ class SIPSession {
       sessionToken,
     } = this.user;
 
-    const encodedName =
-      btoa && name ? btoa(name) : name;
-
     const callerIdName = [
       `${userId}_${getAudioSessionNumber()}`,
       'bbbID',
-      isListenOnly ? `LISTENONLY-${encodedName}` : encodedName,
+      isListenOnly ? `LISTENONLY-${name}` : name,
     ].join('-').replace(/"/g, "'");
 
     this.user.callerIdName = callerIdName;
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
index c97c2db99a..ec0309527b 100644
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
 import VoiceUsers from '/imports/api/voice-users';
-import Users from '/imports/api/users'
 import Auth from '/imports/ui/services/auth';
 import { debounce } from 'lodash';
 import TalkingIndicator from './component';
@@ -38,16 +37,12 @@ export default withTracker(() => {
         callerName, talking, color, voiceUserId, muted, intId,
       } = usersTalking[i];
 
-      const user = Users.findOne({ userId: voiceUserId }, { fields: { name: 1 } });
-
-      const _name = user ? user.name : 'USER';
-
       talkers[`${intId}`] = {
         color,
         talking,
         voiceUserId,
         muted,
-        callerName: _name,
+        callerName,
       };
     }
   }

From 2b89dd7db2f0af00f539279b91de86133be7e915 Mon Sep 17 00:00:00 2001
From: Mario Jr <mariogasparoni@gmail.com>
Date: Thu, 19 Nov 2020 14:33:01 -0300
Subject: [PATCH 2/2] Do not trigger reconnect when ICE connection terminates
 before hanging up process is finished

This could leave users to have your audio reconnected in the main room, while joining a breakout room
Some information can be found in #10528
---
 bigbluebutton-html5/imports/api/audio/client/bridge/sip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index c03c7489ac..b9a73a55f1 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -743,7 +743,7 @@ class SIPSession {
               callerIdName: this.user.callerIdName,
             },
           }, 'ICE connection closed');
-        }
+        } else return;
 
         this.callback({
           status: this.baseCallStates.failed,