Remove browser info for users.

master
Håvar Aambø Fosstveit 2019-11-07 10:01:26 +01:00
parent 5cdf0baac4
commit 69677e4972
8 changed files with 4 additions and 56 deletions

View File

@ -2024,7 +2024,6 @@ export default class RoomClient
{ {
displayName : displayName, displayName : displayName,
picture : picture, picture : picture,
device : this._device,
rtpCapabilities : this._mediasoupDevice.rtpCapabilities rtpCapabilities : this._mediasoupDevice.rtpCapabilities
}); });

View File

@ -1,7 +1,7 @@
export const setMe = ({ peerId, device, loginEnabled }) => export const setMe = ({ peerId, loginEnabled }) =>
({ ({
type : 'SET_ME', type : 'SET_ME',
payload : { peerId, device, loginEnabled } payload : { peerId, loginEnabled }
}); });
export const loggedIn = (flag) => export const loggedIn = (flag) =>

View File

@ -2,7 +2,6 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import * as appPropTypes from '../appPropTypes';
import EditableInput from '../Controls/EditableInput'; import EditableInput from '../Controls/EditableInput';
const styles = (theme) => const styles = (theme) =>
@ -105,16 +104,6 @@ const styles = (theme) =>
{ {
backgroundColor : 'rgb(174, 255, 0, 0.25)' backgroundColor : 'rgb(174, 255, 0, 0.25)'
} }
},
deviceInfo :
{
'& span' :
{
userSelect : 'none',
pointerEvents : 'none',
fontSize : 11,
color : 'rgba(255, 255, 255, 0.55)'
}
} }
}); });
@ -143,7 +132,6 @@ class VideoView extends React.PureComponent
const { const {
isMe, isMe,
isScreen, isScreen,
peer,
displayName, displayName,
showPeerInfo, showPeerInfo,
videoContain, videoContain,
@ -204,14 +192,6 @@ class VideoView extends React.PureComponent
{displayName} {displayName}
</span> </span>
} }
{ advancedMode &&
<div className={classes.deviceInfo}>
<span>
{peer.device.name} {Math.floor(peer.device.version) || null}
</span>
</div>
}
</div> </div>
</div> </div>
} }
@ -315,8 +295,6 @@ VideoView.propTypes =
{ {
isMe : PropTypes.bool, isMe : PropTypes.bool,
isScreen : PropTypes.bool, isScreen : PropTypes.bool,
peer : PropTypes.oneOfType(
[ appPropTypes.Me, appPropTypes.Peer ]),
displayName : PropTypes.string, displayName : PropTypes.string,
showPeerInfo : PropTypes.bool, showPeerInfo : PropTypes.bool,
videoContain : PropTypes.bool, videoContain : PropTypes.bool,

View File

@ -8,17 +8,9 @@ export const Room = PropTypes.shape(
activeSpeakerId : PropTypes.string activeSpeakerId : PropTypes.string
}); });
export const Device = PropTypes.shape(
{
flag : PropTypes.string.isRequired,
name : PropTypes.string.isRequired,
version : PropTypes.string
});
export const Me = PropTypes.shape( export const Me = PropTypes.shape(
{ {
id : PropTypes.string.isRequired, id : PropTypes.string.isRequired,
device : Device.isRequired,
canSendMic : PropTypes.bool.isRequired, canSendMic : PropTypes.bool.isRequired,
canSendWebcam : PropTypes.bool.isRequired, canSendWebcam : PropTypes.bool.isRequired,
webcamInProgress : PropTypes.bool.isRequired webcamInProgress : PropTypes.bool.isRequired
@ -39,7 +31,6 @@ export const Peer = PropTypes.shape(
{ {
id : PropTypes.string.isRequired, id : PropTypes.string.isRequired,
displayName : PropTypes.string, displayName : PropTypes.string,
device : Device.isRequired,
consumers : PropTypes.arrayOf(PropTypes.string).isRequired consumers : PropTypes.arrayOf(PropTypes.string).isRequired
}); });

View File

@ -98,7 +98,6 @@ function run()
store.dispatch( store.dispatch(
meActions.setMe({ meActions.setMe({
peerId, peerId,
device,
loginEnabled : window.config.loginEnabled loginEnabled : window.config.loginEnabled
}) })
); );

View File

@ -1,7 +1,6 @@
const initialState = const initialState =
{ {
id : null, id : null,
device : null,
picture : null, picture : null,
canSendMic : false, canSendMic : false,
canSendWebcam : false, canSendWebcam : false,
@ -27,14 +26,12 @@ const me = (state = initialState, action) =>
{ {
const { const {
peerId, peerId,
device,
loginEnabled loginEnabled
} = action.payload; } = action.payload;
return { return {
...state, ...state,
id : peerId, id : peerId,
device,
loginEnabled loginEnabled
}; };
} }

View File

@ -30,8 +30,6 @@ class Peer extends EventEmitter
this._email = null; this._email = null;
this._device = null;
this._rtpCapabilities = null; this._rtpCapabilities = null;
this._raisedHand = false; this._raisedHand = false;
@ -229,16 +227,6 @@ class Peer extends EventEmitter
this._email = email; this._email = email;
} }
get device()
{
return this._device;
}
set device(device)
{
this._device = device;
}
get rtpCapabilities() get rtpCapabilities()
{ {
return this._rtpCapabilities; return this._rtpCapabilities;
@ -331,8 +319,7 @@ class Peer extends EventEmitter
{ {
id : this.id, id : this.id,
displayName : this.displayName, displayName : this.displayName,
picture : this.picture, picture : this.picture
device : this.device
}; };
return peerInfo; return peerInfo;

View File

@ -412,14 +412,12 @@ class Room extends EventEmitter
const { const {
displayName, displayName,
picture, picture,
device,
rtpCapabilities rtpCapabilities
} = request.data; } = request.data;
// Store client data into the Peer data object. // Store client data into the Peer data object.
peer.displayName = displayName; peer.displayName = displayName;
peer.picture = picture; peer.picture = picture;
peer.device = device;
peer.rtpCapabilities = rtpCapabilities; peer.rtpCapabilities = rtpCapabilities;
// Tell the new Peer about already joined Peers. // Tell the new Peer about already joined Peers.
@ -456,8 +454,7 @@ class Room extends EventEmitter
{ {
id : peer.id, id : peer.id,
displayName : displayName, displayName : displayName,
picture : picture, picture : picture
device : device
}, },
true true
); );