From ac4ab11985f9065b1f602577d03714fb47daee30 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 7 Feb 2019 18:24:07 +0000 Subject: [PATCH] remove ll feature flag, it's time! --- src/MatrixClientPeg.js | 9 +----- .../views/settings/tabs/LabsSettingsTab.js | 7 ----- src/settings/Settings.js | 7 ----- .../controllers/LazyLoadingController.js | 29 ------------------- 4 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 src/settings/controllers/LazyLoadingController.js diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index 882a913452..f283eb84a5 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -135,14 +135,7 @@ class MatrixClientPeg { const opts = utils.deepCopy(this.opts); // the react sdk doesn't work without this, so don't allow opts.pendingEventOrdering = "detached"; - - const LAZY_LOADING_FEATURE = "feature_lazyloading"; - if (SettingsStore.isFeatureEnabled(LAZY_LOADING_FEATURE)) { - const userId = this.matrixClient.credentials.userId; - if (phasedRollOutExpiredForUser(userId, LAZY_LOADING_FEATURE, Date.now())) { - opts.lazyLoadMembers = true; - } - } + opts.lazyLoadMembers = true; // Connect the matrix client to the dispatcher MatrixActionCreators.start(this.matrixClient); diff --git a/src/components/views/settings/tabs/LabsSettingsTab.js b/src/components/views/settings/tabs/LabsSettingsTab.js index fc64c1bd04..66cce30a3a 100644 --- a/src/components/views/settings/tabs/LabsSettingsTab.js +++ b/src/components/views/settings/tabs/LabsSettingsTab.js @@ -53,13 +53,6 @@ export class LabsSettingToggle extends React.Component { } _onChange = async (checked) => { - if (this.props.featureId === "feature_lazyloading") { - const confirmed = await this._onLazyLoadChanging(checked); - if (!confirmed) { - return; - } - } - await SettingsStore.setFeatureEnabled(this.props.featureId, checked); this.forceUpdate(); }; diff --git a/src/settings/Settings.js b/src/settings/Settings.js index c5de7298de..bcc79f62a4 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -100,13 +100,6 @@ export const SETTINGS = { default: false, controller: new CustomStatusController(), }, - "feature_lazyloading": { - isFeature: true, - displayName: _td("Increase performance by only loading room members on first view"), - supportedLevels: LEVELS_FEATURE, - controller: new LazyLoadingController(), - default: true, - }, "feature_keybackup": { isFeature: true, displayName: _td("Backup of encryption keys to server"), diff --git a/src/settings/controllers/LazyLoadingController.js b/src/settings/controllers/LazyLoadingController.js deleted file mode 100644 index 90f095c9ca..0000000000 --- a/src/settings/controllers/LazyLoadingController.js +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2018 New Vector - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import SettingController from "./SettingController"; -import MatrixClientPeg from "../../MatrixClientPeg"; -import PlatformPeg from "../../PlatformPeg"; - -export default class LazyLoadingController extends SettingController { - async onChange(level, roomId, newValue) { - if (!PlatformPeg.get()) return; - - MatrixClientPeg.get().stopClient(); - await MatrixClientPeg.get().store.deleteAllData(); - PlatformPeg.get().reload(); - } -}