PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3865 from matrix-org/dbkr/new_session_toast_feature_flag

Browse source 
Move feature flag check for new session toast
This commit is contained in:
David Baker 2020-01-17 20:38:44 +00:00 committed by GitHub
commit 5584068c5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/DeviceListener.js
View file

@ -56,17 +56,16 @@ export default class DeviceListener {
_onDevicesUpdated = (users) => { _onDevicesUpdated = (users) => {
if (!users.includes(MatrixClientPeg.get().getUserId())) return; if (!users.includes(MatrixClientPeg.get().getUserId())) return;
if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
this.recheck(); this.recheck();
} }
_onDeviceVerificationChanged = (users) => { _onDeviceVerificationChanged = (users) => {
if (!users.includes(MatrixClientPeg.get().getUserId())) return; if (!users.includes(MatrixClientPeg.get().getUserId())) return;
if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
this.recheck(); this.recheck();
} }
async recheck() { async recheck() {
if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
if (!cli.isCryptoEnabled()) return false; if (!cli.isCryptoEnabled()) return false;