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

Merge branch 'develop' into aleksandrs/6838_filter_sessions

Browse Source 
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
This commit is contained in:
Aleksandrs Proskurins
2022-10-12 10:58:04 +03:00
parent 56754ec9b8 3279f58ec4
commit 20be525f16
70 changed files with 1869 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/MockUserOtherSessionsScreenState.swift
+14 -14
View File
@@ -74,7 +74,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
[UserSessionInfo(id: "0",
name: "iOS",
deviceType: .mobile,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: nil,
applicationName: nil,
@@ -90,7 +90,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "1",
name: "macOS",
deviceType: .desktop,
isVerified: true,
verificationState: .verified,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 8_000_000,
applicationName: nil,
@@ -106,7 +106,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "2",
name: "Firefox on Windows",
deviceType: .web,
isVerified: true,
verificationState: .verified,
lastSeenIP: "2.0.0.2",
lastSeenTimestamp: Date().timeIntervalSince1970 - 9_000_000,
applicationName: nil,
@@ -122,7 +122,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "3",
name: "Android",
deviceType: .mobile,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "3.0.0.3",
lastSeenTimestamp: Date().timeIntervalSince1970 - 10_000_000,
applicationName: nil,
@@ -141,7 +141,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
[UserSessionInfo(id: "0",
name: "iOS",
deviceType: .mobile,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: nil,
applicationName: nil,
@@ -157,7 +157,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "1",
name: "macOS",
deviceType: .desktop,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 8_000_000,
applicationName: nil,
@@ -176,7 +176,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
[UserSessionInfo(id: "0",
name: "iOS",
deviceType: .mobile,
isVerified: true,
verificationState: .verified,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: nil,
applicationName: nil,
@@ -192,7 +192,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "1",
name: "macOS",
deviceType: .desktop,
isVerified: true,
verificationState: .verified,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 8_000_000,
applicationName: nil,
@@ -211,7 +211,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
[UserSessionInfo(id: "0",
name: "iOS",
deviceType: .mobile,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: Date().timeIntervalSince1970 - 500_000,
applicationName: nil,
@@ -227,7 +227,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "1",
name: "macOS",
deviceType: .desktop,
isVerified: true,
verificationState: .verified,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 8_000_000,
applicationName: nil,
@@ -243,7 +243,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "2",
name: "Firefox on Windows",
deviceType: .web,
isVerified: true,
verificationState: .verified,
lastSeenIP: "2.0.0.2",
lastSeenTimestamp: Date().timeIntervalSince1970 - 9_000_000,
applicationName: nil,
@@ -259,7 +259,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "3",
name: "Android",
deviceType: .mobile,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "3.0.0.3",
lastSeenTimestamp: Date().timeIntervalSince1970 - 10_000_000,
applicationName: nil,
@@ -275,7 +275,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "4",
name: "iOS",
deviceType: .mobile,
isVerified: false,
verificationState: .unverified,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: Date().timeIntervalSince1970 - 11_000_000,
applicationName: nil,
@@ -291,7 +291,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
UserSessionInfo(id: "5",
name: "macOS",
deviceType: .desktop,
isVerified: true,
verificationState: .verified,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 20_000_000,
applicationName: nil,
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
+1 -1
View File
@@ -145,7 +145,7 @@ class UserOtherSessionsViewModelTests: XCTestCase {
UserSessionInfo(id: sessionId,
name: "iOS",
deviceType: .mobile,
isVerified: isVerified,
verificationState: isVerified ? .verified : .unverified,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: Date().timeIntervalSince1970 - 100,
applicationName: nil,
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
+2 -2
View File
@@ -79,9 +79,9 @@ class UserOtherSessionsViewModel: UserOtherSessionsViewModelType, UserOtherSessi
case .inactive:
return sessionInfos.filter { !$0.isActive }
case .unverified:
return sessionInfos.filter { !$0.isVerified }
return sessionInfos.filter { $0.verificationState != .verified }
case .verified:
return sessionInfos.filter(\.isVerified)
return sessionInfos.filter {$0.verificationState == .verified}
}
}