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

element-hq/element-x-ios/issues/2670 - Show invites as part of the room list

Browse Source
This commit is contained in:
Stefan Ceriu
2024-04-08 10:26:33 +03:00
committed by Stefan Ceriu
parent d34ec30ca6
commit 064626fbbe
46 changed files with 541 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Application/AppSettings.swift
+4 -5
View File
@@ -47,13 +47,9 @@ final class AppSettings {
// Feature flags
case shouldCollapseRoomStateEvents
case userSuggestionsEnabled
case mentionsBadgeEnabled
case roomListFiltersEnabled
case markAsUnreadEnabled
case markAsFavouriteEnabled
case publicSearchEnabled
case qrCodeLoginEnabled
case roomListInvitesEnabled
}
private static var suiteName: String = InfoPlistReader.main.appGroupIdentifier
@@ -287,6 +283,9 @@ final class AppSettings {
@UserPreference(key: UserDefaultsKeys.qrCodeLoginEnabled, defaultValue: false, storageType: .userDefaults(store))
var qrCodeLoginEnabled
@UserPreference(key: UserDefaultsKeys.roomListInvitesEnabled, defaultValue: false, storageType: .userDefaults(store))
var roomListInvitesEnabled
#endif
// MARK: - Shared
ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
+4 -4
View File
@@ -1,4 +1,4 @@
// Generated using Sourcery 2.1.8 — https://github.com/krzysztofzablocki/Sourcery
// Generated using Sourcery 2.2.2 — https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT
// swiftlint:disable all
@@ -478,16 +478,16 @@ class SDKClientMock: SDKClientProtocol {
}
public var loginUsernamePasswordInitialDeviceNameDeviceIdReceivedArguments: (username: String, password: String, initialDeviceName: String?, deviceId: String?)?
public var loginUsernamePasswordInitialDeviceNameDeviceIdReceivedInvocations: [(username: String, password: String, initialDeviceName: String?, deviceId: String?)] = []
public var loginUsernamePasswordInitialDeviceNameDeviceIdClosure: ((String, String, String?, String?) throws -> Void)?
public var loginUsernamePasswordInitialDeviceNameDeviceIdClosure: ((String, String, String?, String?) async throws -> Void)?
public func login(username: String, password: String, initialDeviceName: String?, deviceId: String?) throws {
public func login(username: String, password: String, initialDeviceName: String?, deviceId: String?) async throws {
if let error = loginUsernamePasswordInitialDeviceNameDeviceIdThrowableError {
throw error
}
loginUsernamePasswordInitialDeviceNameDeviceIdCallsCount += 1
loginUsernamePasswordInitialDeviceNameDeviceIdReceivedArguments = (username: username, password: password, initialDeviceName: initialDeviceName, deviceId: deviceId)
loginUsernamePasswordInitialDeviceNameDeviceIdReceivedInvocations.append((username: username, password: password, initialDeviceName: initialDeviceName, deviceId: deviceId))
try loginUsernamePasswordInitialDeviceNameDeviceIdClosure?(username, password, initialDeviceName, deviceId)
try await loginUsernamePasswordInitialDeviceNameDeviceIdClosure?(username, password, initialDeviceName, deviceId)
}
//MARK: - logout
ElementX/Sources/Mocks/RoomSummaryProviderMock.swift
+20 -10
View File
@@ -79,6 +79,8 @@ extension RoomSummaryProviderMock {
extension Array where Element == RoomSummary {
static let mockRooms: [Element] = [
.filled(details: RoomSummaryDetails(id: "1",
isInvite: false,
inviter: nil,
name: "Foundation 🔭🪐🌌",
isDirect: false,
avatarURL: nil,
@@ -89,11 +91,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 0,
notificationMode: .allMessages,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "2",
isInvite: false,
inviter: nil,
name: "Foundation and Empire",
isDirect: false,
avatarURL: URL.picturesDirectory,
@@ -104,11 +107,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 2,
notificationMode: .mute,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "3",
isInvite: false,
inviter: nil,
name: "Second Foundation",
isDirect: false,
avatarURL: nil,
@@ -119,11 +123,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 0,
notificationMode: .mentionsAndKeywordsOnly,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "4",
isInvite: false,
inviter: nil,
name: "Foundation's Edge",
isDirect: false,
avatarURL: nil,
@@ -134,11 +139,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 2,
notificationMode: .allMessages,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "5",
isInvite: false,
inviter: nil,
name: "Foundation and Earth",
isDirect: true,
avatarURL: nil,
@@ -149,11 +155,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 1,
notificationMode: .allMessages,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: true,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "6",
isInvite: false,
inviter: nil,
name: "Prelude to Foundation",
isDirect: true,
avatarURL: nil,
@@ -164,11 +171,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 0,
notificationMode: .mute,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: true,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "0",
isInvite: false,
inviter: nil,
name: "Unknown",
isDirect: false,
avatarURL: nil,
@@ -179,7 +187,6 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: nil,
inviter: nil,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)),
@@ -216,7 +223,10 @@ extension Array where Element == RoomSummary {
}()
static let mockInvites: [Element] = [
.filled(details: RoomSummaryDetails(id: "someAwesomeRoomId1", name: "First room",
.filled(details: RoomSummaryDetails(id: "someAwesomeRoomId1",
isInvite: false,
inviter: RoomMemberProxyMock.mockCharlie,
name: "First room",
isDirect: false,
avatarURL: URL.picturesDirectory,
lastMessage: nil,
@@ -226,11 +236,12 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: "#footest:somewhere.org",
inviter: RoomMemberProxyMock.mockCharlie,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)),
.filled(details: RoomSummaryDetails(id: "someAwesomeRoomId2",
isInvite: false,
inviter: RoomMemberProxyMock.mockCharlie,
name: "Second room",
isDirect: true,
avatarURL: nil,
@@ -241,7 +252,6 @@ extension Array where Element == RoomSummary {
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: nil,
inviter: RoomMemberProxyMock.mockCharlie,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false))
ElementX/Sources/Other/PermalinkBuilder.swift
+1
View File
@@ -78,6 +78,7 @@ enum PermalinkBuilder {
return nil
}
@available(*, deprecated, message: "Use a room's `matrixToPermalink` method instead")
static func permalinkTo(userIdentifier: String, baseURL: URL) throws -> URL {
guard MatrixEntityRegex.isMatrixUserIdentifier(userIdentifier) else {
throw PermalinkBuilderError.invalidUserIdentifier
ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
+46 -10
View File
@@ -48,6 +48,9 @@ enum HomeScreenViewAction {
case markRoomAsRead(roomIdentifier: String)
case markRoomAsFavourite(roomIdentifier: String, isFavourite: Bool)
case selectRoomDirectorySearch
case acceptInvite(roomIdentifier: String)
case declineInvite(roomIdentifier: String)
}
enum HomeScreenRoomListMode: CustomStringConvertible {
@@ -130,6 +133,18 @@ struct HomeScreenViewStateBindings {
}
struct HomeScreenRoom: Identifiable, Equatable {
enum RoomType {
case placeholder
case room
case invite
}
struct InviterDetails: Equatable {
let userID: String
let displayName: String?
let avatarURL: URL?
}
static let placeholderLastMessage = AttributedString("Hidden last message")
/// The list item identifier can be a real room identifier, a custom one for invalidated entries
@@ -139,9 +154,9 @@ struct HomeScreenRoom: Identifiable, Equatable {
/// The real room identifier this item points to
let roomId: String?
var name = ""
let type: RoomType
var badges: Badges
let badges: Badges
struct Badges: Equatable {
let isDotShown: Bool
let isMentionShown: Bool
@@ -149,28 +164,38 @@ struct HomeScreenRoom: Identifiable, Equatable {
let isCallShown: Bool
}
let name: String
let isDirect: Bool
let isHighlighted: Bool
let isFavourite: Bool
var timestamp: String?
let timestamp: String?
var lastMessage: AttributedString?
let lastMessage: AttributedString?
var avatarURL: URL?
let avatarURL: URL?
var isPlaceholder = false
let inviter: InviterDetails?
let canonicalAlias: String?
static func placeholder() -> HomeScreenRoom {
HomeScreenRoom(id: UUID().uuidString,
roomId: nil,
name: "Placeholder room name",
type: .placeholder,
badges: .init(isDotShown: false, isMentionShown: false, isMuteShown: false, isCallShown: false),
name: "Placeholder room name",
isDirect: false,
isHighlighted: false,
isFavourite: false,
timestamp: "Now",
lastMessage: placeholderLastMessage,
isPlaceholder: true)
avatarURL: nil,
inviter: nil,
canonicalAlias: nil)
}
}
@@ -186,17 +211,28 @@ extension HomeScreenRoom {
let isCallShown = details.hasOngoingCall
let isHighlighted = details.isMarkedUnread || (!details.isMuted && (details.hasUnreadNotifications || details.hasUnreadMentions))
var inviter: InviterDetails?
if let roomMemberProxy = details.inviter {
inviter = .init(userID: roomMemberProxy.userID,
displayName: roomMemberProxy.displayName,
avatarURL: roomMemberProxy.avatarURL)
}
self.init(id: identifier,
roomId: details.id,
name: details.name,
type: details.isInvite ? .invite : .room,
badges: .init(isDotShown: isDotShown,
isMentionShown: isMentionShown,
isMuteShown: isMuteShown,
isCallShown: isCallShown),
name: details.name,
isDirect: details.isDirect,
isHighlighted: isHighlighted,
isFavourite: details.isFavourite,
timestamp: details.lastMessageFormattedTimestamp,
lastMessage: details.lastMessage,
avatarURL: details.avatarURL)
avatarURL: details.avatarURL,
inviter: inviter,
canonicalAlias: details.canonicalAlias)
}
}
ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+71
View File
@@ -183,6 +183,12 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
}
case .selectRoomDirectorySearch:
actionsSubject.send(.presentRoomDirectorySearch)
case .acceptInvite(let roomIdentifier):
Task {
await acceptInvite(roomID: roomIdentifier)
}
case .declineInvite(let roomIdentifier):
showDeclineInviteConfirmationAlert(roomID: roomIdentifier)
}
}
@@ -446,4 +452,69 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
}
}
}
// MARK: Invites
private func acceptInvite(roomID: String) async {
defer {
userIndicatorController.retractIndicatorWithId(roomID)
}
userIndicatorController.submitIndicator(UserIndicator(id: roomID, type: .modal, title: L10n.commonLoading, persistent: true))
guard let roomProxy = await userSession.clientProxy.roomForIdentifier(roomID) else {
displayError()
return
}
switch await roomProxy.acceptInvitation() {
case .success:
actionsSubject.send(.presentRoom(roomIdentifier: roomID))
analyticsService.trackJoinedRoom(isDM: roomProxy.isDirect, isSpace: roomProxy.isSpace, activeMemberCount: UInt(roomProxy.activeMembersCount))
case .failure:
displayError()
}
}
private func showDeclineInviteConfirmationAlert(roomID: String) {
guard let room = state.rooms.first(where: { $0.id == roomID }) else {
displayError()
return
}
let roomPlaceholder = room.isDirect ? (room.inviter?.displayName ?? room.name) : room.name
let title = room.isDirect ? L10n.screenInvitesDeclineDirectChatTitle : L10n.screenInvitesDeclineChatTitle
let message = room.isDirect ? L10n.screenInvitesDeclineDirectChatMessage(roomPlaceholder) : L10n.screenInvitesDeclineChatMessage(roomPlaceholder)
state.bindings.alertInfo = .init(id: UUID(),
title: title,
message: message,
primaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil),
secondaryButton: .init(title: L10n.actionDecline, role: .destructive, action: { Task { await self.declineInvite(roomID: room.id) } }))
}
private func declineInvite(roomID: String) async {
defer {
userIndicatorController.retractIndicatorWithId(roomID)
}
userIndicatorController.submitIndicator(UserIndicator(id: roomID, type: .modal, title: L10n.commonLoading, persistent: true))
guard let roomProxy = await userSession.clientProxy.roomForIdentifier(roomID) else {
displayError()
return
}
let result = await roomProxy.rejectInvitation()
if case .failure = result {
displayError()
}
}
private func displayError() {
state.bindings.alertInfo = .init(id: UUID(),
title: L10n.commonError,
message: L10n.errorUnknown)
}
}
ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift
+29 -12
View File
@@ -29,6 +29,15 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
case people
case rooms
case favourites
case invites
static var availableFilters: [RoomListFilter] {
if ServiceLocator.shared.settings.roomListInvitesEnabled {
return RoomListFilter.allCases
} else {
return RoomListFilter.allCases.filter { !($0 == .invites) }
}
}
var localizedName: String {
switch self {
@@ -40,20 +49,24 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
return L10n.screenRoomlistFilterUnreads
case .favourites:
return L10n.screenRoomlistFilterFavourites
case .invites:
return L10n.screenRoomlistFilterInvites
}
}
var incompatibleFilter: RoomListFilter? {
var incompatibleFilters: [RoomListFilter] {
switch self {
case .people:
return .rooms
return [.rooms, .invites]
case .rooms:
return .people
return [.people, .invites]
case .unreads:
return nil
return [.invites]
case .favourites:
// When we will have Low Priority we may need to return it here
return nil
return [.invites]
case .invites:
return [.rooms, .people, .unreads, .favourites]
}
}
@@ -67,6 +80,8 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
return .unread
case .favourites:
return .favourite
case .invites:
return .invite
}
}
}
@@ -79,13 +94,13 @@ struct RoomListFiltersState {
}
var availableFilters: [RoomListFilter] {
var availableFilters = OrderedSet(RoomListFilter.allCases)
var availableFilters = OrderedSet(RoomListFilter.availableFilters)
for filter in activeFilters {
availableFilters.remove(filter)
if let incompatibleFilter = filter.incompatibleFilter {
availableFilters.remove(incompatibleFilter)
}
filter.incompatibleFilters.forEach { availableFilters.remove($0) }
}
return availableFilters.elements
}
@@ -94,10 +109,12 @@ struct RoomListFiltersState {
}
mutating func activateFilter(_ filter: RoomListFilter) {
if let incompatibleFilter = filter.incompatibleFilter,
activeFilters.contains(incompatibleFilter) {
fatalError("[RoomListFiltersState] adding mutually exclusive filters is not allowed")
filter.incompatibleFilters.forEach { incompatibleFilter in
if activeFilters.contains(incompatibleFilter) {
fatalError("[RoomListFiltersState] adding mutually exclusive filters is not allowed")
}
}
// We always want the most recently enabled filter to be at the bottom of the others.
activeFilters.append(filter)
}
ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersEmptyStateView.swift
+2
View File
@@ -30,6 +30,8 @@ struct RoomListFiltersEmptyStateView: View {
return L10n.screenRoomlistFilterRoomsEmptyStateTitle
case .favourites:
return L10n.screenRoomlistFilterFavouritesEmptyStateTitle
case .invites:
return L10n.screenRoomlistFilterInvitesEmptyStateTitle
}
}
return L10n.screenRoomlistFilterMixedEmptyStateTitle
ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
+254
View File
@@ -0,0 +1,254 @@
//
// Copyright 2024 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Combine
import SwiftUI
@MainActor
struct HomeScreenInviteCell: View {
@Environment(\.dynamicTypeSize) var dynamicTypeSize
let room: HomeScreenRoom
let context: HomeScreenViewModel.Context
var body: some View {
HStack(alignment: .top, spacing: 16) {
if dynamicTypeSize < .accessibility3 {
LoadableAvatarImage(url: room.avatarURL,
name: title,
contentID: room.id,
avatarSize: .custom(52),
imageProvider: context.imageProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
.accessibilityHidden(true)
}
mainContent
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.bottom, 16)
.padding(.trailing, 16)
.overlay(alignment: .bottom) {
separator
}
}
.padding(.top, 12)
.padding(.leading, 16)
}
// MARK: - Private
private var mainContent: some View {
VStack(alignment: .leading, spacing: 0) {
HStack(alignment: .firstTextBaseline, spacing: 16) {
textualContent
badge
}
inviterView
.padding(.top, 6)
.padding(.trailing, 16)
buttons
.padding(.top, 14)
.padding(.trailing, 22)
}
}
@ViewBuilder
private var inviterView: some View {
if let invitedText = attributedInviteText, let name = room.inviter?.displayName {
HStack(alignment: .firstTextBaseline, spacing: 8) {
LoadableAvatarImage(url: room.inviter?.avatarURL,
name: name,
contentID: name,
avatarSize: .custom(16),
imageProvider: context.imageProvider)
.alignmentGuide(.firstTextBaseline) { $0[.bottom] * 0.8 }
Text(invitedText)
}
}
}
@ViewBuilder
private var textualContent: some View {
VStack(alignment: .leading, spacing: 0) {
Text(title)
.font(.compound.bodyLGSemibold)
.foregroundColor(.compound.textPrimary)
.lineLimit(2)
if let subtitle {
Text(subtitle)
.font(.compound.bodyMD)
.foregroundColor(.compound.textPlaceholder)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
}
private var buttons: some View {
HStack(spacing: 12) {
Button(L10n.actionDecline) {
context.send(viewAction: .declineInvite(roomIdentifier: room.id))
}
.buttonStyle(.compound(.secondary, size: .medium))
.accessibilityIdentifier(A11yIdentifiers.invitesScreen.decline)
Button(L10n.actionAccept) {
context.send(viewAction: .acceptInvite(roomIdentifier: room.id))
}
.buttonStyle(.compound(.primary, size: .medium))
.accessibilityIdentifier(A11yIdentifiers.invitesScreen.accept)
}
}
private var separator: some View {
Rectangle()
.fill(Color.compound.borderDisabled)
.frame(height: 1 / UIScreen.main.scale)
}
private var title: String {
room.name
}
private var subtitle: String? {
room.isDirect ? room.inviter?.userID : room.canonicalAlias
}
private var attributedInviteText: AttributedString? {
guard
room.isDirect == false,
let inviterName = room.inviter?.displayName,
let inviterID = room.inviter?.userID
else {
return nil
}
let text = L10n.screenInvitesInvitedYou(inviterName, inviterID)
var attributedString = AttributedString(text)
attributedString.font = .compound.bodyMD
attributedString.foregroundColor = .compound.textPlaceholder
if let range = attributedString.range(of: inviterName) {
attributedString[range].foregroundColor = .compound.textPrimary
attributedString[range].font = .compound.bodyMDSemibold
}
return attributedString
}
private var badge: some View {
Circle()
.scaledFrame(size: 12)
.foregroundColor(.compound.iconAccentTertiary)
}
}
struct HomeScreenInviteCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
ScrollView {
VStack(spacing: 0) {
HomeScreenInviteCell(room: .dmInvite,
context: viewModel().context)
HomeScreenInviteCell(room: .dmInvite,
context: viewModel().context)
HomeScreenInviteCell(room: .roomInvite(),
context: viewModel().context)
HomeScreenInviteCell(room: .roomInvite(),
context: viewModel().context)
HomeScreenInviteCell(room: .roomInvite(alias: "#footest:somewhere.org", avatarURL: .picturesDirectory),
context: viewModel().context)
HomeScreenInviteCell(room: .roomInvite(alias: "#footest:somewhere.org"),
context: viewModel().context)
.dynamicTypeSize(.accessibility1)
.previewDisplayName("Aliased room (AX1)")
}
}
}
static func viewModel() -> HomeScreenViewModel {
let clientProxy = ClientProxyMock(.init())
let userSession = MockUserSession(clientProxy: clientProxy,
mediaProvider: MockMediaProvider(),
voiceMessageMediaManager: VoiceMessageMediaManagerMock())
return HomeScreenViewModel(userSession: userSession,
analyticsService: ServiceLocator.shared.analytics,
appSettings: ServiceLocator.shared.settings,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
userIndicatorController: ServiceLocator.shared.userIndicatorController)
}
}
@MainActor
private extension HomeScreenRoom {
static var dmInvite: HomeScreenRoom {
let inviter = RoomMemberProxyMock()
inviter.displayName = "Jack"
inviter.userID = "@jack:somewhere.com"
let details = RoomSummaryDetails(id: "@someone:somewhere.com",
isInvite: false,
inviter: inviter,
name: "Some Guy",
isDirect: true,
avatarURL: nil,
lastMessage: nil,
lastMessageFormattedTimestamp: nil,
unreadMessagesCount: 0,
unreadMentionsCount: 0,
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: "#footest:somewhere.org",
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)
return .init(details: details, invalidated: false, hideUnreadMessagesBadge: false)
}
static func roomInvite(alias: String? = nil, avatarURL: URL? = nil) -> HomeScreenRoom {
let inviter = RoomMemberProxyMock()
inviter.displayName = "Luca"
inviter.userID = "@jack:somewhi.nl"
inviter.avatarURL = avatarURL
let details = RoomSummaryDetails(id: "@someone:somewhere.com",
isInvite: false,
inviter: inviter,
name: "Awesome Room",
isDirect: false,
avatarURL: avatarURL,
lastMessage: nil,
lastMessageFormattedTimestamp: nil,
unreadMessagesCount: 0,
unreadMentionsCount: 0,
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: alias,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)
return .init(details: details, invalidated: false, hideUnreadMessagesBadge: false)
}
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
+5 -2
View File
@@ -35,10 +35,13 @@ struct HomeScreenRoomList: View {
@ViewBuilder
private var content: some View {
ForEach(context.viewState.visibleRooms) { room in
if room.isPlaceholder {
switch room.type {
case .placeholder:
HomeScreenRoomCell(room: room, context: context, isSelected: false)
.redacted(reason: .placeholder)
} else {
case .invite:
HomeScreenInviteCell(room: room, context: context)
case .room:
let isSelected = context.viewState.selectedRoomID == room.id
HomeScreenRoomCell(room: room, context: context, isSelected: isSelected)
ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift
+4 -2
View File
@@ -181,6 +181,8 @@ private extension InvitesScreenRoomDetails {
inviter.userID = "@jack:somewhere.com"
let dmRoom = RoomSummaryDetails(id: "@someone:somewhere.com",
isInvite: false,
inviter: inviter,
name: "Some Guy",
isDirect: true,
avatarURL: nil,
@@ -191,7 +193,6 @@ private extension InvitesScreenRoomDetails {
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: "#footest:somewhere.org",
inviter: inviter,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)
@@ -205,6 +206,8 @@ private extension InvitesScreenRoomDetails {
inviter.avatarURL = avatarURL
let dmRoom = RoomSummaryDetails(id: "@someone:somewhere.com",
isInvite: false,
inviter: inviter,
name: "Awesome Room",
isDirect: false,
avatarURL: avatarURL,
@@ -215,7 +218,6 @@ private extension InvitesScreenRoomDetails {
unreadNotificationsCount: 0,
notificationMode: nil,
canonicalAlias: alias,
inviter: inviter,
hasOngoingCall: false,
isMarkedUnread: false,
isFavourite: false)
ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
+1
View File
@@ -51,6 +51,7 @@ protocol DeveloperOptionsProtocol: AnyObject {
var elementCallBaseURL: URL { get set }
var publicSearchEnabled: Bool { get set }
var qrCodeLoginEnabled: Bool { get set }
var roomListInvitesEnabled: Bool { get set }
}
extension AppSettings: DeveloperOptionsProtocol { }
ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
+11 -6
View File
@@ -32,16 +32,15 @@ struct DeveloperOptionsScreen: View {
}
}
Section("Room") {
Toggle(isOn: $context.shouldCollapseRoomStateEvents) {
Text("Collapse room state events")
}
}
Section("Room List") {
Toggle(isOn: $context.hideUnreadMessagesBadge) {
Text("Hide grey dots")
}
Toggle(isOn: $context.roomListInvitesEnabled) {
Text("Room list invites")
Text("Requires app reboot and, after disabling the feature, a cache clear.")
}
}
Section("Room Directory Search") {
@@ -56,6 +55,12 @@ struct DeveloperOptionsScreen: View {
}
}
Section("Room") {
Toggle(isOn: $context.shouldCollapseRoomStateEvents) {
Text("Collapse room state events")
}
}
Section("Element Call") {
TextField(context.elementCallBaseURL.absoluteString, text: $elementCallBaseURLString)
.submitLabel(.done)
ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
+7 -15
View File
@@ -64,9 +64,7 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
do {
var homeserver = LoginHomeserver(address: homeserverAddress, loginMode: .unknown)
try await Task.dispatch(on: .global()) {
try self.authenticationService.configureHomeserver(serverNameOrHomeserverUrl: homeserverAddress)
}
try await authenticationService.configureHomeserver(serverNameOrHomeserverUrl: homeserverAddress)
if let details = authenticationService.homeserverDetails() {
if details.supportsOidcLogin() {
@@ -94,9 +92,7 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
func urlForOIDCLogin() async -> Result<OIDCAuthenticationDataProxy, AuthenticationServiceError> {
do {
let oidcData = try await Task.dispatch(on: .global()) {
try self.authenticationService.urlForOidcLogin()
}
let oidcData = try await authenticationService.urlForOidcLogin()
return .success(OIDCAuthenticationDataProxy(underlyingData: oidcData))
} catch {
MXLog.error("Failed to get URL for OIDC login: \(error)")
@@ -106,9 +102,7 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
func loginWithOIDCCallback(_ callbackURL: URL, data: OIDCAuthenticationDataProxy) async -> Result<UserSessionProtocol, AuthenticationServiceError> {
do {
let client = try await Task.dispatch(on: .global()) {
try self.authenticationService.loginWithOidcCallback(authenticationData: data.underlyingData, callbackUrl: callbackURL.absoluteString)
}
let client = try await authenticationService.loginWithOidcCallback(authenticationData: data.underlyingData, callbackUrl: callbackURL.absoluteString)
return await userSession(for: client)
} catch AuthenticationError.OidcCancelled {
return .failure(.oidcError(.userCancellation))
@@ -120,12 +114,10 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
func login(username: String, password: String, initialDeviceName: String?, deviceID: String?) async -> Result<UserSessionProtocol, AuthenticationServiceError> {
do {
let client = try await Task.dispatch(on: .global()) {
try self.authenticationService.login(username: username,
password: password,
initialDeviceName: initialDeviceName,
deviceId: deviceID)
}
let client = try await authenticationService.login(username: username,
password: password,
initialDeviceName: initialDeviceName,
deviceId: deviceID)
let refreshToken = try? await Task.dispatch(on: .global()) {
try client.session().refreshToken
ElementX/Sources/Services/Client/ClientProxy.swift
+1
View File
@@ -676,6 +676,7 @@ class ClientProxy: ClientProxyProtocol {
.syncService()
.withCrossProcessLock(appIdentifier: "MainApp")
.withUtdHook(delegate: ClientDecryptionErrorDelegate(actionsSubject: actionsSubject))
.withUnifiedInvitesInRoomList(withUnifiedInvites: appSettings.roomListInvitesEnabled)
.finish()
let roomListService = syncService.roomListService()
ElementX/Sources/Services/Room/RoomSummary/RoomSummaryDetails.swift
+6 -1
View File
@@ -19,6 +19,10 @@ import MatrixRustSDK
struct RoomSummaryDetails {
let id: String
let isInvite: Bool
let inviter: RoomMemberProxyProtocol?
let name: String
let isDirect: Bool
let avatarURL: URL?
@@ -29,7 +33,7 @@ struct RoomSummaryDetails {
let unreadNotificationsCount: UInt
let notificationMode: RoomNotificationModeProxy?
let canonicalAlias: String?
let inviter: RoomMemberProxyProtocol?
let hasOngoingCall: Bool
let isMarkedUnread: Bool
@@ -70,6 +74,7 @@ extension RoomSummaryDetails {
inviter = nil
hasOngoingCall = false
isInvite = false
isMarkedUnread = false
isFavourite = false
}
ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+2 -1
View File
@@ -240,6 +240,8 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
let notificationMode = roomInfo.userDefinedNotificationMode.flatMap { RoomNotificationModeProxy.from(roomNotificationMode: $0) }
let details = RoomSummaryDetails(id: roomInfo.id,
isInvite: roomInfo.membership == .invited,
inviter: inviterProxy,
name: roomInfo.name ?? roomInfo.id,
isDirect: roomInfo.isDirect,
avatarURL: roomInfo.avatarUrl.flatMap(URL.init(string:)),
@@ -250,7 +252,6 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
unreadNotificationsCount: UInt(roomInfo.numUnreadNotifications),
notificationMode: notificationMode,
canonicalAlias: roomInfo.canonicalAlias,
inviter: inviterProxy,
hasOngoingCall: roomInfo.hasRoomCall,
isMarkedUnread: roomInfo.isMarkedUnread,
isFavourite: roomInfo.isFavourite)
ElementX/Sources/Services/UserSession/UserSessionStore.swift
+4 -3
View File
@@ -135,11 +135,12 @@ class UserSessionStore: UserSessionStoreProtocol {
let completeBuilder = builder
do {
let client: Client = try await Task.dispatch(on: .global()) {
let client = try completeBuilder.build()
let client = try await completeBuilder.build()
try await Task.dispatch(on: .global()) {
try client.restoreSession(session: credentials.restorationToken.session)
return client
}
return await .success(setupProxyForClient(client))
} catch {
MXLog.error("Failed restoring login with error: \(error)")