felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-29 20:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2023-07-04 08:24:05 +02:00
parent 0645b4971c b1847a3ae5
commit 54dc0322f0
60 changed files with 1658 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsDataProvider.swift
+11 -2
View File
@@ -57,8 +57,17 @@ class UserSessionsDataProvider: UserSessionsDataProviderProtocol {
guard let deviceInfo = deviceInfo else {
return .permanentlyUnverified
}
guard session.crypto?.crossSigning.canCrossSign == true else {
// When the app is launched offline the cross signing state is "notBootstrapped"
// In this edge case the verification state returned is `.unknown` since we cannot say more even for the current session.
guard
let crossSigning = session.crypto?.crossSigning,
crossSigning.state.rawValue > MXCrossSigningState.notBootstrapped.rawValue
else {
return .unknown
}
guard crossSigning.canCrossSign else {
return deviceInfo.deviceId == session.myDeviceId ? .unverified : .unknown
}
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsOverviewService.swift
+1 -1
View File
@@ -94,7 +94,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
}
overviewDataPublisher = .init(UserSessionsOverviewData(currentSession: currentSessionInfo,
unverifiedSessions: currentSessionInfo.verificationState == .verified ? [] : [currentSessionInfo],
unverifiedSessions: currentSessionInfo.verificationState.isUnverified ? [currentSessionInfo] : [],
inactiveSessions: currentSessionInfo.isActive ? [] : [currentSessionInfo],
otherSessions: [],
linkDeviceEnabled: false))