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

Merge branch 'develop' into alfogrillo/learn_more_sheet

Browse Source 
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
This commit is contained in:
Alfonso Grillo
2022-11-03 18:18:08 +01:00
parent b4d5c3b904 b32fb14d1f
commit 092fe9ef59
34 changed files with 315 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift
+6 -2
View File
@@ -34,7 +34,8 @@ struct UserSessionCardViewData {
var lastActivityIcon: String?
let lastSeenIPInfo: String?
let lastSeenIP: String?
let lastSeenIPLocation: String?
let deviceAvatarViewData: DeviceAvatarViewData
@@ -95,6 +96,7 @@ struct UserSessionCardViewData {
verificationState: UserSessionInfo.VerificationState,
lastActivityTimestamp: TimeInterval?,
lastSeenIP: String?,
lastSeenIPLocation: String?,
isCurrentSessionDisplayMode: Bool = false,
isActive: Bool) {
self.sessionId = sessionId
@@ -112,7 +114,8 @@ struct UserSessionCardViewData {
}
}
self.lastActivityDateString = lastActivityDateString
lastSeenIPInfo = lastSeenIP
self.lastSeenIP = lastSeenIP
self.lastSeenIPLocation = lastSeenIPLocation
deviceAvatarViewData = DeviceAvatarViewData(deviceType: deviceType, verificationState: verificationState)
self.isCurrentSessionDisplayMode = isCurrentSessionDisplayMode
@@ -127,6 +130,7 @@ extension UserSessionCardViewData {
verificationState: sessionInfo.verificationState,
lastActivityTimestamp: sessionInfo.lastSeenTimestamp,
lastSeenIP: sessionInfo.lastSeenIP,
lastSeenIPLocation: sessionInfo.lastSeenIPLocation,
isCurrentSessionDisplayMode: sessionInfo.isCurrent,
isActive: sessionInfo.isActive)
}