Merge pull request #10873 from mariogasparoni/v2.2.x-release

Do not trigger reconnect when ICE connection terminates before hanging up process is finished

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;
@@ -746,7 +743,7 @@ class SIPSession {
               callerIdName: this.user.callerIdName,
             },
           }, 'ICE connection closed');
-        }
+        } else return;
 
         this.callback({
           status: this.baseCallStates.failed,

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,
       };
     }
   }