Experimental SSS

src/MatrixClientPeg.ts

@@ -42,6 +42,7 @@ import PlatformPeg from "./PlatformPeg";
 import { formatList } from "./utils/FormattingUtils";
 import SdkConfig from "./SdkConfig";
 import { Features } from "./settings/Settings";
+import SlidingSyncController from "./settings/controllers/SlidingSyncController";
 
 export interface IMatrixClientCreds {
     homeserverUrl: string;
@@ -298,10 +299,16 @@ class MatrixClientPegClass implements IMatrixClientPeg {
         opts.clientWellKnownPollPeriod = 2 * 60 * 60; // 2 hours
         opts.threadSupport = true;
 
+        /* TODO: Uncomment before PR lands
         if (SettingsStore.getValue("feature_sliding_sync")) {
             opts.slidingSync = await SlidingSyncManager.instance.setup(this.matrixClient);
         } else {
             SlidingSyncManager.instance.checkSupport(this.matrixClient);
+        } */
+        // TODO: remove before PR lands. Defaults to SSS if the server entered supports it.
+        await SlidingSyncManager.instance.checkSupport(this.matrixClient);
+        if (SlidingSyncController.serverSupportsSlidingSync) {
+            opts.slidingSync = await SlidingSyncManager.instance.setup(this.matrixClient);
         }
 
         // Connect the matrix client to the dispatcher and setting handlers

src/components/structures/TimelinePanel.tsx

@@ -711,7 +711,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
         ) {
             return;
         }
-
         if (!Thread.hasServerSideSupport && this.context.timelineRenderingType === TimelineRenderingType.Thread) {
             if (toStartOfTimeline && !this.state.canBackPaginate) {
                 this.setState({
@@ -1542,7 +1541,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
         const onLoaded = (): void => {
             if (this.unmounted) return;
-
             // clear the timeline min-height when (re)loading the timeline
             this.messagePanel.current?.onTimelineReset();
             this.reloadEvents();
@@ -1644,7 +1642,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
             onLoaded();
             return;
         }
-
         const prom = this.timelineWindow.load(eventId, INITIAL_SIZE).then(async (): Promise<void> => {
             if (this.overlayTimelineWindow) {
                 // TODO: use timestampToEvent to load the overlay timeline

src/components/views/rooms/RoomSublist.tsx

@@ -329,12 +329,6 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     };
 
     private onShowAllClick = async (): Promise<void> => {
-        if (this.slidingSyncMode) {
-            const count = RoomListStore.instance.getCount(this.props.tagId);
-            await SlidingSyncManager.instance.ensureListRegistered(this.props.tagId, {
-                ranges: [[0, count]],
-            });
-        }
         // read number of visible tiles before we mutate it
         const numVisibleTiles = this.numVisibleTiles;
         const newHeight = this.layout.tilesToPixelsWithPadding(this.numTiles, this.padding);

src/i18n/strings/en_EN.json

@@ -1473,7 +1473,7 @@
         "render_reaction_images_description": "Sometimes referred to as \"custom emojis\".",
         "report_to_moderators": "Report to moderators",
         "report_to_moderators_description": "In rooms that support moderation, the “Report” button will let you report abuse to room moderators.",
-        "sliding_sync": "Sliding Sync mode",
+        "sliding_sync": "Simplified Sliding Sync mode",
         "sliding_sync_description": "Under active development, cannot be disabled.",
         "sliding_sync_disabled_notice": "Log out and back in to disable",
         "sliding_sync_server_no_support": "Your server lacks support",

src/settings/Settings.tsx

@@ -8,7 +8,7 @@
 */
 
 import React, { ReactNode } from "react";
 import { UNSTABLE_MSC4133_EXTENDED_PROFILES } from "matrix-js-sdk/src/matrix";
 
 import { _t, _td, TranslationKey } from "../languageHandler";
 import {
@@ -389,11 +389,6 @@
         default: false,
         controller: new SlidingSyncController(),
     },
-    "feature_sliding_sync_proxy_url": {
-        // This is not a distinct feature, it is a legacy setting for feature_sliding_sync above
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        default: "",
-    },
     "feature_element_call_video_rooms": {
         isFeature: true,
         labsGroup: LabGroup.VoiceAndVideo,

src/stores/room-list/RoomListStore.ts

@@ -27,7 +27,6 @@ import { VisibilityProvider } from "./filters/VisibilityProvider";
 import { SpaceWatcher } from "./SpaceWatcher";
 import { IRoomTimelineActionPayload } from "../../actions/MatrixActionCreators";
 import { RoomListStore as Interface, RoomListStoreEvent } from "./Interface";
-import { SlidingRoomListStoreClass } from "./SlidingRoomListStore";
 import { UPDATE_EVENT } from "../AsyncStore";
 import { SdkContextClass } from "../../contexts/SDKContext";
 import { getChangedOverrideRoomMutePushRules } from "./utils/roomMute";
@@ -640,16 +639,9 @@ export default class RoomListStore {
 
     public static get instance(): Interface {
         if (!RoomListStore.internalInstance) {
-            if (SettingsStore.getValue("feature_sliding_sync")) {
-                logger.info("using SlidingRoomListStoreClass");
-                const instance = new SlidingRoomListStoreClass(defaultDispatcher, SdkContextClass.instance);
-                instance.start();
-                RoomListStore.internalInstance = instance;
-            } else {
-                const instance = new RoomListStoreClass(defaultDispatcher);
-                instance.start();
-                RoomListStore.internalInstance = instance;
-            }
+            const instance = new RoomListStoreClass(defaultDispatcher);
+            instance.start();
+            RoomListStore.internalInstance = instance;
         }
 
         return this.internalInstance;