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

Moved isCurrentSession into UserSessionInfo

Browse Source
This commit is contained in:
Aleksandrs Proskurins
2022-09-27 15:36:44 +03:00
parent 2ba14b6d14
commit ed8d2f1083
15 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsOverviewService.swift
+16 -16
View File
@@ -71,13 +71,13 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
let device = mainAccount.device else {
return nil
}
return sessionInfo(from: device)
return sessionInfo(from: device, isCurrentSession: true)
}
private func sessionsOverviewData(from devices: [MXDevice]) -> UserSessionsOverviewData {
let allSessions = devices
.sorted { $0.lastSeenTs > $1.lastSeenTs }
.map { sessionInfo(from: $0) }
.map { sessionInfo(from: $0, isCurrentSession: $0.deviceId == mxSession.myDeviceId) }
var currentSession: UserSessionInfo?
var unverifiedSessions: [UserSessionInfo] = []
@@ -85,19 +85,18 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
var otherSessions: [UserSessionInfo] = []
for session in allSessions {
guard session.sessionId != mxSession.myDeviceId else {
if session.isCurrentSession {
currentSession = session
continue
}
otherSessions.append(session)
if session.isVerified == false {
unverifiedSessions.append(session)
}
if session.isSessionActive == false {
inactiveSessions.append(session)
} else {
otherSessions.append(session)
if session.isVerified == false {
unverifiedSessions.append(session)
}
if session.isSessionActive == false {
inactiveSessions.append(session)
}
}
}
@@ -107,7 +106,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
otherSessions: otherSessions)
}
private func sessionInfo(from device: MXDevice) -> UserSessionInfo {
private func sessionInfo(from device: MXDevice, isCurrentSession: Bool) -> UserSessionInfo {
let isSessionVerified = deviceInfo(for: device.deviceId)?.trustLevel.isVerified ?? false
var lastSeenTs: TimeInterval?
@@ -120,7 +119,8 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
deviceType: .unknown,
isVerified: isSessionVerified,
lastSeenIP: device.lastSeenIp,
lastSeenTimestamp: lastSeenTs)
lastSeenTimestamp: lastSeenTs,
isCurrentSession: isCurrentSession)
}
private func deviceInfo(for deviceId: String) -> MXDeviceInfo? {
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
+4 -4
View File
@@ -28,16 +28,16 @@ class MockUserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
}
init() {
let currentSessionInfo = UserSessionInfo(sessionId: "alice", sessionName: "iOS", deviceType: .mobile, isVerified: false, lastSeenIP: "10.0.0.10", lastSeenTimestamp: nil)
let currentSessionInfo = UserSessionInfo(sessionId: "alice", sessionName: "iOS", deviceType: .mobile, isVerified: false, lastSeenIP: "10.0.0.10", lastSeenTimestamp: nil, isCurrentSession: true)
let unverifiedSessionsInfo: [UserSessionInfo] = []
let inactiveSessionsInfo: [UserSessionInfo] = []
let otherSessionsInfo: [UserSessionInfo] = [
UserSessionInfo(sessionId: "1", sessionName: "macOS", deviceType: .desktop, isVerified: true, lastSeenIP: "1.0.0.1", lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000),
UserSessionInfo(sessionId: "2", sessionName: "Firefox on Windows", deviceType: .web, isVerified: true, lastSeenIP: "2.0.0.2", lastSeenTimestamp: Date().timeIntervalSince1970 - 100),
UserSessionInfo(sessionId: "3", sessionName: "Android", deviceType: .mobile, isVerified: false, lastSeenIP: "3.0.0.3", lastSeenTimestamp: Date().timeIntervalSince1970 - 10)
UserSessionInfo(sessionId: "1", sessionName: "macOS", deviceType: .desktop, isVerified: true, lastSeenIP: "1.0.0.1", lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000, isCurrentSession: false),
UserSessionInfo(sessionId: "2", sessionName: "Firefox on Windows", deviceType: .web, isVerified: true, lastSeenIP: "2.0.0.2", lastSeenTimestamp: Date().timeIntervalSince1970 - 100, isCurrentSession: false),
UserSessionInfo(sessionId: "3", sessionName: "Android", deviceType: .mobile, isVerified: false, lastSeenIP: "3.0.0.3", lastSeenTimestamp: Date().timeIntervalSince1970 - 10, isCurrentSession: false)
]
overviewData = UserSessionsOverviewData(currentSession: currentSessionInfo,