Filters, Mark Unread/Read/Favourites FF removals + code and tests clean up (#2541)

.periphery.yml

@@ -4,11 +4,12 @@ schemes:
 - IntegrationTests
 - UITests
 - UnitTests
+- PreviewTests
 targets:
 - ElementX
 - IntegrationTests
 - NSE
-# - NCE
+- PreviewTests
 - UITests
 - UnitTests
 report_exclude:

ElementX/Sources/Application/AppSettings.swift

@@ -275,21 +275,6 @@ final class AppSettings {
     
     // MARK: - Feature Flags
     
-    @UserPreference(key: UserDefaultsKeys.userSuggestionsEnabled, defaultValue: false, storageType: .volatile)
-    var userSuggestionsEnabled
-    
-    @UserPreference(key: UserDefaultsKeys.mentionsBadgeEnabled, defaultValue: true, storageType: .userDefaults(store))
-    var mentionsBadgeEnabled
-    
-    @UserPreference(key: UserDefaultsKeys.roomListFiltersEnabled, defaultValue: false, storageType: .userDefaults(store))
-    var roomListFiltersEnabled
-    
-    @UserPreference(key: UserDefaultsKeys.markAsUnreadEnabled, defaultValue: false, storageType: .userDefaults(store))
-    var markAsUnreadEnabled
-    
-    @UserPreference(key: UserDefaultsKeys.markAsFavouriteEnabled, defaultValue: false, storageType: .userDefaults(store))
-    var markAsFavouriteEnabled
-    
     @UserPreference(key: UserDefaultsKeys.roomModerationEnabled, defaultValue: false, storageType: .userDefaults(store))
     var roomModerationEnabled
     

ElementX/Sources/Mocks/Generated/GeneratedMocks.swift

@@ -3787,23 +3787,6 @@ class UserDiscoveryServiceMock: UserDiscoveryServiceProtocol {
             return searchProfilesWithReturnValue
         }
     }
-    //MARK: - fetchSuggestions
-
-    var fetchSuggestionsCallsCount = 0
-    var fetchSuggestionsCalled: Bool {
-        return fetchSuggestionsCallsCount > 0
-    }
-    var fetchSuggestionsReturnValue: Result<[UserProfileProxy], UserDiscoveryErrorType>!
-    var fetchSuggestionsClosure: (() async -> Result<[UserProfileProxy], UserDiscoveryErrorType>)?
-
-    func fetchSuggestions() async -> Result<[UserProfileProxy], UserDiscoveryErrorType> {
-        fetchSuggestionsCallsCount += 1
-        if let fetchSuggestionsClosure = fetchSuggestionsClosure {
-            return await fetchSuggestionsClosure()
-        } else {
-            return fetchSuggestionsReturnValue
-        }
-    }
 }
 class UserIndicatorControllerMock: UserIndicatorControllerProtocol {
     var window: UIWindow?

ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenCoordinator.swift

@@ -22,18 +22,9 @@ struct BlockedUsersScreenCoordinatorParameters {
     let userIndicatorController: UserIndicatorControllerProtocol
 }
 
-enum BlockedUsersScreenCoordinatorAction { }
-
 final class BlockedUsersScreenCoordinator: CoordinatorProtocol {
     private let viewModel: BlockedUsersScreenViewModelProtocol
     
-    private var cancellables = Set<AnyCancellable>()
- 
-    private let actionsSubject: PassthroughSubject<BlockedUsersScreenCoordinatorAction, Never> = .init()
-    var actionsPublisher: AnyPublisher<BlockedUsersScreenCoordinatorAction, Never> {
-        actionsSubject.eraseToAnyPublisher()
-    }
-    
     init(parameters: BlockedUsersScreenCoordinatorParameters) {
         viewModel = BlockedUsersScreenViewModel(clientProxy: parameters.clientProxy,
                                                 userIndicatorController: parameters.userIndicatorController)

ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenModels.swift

@@ -16,8 +16,6 @@
 
 import Foundation
 
-enum BlockedUsersScreenViewModelAction { }
-
 struct BlockedUsersScreenViewState: BindableState {
     var blockedUsers: [String]
     var processingUserID: String?

ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModel.swift

@@ -22,11 +22,6 @@ typealias BlockedUsersScreenViewModelType = StateStoreViewModel<BlockedUsersScre
 class BlockedUsersScreenViewModel: BlockedUsersScreenViewModelType, BlockedUsersScreenViewModelProtocol {
     let clientProxy: ClientProxyProtocol
     let userIndicatorController: UserIndicatorControllerProtocol
-    
-    private let actionsSubject: PassthroughSubject<BlockedUsersScreenViewModelAction, Never> = .init()
-    var actionsPublisher: AnyPublisher<BlockedUsersScreenViewModelAction, Never> {
-        actionsSubject.eraseToAnyPublisher()
-    }
 
     init(clientProxy: ClientProxyProtocol,
          userIndicatorController: UserIndicatorControllerProtocol) {

ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModelProtocol.swift

@@ -18,7 +18,6 @@ import Combine
 
 @MainActor
 protocol BlockedUsersScreenViewModelProtocol {
-    var actionsPublisher: AnyPublisher<BlockedUsersScreenViewModelAction, Never> { get }
     var context: BlockedUsersScreenViewModelType.Context { get }
     
     func stop()

ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift

@@ -89,10 +89,6 @@ struct HomeScreenViewState: BindableState {
     var rooms: [HomeScreenRoom] = []
     var roomListMode: HomeScreenRoomListMode = .skeletons
     
-    var areFiltersEnabled = false
-    var markAsUnreadEnabled = false
-    var markAsFavouriteEnabled = false
-    
     var hasPendingInvitations = false
     var hasUnreadPendingInvitations = false
     
@@ -120,11 +116,7 @@ struct HomeScreenViewState: BindableState {
     }
     
     var shouldShowEmptyFilterState: Bool {
-        shouldShowFilters && bindings.filtersState.isFiltering && visibleRooms.isEmpty
+        !bindings.isSearchFieldFocused && bindings.filtersState.isFiltering && visibleRooms.isEmpty
-    }
-    
-    var shouldShowFilters: Bool {
-        areFiltersEnabled && !bindings.isSearchFieldFocused
     }
 }
 

ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift

@@ -100,28 +100,6 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
             .weakAssign(to: \.state.selectedRoomID, on: self)
             .store(in: &cancellables)
         
-        appSettings.$roomListFiltersEnabled
-            .sink { [weak self] value in
-                guard let self else {
-                    return
-                }
-                if !value {
-                    state.areFiltersEnabled = false
-                    state.bindings.filtersState.clearFilters()
-                } else {
-                    state.areFiltersEnabled = true
-                }
-            }
-            .store(in: &cancellables)
-        
-        appSettings.$markAsUnreadEnabled
-            .weakAssign(to: \.state.markAsUnreadEnabled, on: self)
-            .store(in: &cancellables)
-        
-        appSettings.$markAsFavouriteEnabled
-            .weakAssign(to: \.state.markAsFavouriteEnabled, on: self)
-            .store(in: &cancellables)
-        
         appSettings.$hideUnreadMessagesBadge
             .sink { [weak self] _ in self?.updateRooms() }
             .store(in: &cancellables)
@@ -235,7 +213,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
             if state.bindings.isSearchFieldFocused {
                 roomSummaryProvider?.setFilter(.search(query: state.bindings.searchQuery))
             } else {
-                roomSummaryProvider?.setFilter(.all(filters: state.areFiltersEnabled ? state.bindings.filtersState.activeFilters.set : []))
+                roomSummaryProvider?.setFilter(.all(filters: state.bindings.filtersState.activeFilters.set))
             }
         }
     }

ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift

@@ -89,10 +89,6 @@ struct RoomListFiltersState {
         return availableFilters.elements
     }
     
-    var orderedFilters: [RoomListFilter] {
-        activeFilters.elements + availableFilters
-    }
-    
     var isFiltering: Bool {
         !activeFilters.isEmpty
     }

ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift

@@ -53,36 +53,24 @@ struct HomeScreenContent: View {
                             .layoutPriority(1)
                     }
                 case .rooms:
-                    if context.viewState.areFiltersEnabled {
+                    // Showing empty views in pinned headers makes the room list spasm when reaching the top
-                        // Showing empty views in pinned headers makes the room list spasm when reaching the top
+                    LazyVStack(spacing: 0, pinnedViews: [.sectionHeaders]) {
-                        LazyVStack(spacing: 0, pinnedViews: [.sectionHeaders]) {
+                        Section {
-                            Section {
+                            if context.viewState.shouldShowEmptyFilterState {
-                                if context.viewState.shouldShowEmptyFilterState {
+                                RoomListFiltersEmptyStateView(state: context.filtersState)
-                                    RoomListFiltersEmptyStateView(state: context.filtersState)
+                                    .frame(height: geometry.size.height - topSectionFrame.height)
-                                        .frame(height: geometry.size.height - topSectionFrame.height)
+                            } else {
-                                } else {
+                                HomeScreenRoomList(context: context)
-                                    HomeScreenRoomList(context: context)
-                                }
-                            } header: {
-                                topSection
-                                    .readFrame($topSectionFrame)
                             }
+                        } header: {
+                            topSection
+                                .readFrame($topSectionFrame)
                         }
-                        .isSearching($context.isSearchFieldFocused)
-                        .searchable(text: $context.searchQuery)
-                        .compoundSearchField()
-                        .disableAutocorrection(true)
-                    } else {
-                        topSection
-
-                        LazyVStack(spacing: 0) {
-                            HomeScreenRoomList(context: context)
-                                .isSearching($context.isSearchFieldFocused)
-                        }
-                        .searchable(text: $context.searchQuery)
-                        .compoundSearchField()
-                        .disableAutocorrection(true)
                     }
+                    .isSearching($context.isSearchFieldFocused)
+                    .searchable(text: $context.searchQuery)
+                    .compoundSearchField()
+                    .disableAutocorrection(true)
                 case .migration:
                     EmptyView()
                 }
@@ -121,7 +109,7 @@ struct HomeScreenContent: View {
     /// The session verification banner and invites button if either are needed.
     private var topSection: some View {
         VStack(spacing: 0) {
-            if context.viewState.shouldShowFilters {
+            if !context.isSearchFieldFocused {
                 filters
             }
             

ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift

@@ -39,35 +39,31 @@ struct HomeScreenRoomList: View {
                 
                 HomeScreenRoomCell(room: room, context: context, isSelected: isSelected)
                     .contextMenu {
-                        if context.viewState.markAsUnreadEnabled {
+                        if room.badges.isDotShown {
-                            if room.badges.isDotShown {
+                            Button {
-                                Button {
+                                context.send(viewAction: .markRoomAsRead(roomIdentifier: room.id))
-                                    context.send(viewAction: .markRoomAsRead(roomIdentifier: room.id))
+                            } label: {
-                                } label: {
+                                Text(L10n.screenRoomlistMarkAsRead)
-                                    Text(L10n.screenRoomlistMarkAsRead)
+                            }
-                                }
+                        } else {
-                            } else {
+                            Button {
-                                Button {
+                                context.send(viewAction: .markRoomAsUnread(roomIdentifier: room.id))
-                                    context.send(viewAction: .markRoomAsUnread(roomIdentifier: room.id))
+                            } label: {
-                                } label: {
+                                Text(L10n.screenRoomlistMarkAsUnread)
-                                    Text(L10n.screenRoomlistMarkAsUnread)
-                                }
                             }
                         }
                         
-                        if context.viewState.markAsFavouriteEnabled {
+                        if room.isFavourite {
-                            if room.isFavourite {
+                            Button {
-                                Button {
+                                context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: false))
-                                    context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: false))
+                            } label: {
-                                } label: {
+                                Label(L10n.commonFavourited, icon: \.favouriteSolid)
-                                    Label(L10n.commonFavourited, icon: \.favouriteSolid)
+                            }
-                                }
+                        } else {
-                            } else {
+                            Button {
-                                Button {
+                                context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: true))
-                                    context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: true))
+                            } label: {
-                                } label: {
+                                Label(L10n.commonFavourite, icon: \.favourite)
-                                    Label(L10n.commonFavourite, icon: \.favourite)
-                                }
                             }
                         }
                         

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenCoordinator.swift

@@ -46,7 +46,6 @@ final class InviteUsersScreenCoordinator: CoordinatorProtocol {
                                                roomType: parameters.roomType,
                                                mediaProvider: parameters.mediaProvider,
                                                userDiscoveryService: parameters.userDiscoveryService,
-                                               appSettings: ServiceLocator.shared.settings,
                                                userIndicatorController: parameters.userIndicatorController)
     }
     

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenViewModel.swift

@@ -23,7 +23,6 @@ typealias InviteUsersScreenViewModelType = StateStoreViewModel<InviteUsersScreen
 class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScreenViewModelProtocol {
     private let roomType: InviteUsersScreenRoomType
     private let userDiscoveryService: UserDiscoveryServiceProtocol
-    private let appSettings: AppSettings
     private let userIndicatorController: UserIndicatorControllerProtocol
     
     private let actionsSubject: PassthroughSubject<InviteUsersScreenViewModelAction, Never> = .init()
@@ -36,11 +35,9 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
          roomType: InviteUsersScreenRoomType,
          mediaProvider: MediaProviderProtocol,
          userDiscoveryService: UserDiscoveryServiceProtocol,
-         appSettings: AppSettings,
          userIndicatorController: UserIndicatorControllerProtocol) {
         self.roomType = roomType
         self.userDiscoveryService = userDiscoveryService
-        self.appSettings = appSettings
         self.userIndicatorController = userIndicatorController
         super.init(initialViewState: InviteUsersScreenViewState(selectedUsers: selectedUsers.value, isCreatingRoom: roomType.isCreatingRoom), imageProvider: mediaProvider)
                 
@@ -130,7 +127,7 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
     
     private func fetchUsers() {
         guard searchQuery.count >= 3 else {
-            fetchSuggestions()
+            state.usersSection = .init(type: .suggestions, users: [])
             return
         }
         
@@ -142,20 +139,6 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
         }
     }
     
-    private func fetchSuggestions() {
-        guard appSettings.userSuggestionsEnabled else {
-            state.usersSection = .init(type: .suggestions, users: [])
-            return
-        }
-        
-        state.isSearching = true
-        fetchUsersTask = Task {
-            let result = await userDiscoveryService.fetchSuggestions()
-            guard !Task.isCancelled else { return }
-            handleResult(for: .suggestions, result: result)
-        }
-    }
-    
     private func handleResult(for sectionType: UserDiscoverySectionType, result: Result<[UserProfileProxy], UserDiscoveryErrorType>) {
         state.isSearching = false
         

ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift

@@ -159,13 +159,11 @@ struct InviteUsersScreen: View {
 struct InviteUsersScreen_Previews: PreviewProvider, TestablePreview {
     static let viewModel = {
         let userDiscoveryService = UserDiscoveryServiceMock()
-        userDiscoveryService.fetchSuggestionsReturnValue = .success([.mockAlice])
         userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
         return InviteUsersScreenViewModel(selectedUsers: .init([]),
                                           roomType: .draft,
                                           mediaProvider: MockMediaProvider(),
                                           userDiscoveryService: userDiscoveryService,
-                                          appSettings: ServiceLocator.shared.settings,
                                           userIndicatorController: UserIndicatorControllerMock())
     }()
     

ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift

@@ -47,15 +47,8 @@ protocol DeveloperOptionsProtocol: AnyObject {
     var logLevel: TracingConfiguration.LogLevel { get set }
     var otlpTracingEnabled: Bool { get set }
     var shouldCollapseRoomStateEvents: Bool { get set }
-    var userSuggestionsEnabled: Bool { get set }
-    var mentionsBadgeEnabled: Bool { get set }
-    var roomListFiltersEnabled: Bool { get set }
     var hideUnreadMessagesBadge: Bool { get set }
-    
-    var markAsUnreadEnabled: Bool { get set }
-    var markAsFavouriteEnabled: Bool { get set }
     var roomModerationEnabled: Bool { get set }
-    
     var elementCallBaseURL: URL { get set }
 }
 

ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift

@@ -41,32 +41,7 @@ struct DeveloperOptionsScreen: View {
                 }
             }
             
-            Section("Room creation") {
-                Toggle(isOn: $context.userSuggestionsEnabled) {
-                    Text("User suggestions")
-                }
-            }
-            
-            Section("Mentions") {
-                Toggle(isOn: $context.mentionsBadgeEnabled) {
-                    Text("Mentions badge")
-                    Text("Requires app reboot")
-                }
-            }
-            
             Section("Room List") {
-                Toggle(isOn: $context.roomListFiltersEnabled) {
-                    Text("Show filters")
-                }
-                
-                Toggle(isOn: $context.markAsUnreadEnabled) {
-                    Text("Mark as unread")
-                }
-                
-                Toggle(isOn: $context.markAsFavouriteEnabled) {
-                    Text("Mark as favourite")
-                }
-                
                 Toggle(isOn: $context.hideUnreadMessagesBadge) {
                     Text("Hide grey dots")
                 }

ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift

@@ -54,7 +54,6 @@ final class StartChatScreenCoordinator: CoordinatorProtocol {
         self.parameters = parameters
         
         viewModel = StartChatScreenViewModel(userSession: parameters.userSession,
-                                             userSuggestionsEnabled: ServiceLocator.shared.settings.userSuggestionsEnabled,
                                              analytics: ServiceLocator.shared.analytics,
                                              userIndicatorController: parameters.userIndicatorController,
                                              userDiscoveryService: parameters.userDiscoveryService)

ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift

@@ -21,7 +21,6 @@ typealias StartChatScreenViewModelType = StateStoreViewModel<StartChatScreenView
 
 class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenViewModelProtocol {
     private let userSession: UserSessionProtocol
-    private let userSuggestionsEnabled: Bool
     private let analytics: AnalyticsService
     private let userIndicatorController: UserIndicatorControllerProtocol
     private let userDiscoveryService: UserDiscoveryServiceProtocol
@@ -33,12 +32,10 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
     }
     
     init(userSession: UserSessionProtocol,
-         userSuggestionsEnabled: Bool,
          analytics: AnalyticsService,
          userIndicatorController: UserIndicatorControllerProtocol,
          userDiscoveryService: UserDiscoveryServiceProtocol) {
         self.userSession = userSession
-        self.userSuggestionsEnabled = userSuggestionsEnabled
         self.analytics = analytics
         self.userIndicatorController = userIndicatorController
         self.userDiscoveryService = userDiscoveryService
@@ -105,7 +102,7 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
     
     private func fetchUsers() {
         guard searchQuery.count >= 3 else {
-            fetchSuggestions()
+            state.usersSection = .init(type: .suggestions, users: [])
             return
         }
         fetchUsersTask = Task {
@@ -115,18 +112,6 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
         }
     }
     
-    private func fetchSuggestions() {
-        guard userSuggestionsEnabled else {
-            state.usersSection = .init(type: .suggestions, users: [])
-            return
-        }
-        fetchUsersTask = Task {
-            let result = await userDiscoveryService.fetchSuggestions()
-            guard !Task.isCancelled else { return }
-            handleResult(for: .suggestions, result: result)
-        }
-    }
-    
     private func handleResult(for sectionType: UserDiscoverySectionType, result: Result<[UserProfileProxy], UserDiscoveryErrorType>) {
         switch result {
         case .success(let users):

ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift

@@ -133,10 +133,8 @@ struct StartChatScreen_Previews: PreviewProvider, TestablePreview {
                                           mediaProvider: MockMediaProvider(),
                                           voiceMessageMediaManager: VoiceMessageMediaManagerMock())
         let userDiscoveryService = UserDiscoveryServiceMock()
-        userDiscoveryService.fetchSuggestionsReturnValue = .success([.mockAlice])
         userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
         let viewModel = StartChatScreenViewModel(userSession: userSession,
-                                                 userSuggestionsEnabled: true,
                                                  analytics: ServiceLocator.shared.analytics,
                                                  userIndicatorController: UserIndicatorControllerMock(),
                                                  userDiscoveryService: userDiscoveryService)

ElementX/Sources/Services/Client/ClientProxy.swift

@@ -575,25 +575,19 @@ class ClientProxy: ClientProxyProtocol {
                                                       eventStringBuilder: eventStringBuilder,
                                                       name: "AllRooms",
                                                       shouldUpdateVisibleRange: true,
-                                                      notificationSettings: notificationSettings,
+                                                      notificationSettings: notificationSettings)
-                                                      backgroundTaskService: backgroundTaskService,
-                                                      appSettings: appSettings)
             try await roomSummaryProvider?.setRoomList(roomListService.allRooms())
             
             alternateRoomSummaryProvider = RoomSummaryProvider(roomListService: roomListService,
                                                                eventStringBuilder: eventStringBuilder,
                                                                name: "MessageForwarding",
-                                                               notificationSettings: notificationSettings,
+                                                               notificationSettings: notificationSettings)
-                                                               backgroundTaskService: backgroundTaskService,
-                                                               appSettings: appSettings)
             try await alternateRoomSummaryProvider?.setRoomList(roomListService.allRooms())
             
             inviteSummaryProvider = RoomSummaryProvider(roomListService: roomListService,
                                                         eventStringBuilder: eventStringBuilder,
                                                         name: "Invites",
-                                                        notificationSettings: notificationSettings,
+                                                        notificationSettings: notificationSettings)
-                                                        backgroundTaskService: backgroundTaskService,
-                                                        appSettings: appSettings)
             try await inviteSummaryProvider?.setRoomList(roomListService.invites())
             
             self.syncService = syncService

ElementX/Sources/Services/Room/RoomMember/RoomMemberProxy.swift

@@ -18,16 +18,9 @@ import Foundation
 import MatrixRustSDK
 
 final class RoomMemberProxy: RoomMemberProxyProtocol {
-    private let backgroundTaskService: BackgroundTaskServiceProtocol
     private let member: RoomMember
     
-    private let backgroundAccountDataTaskName = "SendAccountDataEvent"
+    init(member: RoomMember) {
-    private var sendAccountDataEventBackgroundTask: BackgroundTaskProtocol?
-    
-    private let userInitiatedDispatchQueue = DispatchQueue(label: "io.element.elementx.roommemberproxy.userinitiated", qos: .userInitiated)
-    
-    init(member: RoomMember, backgroundTaskService: BackgroundTaskServiceProtocol) {
-        self.backgroundTaskService = backgroundTaskService
         self.member = member
     }
     

ElementX/Sources/Services/Room/RoomMember/RoomMemberProxyProtocol.swift

@@ -17,11 +17,6 @@
 import Foundation
 import MatrixRustSDK
 
-enum RoomMemberProxyError: Error {
-    case ignoreUserFailed
-    case unignoreUserFailed
-}
-
 // sourcery: AutoMockable
 protocol RoomMemberProxyProtocol: AnyObject {
     var userID: String { get }

ElementX/Sources/Services/Room/RoomProxy.swift

@@ -195,9 +195,7 @@ class RoomProxy: RoomProxyProtocol {
         do {
             let membersNoSyncIterator = try await room.membersNoSync()
             if let members = membersNoSyncIterator.nextChunk(chunkSize: membersNoSyncIterator.len()) {
-                membersSubject.value = members.map {
+                membersSubject.value = members.map(RoomMemberProxy.init)
-                    RoomMemberProxy(member: $0, backgroundTaskService: self.backgroundTaskService)
-                }
             }
         } catch {
             MXLog.error("[RoomProxy] Failed to update members using no sync API: \(error)")
@@ -207,9 +205,7 @@ class RoomProxy: RoomProxyProtocol {
             // Then we update members using the sync API, this is slower but will get us the latest members
             let membersIterator = try await room.members()
             if let members = membersIterator.nextChunk(chunkSize: membersIterator.len()) {
-                membersSubject.value = members.map {
+                membersSubject.value = members.map(RoomMemberProxy.init)
-                    RoomMemberProxy(member: $0, backgroundTaskService: self.backgroundTaskService)
-                }
             }
         } catch {
             MXLog.error("[RoomProxy] Failed to update members using sync API: \(error)")
@@ -228,7 +224,7 @@ class RoomProxy: RoomProxyProtocol {
         
         do {
             let member = try await room.member(userId: userID)
-            return .success(RoomMemberProxy(member: member, backgroundTaskService: backgroundTaskService))
+            return .success(RoomMemberProxy(member: member))
         } catch {
             return .failure(.failedRetrievingMember)
         }

ElementX/Sources/Services/Room/RoomProxyProtocol.swift

@@ -21,7 +21,6 @@ import MatrixRustSDK
 enum RoomProxyError: Error, Equatable {
     case failedRedactingEvent
     case failedReportingContent
-    case failedIgnoringUser
     case failedRetrievingMember
     case failedLeavingRoom
     case failedAcceptingInvite

ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift

@@ -24,9 +24,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
     private let name: String
     private let shouldUpdateVisibleRange: Bool
     private let notificationSettings: NotificationSettingsProxyProtocol
-    private let backgroundTaskService: BackgroundTaskServiceProtocol
+
-    private let appSettings: AppSettings
-    
     private let roomListPageSize = 200
     
     private let serialDispatchQueue: DispatchQueue
@@ -67,17 +65,13 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
          eventStringBuilder: RoomEventStringBuilder,
          name: String,
          shouldUpdateVisibleRange: Bool = false,
-         notificationSettings: NotificationSettingsProxyProtocol,
+         notificationSettings: NotificationSettingsProxyProtocol) {
-         backgroundTaskService: BackgroundTaskServiceProtocol,
-         appSettings: AppSettings) {
         self.roomListService = roomListService
         serialDispatchQueue = DispatchQueue(label: "io.element.elementx.roomsummaryprovider", qos: .default)
         self.eventStringBuilder = eventStringBuilder
         self.name = name
         self.shouldUpdateVisibleRange = shouldUpdateVisibleRange
         self.notificationSettings = notificationSettings
-        self.backgroundTaskService = backgroundTaskService
-        self.appSettings = appSettings
         
         diffsPublisher
             .receive(on: serialDispatchQueue)
@@ -240,7 +234,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
         
         var inviterProxy: RoomMemberProxyProtocol?
         if let inviter = roomInfo.inviter {
-            inviterProxy = RoomMemberProxy(member: inviter, backgroundTaskService: backgroundTaskService)
+            inviterProxy = RoomMemberProxy(member: inviter)
         }
         
         let notificationMode = roomInfo.userDefinedNotificationMode.flatMap { RoomNotificationModeProxy.from(roomNotificationMode: $0) }
@@ -251,14 +245,14 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
                                          avatarURL: roomInfo.avatarUrl.flatMap(URL.init(string:)),
                                          lastMessage: attributedLastMessage,
                                          lastMessageFormattedTimestamp: lastMessageFormattedTimestamp,
-                                         unreadMessagesCount: appSettings.mentionsBadgeEnabled ? UInt(roomInfo.numUnreadMessages) : 0,
+                                         unreadMessagesCount: UInt(roomInfo.numUnreadMessages),
-                                         unreadMentionsCount: appSettings.mentionsBadgeEnabled ? UInt(roomInfo.numUnreadMentions) : 0,
+                                         unreadMentionsCount: UInt(roomInfo.numUnreadMentions),
-                                         unreadNotificationsCount: appSettings.mentionsBadgeEnabled ? UInt(roomInfo.numUnreadNotifications) : UInt(roomInfo.notificationCount),
+                                         unreadNotificationsCount: UInt(roomInfo.numUnreadNotifications),
                                          notificationMode: notificationMode,
                                          canonicalAlias: roomInfo.canonicalAlias,
                                          inviter: inviterProxy,
                                          hasOngoingCall: roomInfo.hasRoomCall,
-                                         isMarkedUnread: appSettings.markAsUnreadEnabled ? roomInfo.isMarkedUnread : false,
+                                         isMarkedUnread: roomInfo.isMarkedUnread,
                                          isFavourite: roomInfo.isFavourite)
         
         return invalidated ? .invalidated(details: details) : .filled(details: details)

ElementX/Sources/Services/Users/UserDiscoveryService.swift

@@ -23,10 +23,6 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
         self.clientProxy = clientProxy
     }
 
-    func fetchSuggestions() async -> Result<[UserProfileProxy], UserDiscoveryErrorType> {
-        .success(filterAccountOwner([.mockAlice, .mockBob, .mockCharlie]))
-    }
-
     func searchProfiles(with searchQuery: String) async -> Result<[UserProfileProxy], UserDiscoveryErrorType> {
         async let queriedProfile = profileIfPossible(with: searchQuery)
 

ElementX/Sources/Services/Users/UserDiscoveryServiceProtocol.swift

@@ -23,5 +23,4 @@ enum UserDiscoveryErrorType: Error {
 // sourcery: AutoMockable
 protocol UserDiscoveryServiceProtocol {
     func searchProfiles(with searchQuery: String) async -> Result<[UserProfileProxy], UserDiscoveryErrorType>
-    func fetchSuggestions() async -> Result<[UserProfileProxy], UserDiscoveryErrorType>
 }

ElementX/Sources/UITests/UITestsAppCoordinator.swift

@@ -743,10 +743,8 @@ class MockScreen: Identifiable {
             navigationStackCoordinator.setRootCoordinator(coordinator)
             return navigationStackCoordinator
         case .startChat:
-            ServiceLocator.shared.settings.userSuggestionsEnabled = true
             let navigationStackCoordinator = NavigationStackCoordinator()
             let userDiscoveryMock = UserDiscoveryServiceMock()
-            userDiscoveryMock.fetchSuggestionsReturnValue = .success([.mockAlice, .mockBob, .mockCharlie])
             userDiscoveryMock.searchProfilesWithReturnValue = .success([])
             let userSession = MockUserSession(clientProxy: ClientProxyMock(.init(userID: "@mock:client.com")),
                                               mediaProvider: MockMediaProvider(),
@@ -763,7 +761,6 @@ class MockScreen: Identifiable {
             let navigationStackCoordinator = NavigationStackCoordinator()
             let clientProxy = ClientProxyMock(.init(userID: "@mock:client.com"))
             let userDiscoveryMock = UserDiscoveryServiceMock()
-            userDiscoveryMock.fetchSuggestionsReturnValue = .success([])
             userDiscoveryMock.searchProfilesWithReturnValue = .success([.mockBob, .mockBobby])
             let userSession = MockUserSession(clientProxy: clientProxy, mediaProvider: MockMediaProvider(), voiceMessageMediaManager: VoiceMessageMediaManagerMock())
             let coordinator = StartChatScreenCoordinator(parameters: .init(orientationManager: OrientationManagerMock(),
@@ -862,15 +859,13 @@ class MockScreen: Identifiable {
             let coordinator = InvitesScreenCoordinator(parameters: .init(userSession: MockUserSession(clientProxy: clientProxy, mediaProvider: MockMediaProvider(), voiceMessageMediaManager: VoiceMessageMediaManagerMock())))
             navigationStackCoordinator.setRootCoordinator(coordinator)
             return navigationStackCoordinator
-        case .inviteUsers, .inviteUsersInRoom, .inviteUsersInRoomExistingMembers:
+        case .inviteUsers:
-            ServiceLocator.shared.settings.userSuggestionsEnabled = true
             let navigationStackCoordinator = NavigationStackCoordinator()
             let userDiscoveryMock = UserDiscoveryServiceMock()
-            userDiscoveryMock.fetchSuggestionsReturnValue = .success([.mockAlice, .mockBob, .mockCharlie])
             userDiscoveryMock.searchProfilesWithReturnValue = .success([])
             let mediaProvider = MockMediaProvider()
             let usersSubject = CurrentValueSubject<[UserProfileProxy], Never>([])
-            let members: [RoomMemberProxyMock] = id == .inviteUsersInRoomExistingMembers ? [.mockInvitedAlice, .mockBob] : []
+            let members: [RoomMemberProxyMock] = []
             let roomProxy = RoomProxyMock(with: .init(name: "test", members: members))
             let roomType: InviteUsersScreenRoomType = id == .inviteUsers ? .draft : .room(roomProxy: roomProxy)
             let coordinator = InviteUsersScreenCoordinator(parameters: .init(selectedUsers: usersSubject.asCurrentValuePublisher(),

ElementX/Sources/UITests/UITestsScreenIdentifier.swift

@@ -80,8 +80,6 @@ enum UITestsScreenIdentifier: String {
     case invitesWithBadges
     case invitesNoInvites
     case inviteUsers
-    case inviteUsersInRoom
-    case inviteUsersInRoomExistingMembers
     case createRoom
     case createRoomNoUsers
     case createPoll

UITests/Sources/InviteUsersScreenUITests.swift

@@ -22,22 +22,4 @@ class InviteUsersScreenUITests: XCTestCase {
         let app = Application.launch(.inviteUsers)
         try await app.assertScreenshot(.inviteUsers)
     }
-
-    func testSelectedUsers() async throws {
-        let app = Application.launch(.inviteUsers)
-        app.buttons[A11yIdentifiers.inviteUsersScreen.userProfile].firstMatch.tap()
-        try await app.assertScreenshot(.inviteUsers, step: 1)
-    }
-    
-    func testInviteUsers() async throws {
-        let app = Application.launch(.inviteUsersInRoom)
-        app.buttons[A11yIdentifiers.inviteUsersScreen.userProfile].firstMatch.tap()
-        try await app.assertScreenshot(.inviteUsersInRoom, step: 1)
-    }
-    
-    func testInviteUserExistingMembers() async throws {
-        let app = Application.launch(.inviteUsersInRoomExistingMembers)
-        app.buttons[A11yIdentifiers.inviteUsersScreen.userProfile].firstMatch.tap()
-        try await app.assertScreenshot(.inviteUsersInRoomExistingMembers, step: 1)
-    }
 }

UnitTests/Sources/HomeScreenViewModelTests.swift

@@ -28,7 +28,6 @@ class HomeScreenViewModelTests: XCTestCase {
     var roomSummaryProvider: RoomSummaryProviderMock!
     
     override func setUpWithError() throws {
-        ServiceLocator.shared.settings.roomListFiltersEnabled = true
         cancellables.removeAll()
         roomSummaryProvider = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms)))
         clientProxy = ClientProxyMock(.init(userID: "@mock:client.com", roomSummaryProvider: roomSummaryProvider))
@@ -179,7 +178,6 @@ class HomeScreenViewModelTests: XCTestCase {
         try await Task.sleep(for: .milliseconds(100))
         XCTAssertEqual(roomSummaryProvider.roomListPublisher.value.first?.name, "Prelude to Foundation")
         XCTAssertEqual(roomSummaryProvider.roomListPublisher.value.count, 1)
-        XCTAssertFalse(context.viewState.shouldShowFilters)
     }
     
     func testFiltersEmptyState() async throws {

UnitTests/Sources/InviteUsersViewModelTests.swift

@@ -96,13 +96,11 @@ class InviteUsersScreenViewModelTests: XCTestCase {
     private func setupWithRoomType(roomType: InviteUsersScreenRoomType) {
         let usersSubject = CurrentValueSubject<[UserProfileProxy], Never>([])
         userDiscoveryService = UserDiscoveryServiceMock()
-        userDiscoveryService.fetchSuggestionsReturnValue = .success([])
         userDiscoveryService.searchProfilesWithReturnValue = .success([])
         usersSubject.send([])
         let viewModel = InviteUsersScreenViewModel(selectedUsers: usersSubject.asCurrentValuePublisher(),
                                                    roomType: roomType, mediaProvider: MockMediaProvider(),
                                                    userDiscoveryService: userDiscoveryService,
-                                                   appSettings: ServiceLocator.shared.settings,
                                                    userIndicatorController: UserIndicatorControllerMock())
         viewModel.state.usersSection = .init(type: .suggestions, users: [.mockAlice, .mockBob, .mockCharlie])
         self.viewModel = viewModel

UnitTests/Sources/StartChatViewModelTests.swift

@@ -31,13 +31,11 @@ class StartChatScreenViewModelTests: XCTestCase {
     override func setUpWithError() throws {
         clientProxy = .init(.init(userID: ""))
         userDiscoveryService = UserDiscoveryServiceMock()
-        userDiscoveryService.fetchSuggestionsReturnValue = .success([])
         userDiscoveryService.searchProfilesWithReturnValue = .success([])
         let userSession = MockUserSession(clientProxy: clientProxy,
                                           mediaProvider: MockMediaProvider(),
                                           voiceMessageMediaManager: VoiceMessageMediaManagerMock())
         viewModel = StartChatScreenViewModel(userSession: userSession,
-                                             userSuggestionsEnabled: true,
                                              analytics: ServiceLocator.shared.analytics,
                                              userIndicatorController: UserIndicatorControllerMock(),
                                              userDiscoveryService: userDiscoveryService)
@@ -46,7 +44,6 @@ class StartChatScreenViewModelTests: XCTestCase {
     func testQueryShowingNoResults() async throws {
         await search(query: "A")
         XCTAssertEqual(context.viewState.usersSection.type, .suggestions)
-        XCTAssertTrue(userDiscoveryService.fetchSuggestionsCalled)
         
         await search(query: "AA")
         XCTAssertEqual(context.viewState.usersSection.type, .suggestions)

changelog.d/pr-2541.feature

@@ -0,0 +1 @@
+The features: Filters, Mark as Read/Unread/Favourites are now available.