ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 19:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge the room thread list flag into the threads flag

Browse Source
This commit is contained in:
Stefan Ceriu
2026-09-02 11:28:36 +03:00
parent 2ae8b9bf75
commit 491f7c538e
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Application/Settings/AppSettings.swift
-3
View File
@@ -420,9 +420,6 @@ final nonisolated class AppSettings: @unchecked Sendable {
@UserPreference(defaultValue: false) @UserPreference(defaultValue: false)
var threadsEnabled: Bool var threadsEnabled: Bool
@UserPreference(defaultValue: false)
var roomThreadListEnabled: Bool
@UserPreference(defaultValue: ProcessInfo().isiOSAppOnMac) @UserPreference(defaultValue: ProcessInfo().isiOSAppOnMac)
var globalSearchEnabled: Bool var globalSearchEnabled: Bool
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+1 -1
View File
@@ -166,7 +166,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
// MARK: - Private // MARK: - Private
private func setupSubscriptions(ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>) { private func setupSubscriptions(ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>) {
appSettings.roomThreadListEnabledPublisher appSettings.threadsEnabledPublisher
.weakAssign(to: \.state.roomThreadListEnabled, on: self) .weakAssign(to: \.state.roomThreadListEnabled, on: self)
.store(in: &cancellables) .store(in: &cancellables)
ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
-2
View File
@@ -71,8 +71,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
var linkNewDeviceEnabled: Bool { get set } var linkNewDeviceEnabled: Bool { get set }
var roomThreadListEnabled: Bool { get set }
var globalSearchEnabled: Bool { get set } var globalSearchEnabled: Bool { get set }
} }
ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
-4
View File
@@ -86,10 +86,6 @@ struct DeveloperOptionsScreen: View {
} }
Section("Room") { Section("Room") {
Toggle(isOn: $context.roomThreadListEnabled) {
Text("Room thread list")
}
Toggle(isOn: $context.linkPreviewsEnabled) { Toggle(isOn: $context.linkPreviewsEnabled) {
Text("Link previews") Text("Link previews")
Text("Follows the timeline media visibility settings.") Text("Follows the timeline media visibility settings.")