ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add call icon next to members in call (#5941)

Browse Source 
* feat: add call icon next to members in call

* feat: use matrix rtc room status for in-call

* chore: revert xcodeproj change

* chore: update preview tests

* chore: Update ElementX.xcscheme

* chore: undo room member status proxy

---------

Co-authored-by: Kai <nankeen@users.noreply.github.com>
This commit is contained in:
Kai
2026-08-03 12:37:31 +01:00
committed by Doug
parent 1407a1d5b4
commit 3ab0aacabf
14 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModel.swift
+10 -4
View File
@@ -125,8 +125,9 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
private func buildMembersDetails(members: [RoomMemberProxyProtocol]) async -> RoomMembersDetails {
// We don't care about identity statuses on non-encrypted rooms
let isEncrypted = roomProxy.infoPublisher.value.isEncrypted
let activeRoomCallParticipants = Set(roomProxy.infoPublisher.value.activeRoomCallParticipants)
return await Task.detached { [weak self] in
let membersDetails: RoomMembersDetails = await Task.detached { [weak self] in
// accessing RoomMember's properties is very slow. We need to do it in a background thread.
var invitedMembers: [RoomMemberListScreenEntry] = .init()
var joinedMembers: [RoomMemberListScreenEntry] = .init()
@@ -137,14 +138,15 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
if isEncrypted, let fetchedState = await self?.userIdentityVerificationState(for: member.userID) {
verificationState = fetchedState
}
let isInCall = activeRoomCallParticipants.contains(member.userID)
switch member.membership {
case .invite:
invitedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
invitedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState, isInCall: isInCall))
case .join:
joinedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
joinedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState, isInCall: isInCall))
case .ban:
bannedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
bannedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState, isInCall: isInCall))
default:
continue
}
@@ -155,6 +157,10 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
bannedMembers: bannedMembers.sorted { $0.member.id.localizedStandardCompare($1.member.id) == .orderedAscending }) // Re-sort ignoring display name.
}
.value
return .init(invitedMembers: membersDetails.invitedMembers,
joinedMembers: membersDetails.joinedMembers.filter(\.isInCall) + membersDetails.joinedMembers.filter { !$0.isInCall },
bannedMembers: membersDetails.bannedMembers)
}
/// The client proxy isn't Sendable, fetch identities through this helper so