Merge branch 'develop' into t3chguy/remove_bluebird

src/settings/Settings.js

@@ -23,7 +23,7 @@ import {
 } from "./controllers/NotificationControllers";
 import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
-import LowBandwidthController from "./controllers/LowBandwidthController";
+import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -120,12 +120,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_user_info_panel": {
-        isFeature: true,
-        displayName: _td("Use the new, consistent UserInfo panel for Room Members and Group Members"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_mjolnir": {
         isFeature: true,
         displayName: _td("Try out new ways to ignore people (experimental)"),
@@ -142,10 +136,24 @@ export const SETTINGS = {
     },
     "feature_dm_verification": {
         isFeature: true,
-        displayName: _td("Send verification requests in direct message"),
+        displayName: _td("Send verification requests in direct message," +
+            " including a new verification UX in the member panel."),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_cross_signing": {
+        isFeature: true,
+        displayName: _td("Enable cross-signing to verify per-user instead of per-device"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+        controller: new ReloadOnChangeController(),
+    },
+    "feature_event_indexing": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
+        default: false,
+    },
     "useCiderComposer": {
         displayName: _td("Use the new, faster, composer for writing messages"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -427,7 +435,7 @@ export const SETTINGS = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         displayName: _td('Low bandwidth mode'),
         default: false,
-        controller: new LowBandwidthController(),
+        controller: new ReloadOnChangeController(),
     },
     "fallbackICEServerAllowed": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,

src/settings/controllers/ReloadOnChangeController.js

@@ -17,7 +17,7 @@ limitations under the License.
 import SettingController from "./SettingController";
 import PlatformPeg from "../../PlatformPeg";
 
-export default class LowBandwidthController extends SettingController {
+export default class ReloadOnChangeController extends SettingController {
     onChange(level, roomId, newValue) {
         PlatformPeg.get().reload();
     }

src/settings/handlers/AccountSettingsHandler.js

@@ -126,6 +126,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             if (!content || !content['recent_rooms']) {
                 content = this._getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
             }
+            if (!content) content = {}; // If we still don't have content, make some
 
             content['recent_rooms'] = newValue;
             return MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content);