Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned up various things around the UserSessionsOverviewService

Browse source
This commit is contained in:
Stefan Ceriu 2022-09-26 20:27:06 +03:00 committed by Stefan Ceriu
parent cd596c899b
commit 2c9596c912
5 changed files with 85 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsOverviewService.swift
View file

@ -20,59 +20,97 @@ import MatrixSDK
class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
private let mxSession: MXSession
private(set) var lastOverviewData: UserSessionsOverviewData
private(set) var overviewData: UserSessionsOverviewData
init(mxSession: MXSession) {
self.mxSession = mxSession
lastOverviewData = UserSessionsOverviewData(currentSessionInfo: nil,
unverifiedSessionsInfo: [],
inactiveSessionsInfo: [],
otherSessionsInfo: [])
overviewData = UserSessionsOverviewData(currentSession: nil,
unverifiedSessions: [],
inactiveSessions: [],
otherSessions: [])
setupInitialOverviewData()
}
// MARK: - Public
func fetchUserSessionsOverviewData(completion: @escaping (Result<UserSessionsOverviewData, Error>) -> Void) {
func updateOverviewData(completion: @escaping (Result<UserSessionsOverviewData, Error>) -> Void) {
mxSession.matrixRestClient.devices { response in
switch response {
case .success(let devices):
self.lastOverviewData = self.userSessionsOverviewData(from: devices)
completion(.success(self.lastOverviewData))
self.overviewData = self.sessionsOverviewData(from: devices)
completion(.success(self.overviewData))
case .failure(let error):
completion(.failure(error))
}
}
}
func getOtherSession(sessionId: String) -> UserSessionInfo? {
lastOverviewData.otherSessionsInfo.first(where: {$0.sessionId == sessionId})
func sessionForIdentifier(_ sessionId: String) -> UserSessionInfo? {
if overviewData.currentSession?.id == sessionId {
return overviewData.currentSession
}
return overviewData.otherSessions.first(where: { $0.sessionId == sessionId })
}
// MARK: - Private
private func setupInitialOverviewData() {
let currentSessionInfo = getCurrentUserSessionInfoFromCache()
let currentSessionInfo = currentSessionInfo()
lastOverviewData = UserSessionsOverviewData(currentSessionInfo: currentSessionInfo, unverifiedSessionsInfo: [], inactiveSessionsInfo: [], otherSessionsInfo: [])
overviewData = UserSessionsOverviewData(currentSession: currentSessionInfo,
unverifiedSessions: [],
inactiveSessions: [],
otherSessions: [])
}
private func getCurrentUserSessionInfoFromCache() -> UserSessionInfo? {
guard let mainAccount = MXKAccountManager.shared().activeAccounts.first, let device = mainAccount.device else {
private func currentSessionInfo() -> UserSessionInfo? {
guard let mainAccount = MXKAccountManager.shared().activeAccounts.first,
let device = mainAccount.device else {
return nil
}
return userSessionInfo(from: device)
return sessionInfo(from: device)
}
private func userSessionInfo(from device: MXDevice) -> UserSessionInfo {
let deviceInfo = getDeviceInfo(for: device.deviceId)
private func sessionsOverviewData(from devices: [MXDevice]) -> UserSessionsOverviewData {
let allSessions = devices
.sorted { $0.lastSeenTs > $1.lastSeenTs }
.map { sessionInfo(from: $0) }
let isSessionVerified = deviceInfo?.trustLevel.isVerified ?? false
var currentSession: UserSessionInfo?
var unverifiedSessions: [UserSessionInfo] = []
var inactiveSessions: [UserSessionInfo] = []
var otherSessions: [UserSessionInfo] = []
for session in allSessions {
guard session.sessionId != mxSession.myDeviceId else {
currentSession = session
continue
}
otherSessions.append(session)
if session.isVerified == false {
unverifiedSessions.append(session)
}
if session.isSessionActive == false {
inactiveSessions.append(session)
}
}
return UserSessionsOverviewData(currentSession: currentSession,
unverifiedSessions: unverifiedSessions,
inactiveSessions: inactiveSessions,
otherSessions: otherSessions)
}
private func sessionInfo(from device: MXDevice) -> UserSessionInfo {
let isSessionVerified = deviceInfo(for: device.deviceId)?.trustLevel.isVerified ?? false
var lastSeenTs: TimeInterval?
if device.lastSeenTs > 0 {
lastSeenTs = TimeInterval(device.lastSeenTs / 1000)
}
@ -85,48 +123,11 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
lastSeenTimestamp: lastSeenTs)
}
private func getDeviceInfo(for deviceId: String) -> MXDeviceInfo? {
private func deviceInfo(for deviceId: String) -> MXDeviceInfo? {
guard let userId = mxSession.myUserId else {
return nil
}
return mxSession.crypto.device(withDeviceId: deviceId, ofUser: userId)
}
private func userSessionsOverviewData(from devices: [MXDevice]) -> UserSessionsOverviewData {
let sortedDevices = devices.sorted { device1, device2 in
device1.lastSeenTs > device2.lastSeenTs
}
let allUserSessionInfo = sortedDevices.map { device in
return userSessionInfo(from: device)
}
var currentSessionInfo: UserSessionInfo?
var unverifiedSessionsInfo: [UserSessionInfo] = []
var inactiveSessionsInfo: [UserSessionInfo] = []
var otherSessionsInfo: [UserSessionInfo] = []
for userSessionInfo in allUserSessionInfo {
if userSessionInfo.sessionId == mxSession.myDeviceId {
currentSessionInfo = userSessionInfo
} else {
otherSessionsInfo.append(userSessionInfo)
if userSessionInfo.isVerified == false {
unverifiedSessionsInfo.append(userSessionInfo)
}
if userSessionInfo.isSessionActive == false {
inactiveSessionsInfo.append(userSessionInfo)
}
}
}
return UserSessionsOverviewData(currentSessionInfo: currentSessionInfo,
unverifiedSessionsInfo: unverifiedSessionsInfo,
inactiveSessionsInfo: inactiveSessionsInfo,
otherSessionsInfo: otherSessionsInfo)
}
}

16
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
View file

@ -17,13 +17,13 @@
import Foundation
class MockUserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
var lastOverviewData: UserSessionsOverviewData
var overviewData: UserSessionsOverviewData
func fetchUserSessionsOverviewData(completion: @escaping (Result<UserSessionsOverviewData, Error>) -> Void) {
completion(.success(lastOverviewData))
func updateOverviewData(completion: @escaping (Result<UserSessionsOverviewData, Error>) -> Void) {
completion(.success(overviewData))
}
func getOtherSession(sessionId: String) -> UserSessionInfo? {
func sessionForIdentifier(_ sessionId: String) -> UserSessionInfo? {
nil
}
@ -40,9 +40,9 @@ class MockUserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
UserSessionInfo(sessionId: "3", sessionName: "Android", deviceType: .mobile, isVerified: false, lastSeenIP: "3.0.0.3", lastSeenTimestamp: (Date().timeIntervalSince1970 - 10))
]
lastOverviewData = UserSessionsOverviewData(currentSessionInfo: currentSessionInfo,
unverifiedSessionsInfo: unverifiedSessionsInfo,
inactiveSessionsInfo: inactiveSessionsInfo,
otherSessionsInfo: otherSessionsInfo)
overviewData = UserSessionsOverviewData(currentSession: currentSessionInfo,
unverifiedSessions: unverifiedSessionsInfo,
inactiveSessions: inactiveSessionsInfo,
otherSessions: otherSessionsInfo)
}
}

16
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/UserSessionsOverviewServiceProtocol.swift
View file

@ -17,16 +17,16 @@
import Foundation
struct UserSessionsOverviewData {
let currentSessionInfo: UserSessionInfo?
let unverifiedSessionsInfo: [UserSessionInfo]
let inactiveSessionsInfo: [UserSessionInfo]
let otherSessionsInfo: [UserSessionInfo]
let currentSession: UserSessionInfo?
let unverifiedSessions: [UserSessionInfo]
let inactiveSessions: [UserSessionInfo]
let otherSessions: [UserSessionInfo]
}
protocol UserSessionsOverviewServiceProtocol {
var lastOverviewData: UserSessionsOverviewData { get }
func fetchUserSessionsOverviewData(completion: @escaping (Result<UserSessionsOverviewData, Error>) -> Void) -> Void
var overviewData: UserSessionsOverviewData { get }
func getOtherSession(sessionId: String) -> UserSessionInfo?
func updateOverviewData(completion: @escaping (Result<UserSessionsOverviewData, Error>) -> Void) -> Void
func sessionForIdentifier(_ sessionId: String) -> UserSessionInfo?
}

20
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewViewModel.swift
View file

@ -30,7 +30,7 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
super.init(initialViewState: .init())
updateViewState(with: userSessionsOverviewService.lastOverviewData)
updateViewState(with: userSessionsOverviewService.overviewData)
}
// MARK: - Public
@ -42,8 +42,8 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
case .verifyCurrentSession:
completion?(.verifyCurrentSession)
case .viewCurrentSessionDetails:
guard let currentSessionInfo = userSessionsOverviewService.lastOverviewData.currentSessionInfo else {
assertionFailure("currentSessionInfo should be present")
guard let currentSessionInfo = userSessionsOverviewService.overviewData.currentSession else {
assertionFailure("Missing current session")
return
}
completion?(.showCurrentSessionOverview(sessionInfo: currentSessionInfo))
@ -54,8 +54,8 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
case .viewAllOtherSessions:
completion?(.showAllOtherSessions)
case .tapUserSession(let sessionId):
guard let sessionInfo = userSessionsOverviewService.getOtherSession(sessionId: sessionId) else {
assertionFailure("missing session info")
guard let sessionInfo = userSessionsOverviewService.sessionForIdentifier(sessionId) else {
assertionFailure("Missing session info")
return
}
completion?(.showUserSessionOverview(sessionInfo: sessionInfo))
@ -65,11 +65,11 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
// MARK: - Private
private func updateViewState(with userSessionsViewData: UserSessionsOverviewData) {
state.unverifiedSessionsViewData = userSessionsViewData.unverifiedSessionsInfo.asViewData()
state.inactiveSessionsViewData = userSessionsViewData.inactiveSessionsInfo.asViewData()
state.otherSessionsViewData = userSessionsViewData.otherSessionsInfo.asViewData()
state.unverifiedSessionsViewData = userSessionsViewData.unverifiedSessions.asViewData()
state.inactiveSessionsViewData = userSessionsViewData.inactiveSessions.asViewData()
state.otherSessionsViewData = userSessionsViewData.otherSessions.asViewData()
if let currentSessionInfo = userSessionsViewData.currentSessionInfo {
if let currentSessionInfo = userSessionsViewData.currentSession {
state.currentSessionViewData = UserSessionCardViewData(userSessionInfo: currentSessionInfo, isCurrentSessionDisplayMode: true)
}
}
@ -77,7 +77,7 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
private func loadData() {
state.showLoadingIndicator = true
userSessionsOverviewService.fetchUserSessionsOverviewData { [weak self] result in
userSessionsOverviewService.updateOverviewData { [weak self] result in
guard let self = self else {
return
}

2
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItem.swift
View file

@ -68,7 +68,7 @@ struct UserSessionListPreview: View {
var body: some View {
VStack(alignment: .leading, spacing: 0) {
ForEach(userSessionsOverviewService.lastOverviewData.otherSessionsInfo) { userSessionInfo in
ForEach(userSessionsOverviewService.overviewData.otherSessions) { userSessionInfo in
let viewData = UserSessionListItemViewData(userSessionInfo: userSessionInfo)
UserSessionListItem(viewData: viewData, onBackgroundTap: { sessionId in