|
@@ -13,7 +13,11 @@ import {
|
13
|
13
|
getLocalParticipant
|
14
|
14
|
} from '../../../../base/participants';
|
15
|
15
|
|
16
|
|
-import { _getDefaultPhoneNumber, getDialInfoPageURL } from '../../../functions';
|
|
16
|
+import {
|
|
17
|
+ _decodeRoomURI,
|
|
18
|
+ _getDefaultPhoneNumber,
|
|
19
|
+ getDialInfoPageURL
|
|
20
|
+} from '../../../functions';
|
17
|
21
|
import DialInNumber from './DialInNumber';
|
18
|
22
|
import PasswordForm from './PasswordForm';
|
19
|
23
|
|
|
@@ -237,7 +241,7 @@ class InfoDialog extends Component<Props, State> {
|
237
|
241
|
className = 'info-dialog-url-text'
|
238
|
242
|
href = { this.props._inviteURL }
|
239
|
243
|
onClick = { this._onClickURLText } >
|
240
|
|
- { this._getURLToDisplay() }
|
|
244
|
+ { decodeURI(this._getURLToDisplay()) }
|
241
|
245
|
</a>
|
242
|
246
|
</span>
|
243
|
247
|
</div>
|
|
@@ -288,18 +292,6 @@ class InfoDialog extends Component<Props, State> {
|
288
|
292
|
);
|
289
|
293
|
}
|
290
|
294
|
|
291
|
|
- /**
|
292
|
|
- * Generates the URL for the static dial in info page.
|
293
|
|
- *
|
294
|
|
- * @private
|
295
|
|
- * @returns {string}
|
296
|
|
- */
|
297
|
|
- _getDialInfoPageURL() {
|
298
|
|
- return getDialInfoPageURL(
|
299
|
|
- encodeURIComponent(this.props._conferenceName),
|
300
|
|
- this.props._locationURL);
|
301
|
|
- }
|
302
|
|
-
|
303
|
295
|
/**
|
304
|
296
|
* Creates a message describing how to dial in to the conference.
|
305
|
297
|
*
|
|
@@ -309,13 +301,14 @@ class InfoDialog extends Component<Props, State> {
|
309
|
301
|
_getTextToCopy() {
|
310
|
302
|
const { _localParticipant, liveStreamViewURL, t } = this.props;
|
311
|
303
|
const shouldDisplayDialIn = this._shouldDisplayDialIn();
|
|
304
|
+ const _inviteURL = _decodeRoomURI(this.props._inviteURL);
|
312
|
305
|
|
313
|
306
|
let invite = _localParticipant && _localParticipant.name
|
314
|
307
|
? t('info.inviteURLFirstPartPersonal', { name: _localParticipant.name })
|
315
|
308
|
: t('info.inviteURLFirstPartGeneral');
|
316
|
309
|
|
317
|
310
|
invite += t('info.inviteURLSecondPart', {
|
318
|
|
- url: this.props._inviteURL
|
|
311
|
+ url: _inviteURL
|
319
|
312
|
});
|
320
|
313
|
|
321
|
314
|
if (liveStreamViewURL) {
|
|
@@ -332,8 +325,11 @@ class InfoDialog extends Component<Props, State> {
|
332
|
325
|
conferenceID: this.props.dialIn.conferenceID
|
333
|
326
|
});
|
334
|
327
|
const moreNumbers = t('info.invitePhoneAlternatives', {
|
335
|
|
- url: this._getDialInfoPageURL(),
|
336
|
|
- silentUrl: `${this.props._inviteURL}#config.startSilent=true`
|
|
328
|
+ url: getDialInfoPageURL(
|
|
329
|
+ this.props._conferenceName,
|
|
330
|
+ this.props._locationURL
|
|
331
|
+ ),
|
|
332
|
+ silentUrl: `${_inviteURL}#config.startSilent=true`
|
337
|
333
|
});
|
338
|
334
|
|
339
|
335
|
invite = `${invite}\n${dial}\n${moreNumbers}`;
|
|
@@ -457,7 +453,12 @@ class InfoDialog extends Component<Props, State> {
|
457
|
453
|
phoneNumber = { this.state.phoneNumber } />
|
458
|
454
|
<a
|
459
|
455
|
className = 'more-numbers'
|
460
|
|
- href = { this._getDialInfoPageURL() }
|
|
456
|
+ href = {
|
|
457
|
+ getDialInfoPageURL(
|
|
458
|
+ this.props._conferenceName,
|
|
459
|
+ this.props._locationURL
|
|
460
|
+ )
|
|
461
|
+ }
|
461
|
462
|
rel = 'noopener noreferrer'
|
462
|
463
|
target = '_blank'>
|
463
|
464
|
{ this.props.t('info.moreNumbers') }
|