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

Merge branch 'develop' into aleksandrs/6864_fixes_from_testing

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift
This commit is contained in:
Aleksandrs Proskurins
2022-10-13 10:42:53 +03:00
parent 28be9e925d efd258ce67
commit f7e8bc2d9e
56 changed files with 1414 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/Common/UserSessionInfo.swift
+7 -43
View File
@@ -93,13 +93,15 @@ extension UserSessionInfo: Equatable {
// MARK: - Mocks
extension UserSessionInfo {
static var mockPhone: UserSessionInfo {
static func mockPhone(verificationState: VerificationState = .verified,
hasTimestamp: Bool = true,
isCurrent: Bool = false) -> UserSessionInfo {
UserSessionInfo(id: "1",
name: "Element Mobile: iOS",
deviceType: .mobile,
verificationState: .verified,
verificationState: verificationState,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000,
lastSeenTimestamp: hasTimestamp ? Date().timeIntervalSince1970 : nil,
applicationName: "Element iOS",
applicationVersion: "1.9.8",
applicationURL: nil,
@@ -108,45 +110,7 @@ extension UserSessionInfo {
lastSeenIPLocation: nil,
clientName: nil,
clientVersion: nil,
isActive: false,
isCurrent: false)
}
static var mockPhoneUnverified: UserSessionInfo {
UserSessionInfo(id: "1",
name: "Element Mobile: iOS",
deviceType: .mobile,
verificationState: .unverified,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000,
applicationName: "Element iOS",
applicationVersion: "1.9.8",
applicationURL: nil,
deviceModel: nil,
deviceOS: "iOS 16.0.2",
lastSeenIPLocation: nil,
clientName: nil,
clientVersion: nil,
isActive: false,
isCurrent: false)
}
static var mockPhoneUnknownVerification: UserSessionInfo {
UserSessionInfo(id: "1",
name: "Element Mobile: iOS",
deviceType: .mobile,
verificationState: .unknown,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000,
applicationName: "Element iOS",
applicationVersion: "1.9.8",
applicationURL: nil,
deviceModel: nil,
deviceOS: "iOS 16.0.2",
lastSeenIPLocation: nil,
clientName: nil,
clientVersion: nil,
isActive: false,
isCurrent: false)
isActive: true,
isCurrent: isCurrent)
}
}
RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift
+3 -1
View File
@@ -80,8 +80,10 @@ struct UserSessionCardViewData {
switch verificationState {
case .verified:
return VectorL10n.userSessionVerifiedAdditionalInfo
case .unverified, .unknown:
case .unverified:
return isCurrentSessionDisplayMode ? VectorL10n.userSessionUnverifiedAdditionalInfo : VectorL10n.userOtherSessionUnverifiedAdditionalInfo
case .unknown:
return VectorL10n.userSessionVerificationUnknownAdditionalInfo
}
}