don't show e2e icon in unencrypted rooms upon loading the room
This commit is contained in:
parent
ce5e56aaac
commit
e55dbfc6fe
1 changed files with 3 additions and 3 deletions
|
@ -738,9 +738,6 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
onDeviceVerificationChanged: function(userId, device) {
|
onDeviceVerificationChanged: function(userId, device) {
|
||||||
const room = this.state.room;
|
const room = this.state.room;
|
||||||
if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!room.currentState.getMember(userId)) {
|
if (!room.currentState.getMember(userId)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -748,6 +745,9 @@ module.exports = React.createClass({
|
||||||
},
|
},
|
||||||
|
|
||||||
_updateE2EStatus: function(room) {
|
_updateE2EStatus: function(room) {
|
||||||
|
if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
|
room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
|
||||||
this.setState({e2eStatus: hasUnverifiedDevices ? "warning" : "verified"});
|
this.setState({e2eStatus: hasUnverifiedDevices ? "warning" : "verified"});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue