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

Make the RoomInfo isPrivate field optional and handle it accordingly.

Browse Source
This commit is contained in:
Stefan Ceriu
2025-06-25 17:15:21 +03:00
committed by Stefan Ceriu
parent 11c7d07e76
commit bfd97cd560
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+1 -1
View File
@@ -364,7 +364,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
return
}
if !roomProxy.infoPublisher.value.isPrivate {
if !(roomProxy.infoPublisher.value.isPrivate ?? true) {
state.bindings.leaveRoomAlertItem = LeaveRoomAlertItem(roomID: roomID, isDM: roomProxy.isDirectOneToOneRoom, state: .public)
} else {
state.bindings.leaveRoomAlertItem = if roomProxy.infoPublisher.value.joinedMembersCount > 1 {
ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift
+1 -1
View File
@@ -125,7 +125,7 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
}
state.bindings.leaveRoomAlertItem = LeaveRoomAlertItem(roomID: roomProxy.id,
isDM: roomProxy.isDirectOneToOneRoom,
state: roomProxy.infoPublisher.value.isPrivate ? .private : .public)
state: roomProxy.infoPublisher.value.isPrivate ?? true ? .private : .public)
case .confirmLeave:
Task { await leaveRoom() }
case .processTapIgnore:
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
+2 -2
View File
@@ -92,7 +92,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
case .always:
false
case .privateOnly:
!roomProxy.infoPublisher.value.isPrivate
!(roomProxy.infoPublisher.value.isPrivate ?? true)
case .never:
true
}
@@ -524,7 +524,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
case .privateOnly:
guard let self else { return Just(false).eraseToAnyPublisher() }
return roomProxy.infoPublisher
.map { !$0.isPrivate }
.map { !($0.isPrivate ?? false) }
.removeDuplicates()
.eraseToAnyPublisher()
}