Merge pull request #3865 from matrix-org/dbkr/new_session_toast_featu…

…re_flag Move feature flag check for new session toast
matrix-org · Jan 17, 2020 · 5584068 · 5584068
2 parents 158bf3d + c7ddba7
commit 5584068
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/DeviceListener.js b/src/DeviceListener.js
@@ -56,17 +56,16 @@ export default class DeviceListener {
 
     _onDevicesUpdated = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         this.recheck();
     }
 
     _onDeviceVerificationChanged = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         this.recheck();
     }
 
     async recheck() {
+        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         const cli = MatrixClientPeg.get();
 
         if (!cli.isCryptoEnabled()) return false;