Device Manager: Filter sessions

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_filter.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "user_other_sessions_filter.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_filter_selected.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "user_other_sessions_filter_selected.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_verified.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "user_other_sessions_verified.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/en.lproj/Vector.strings

@@ -2437,7 +2437,18 @@ To enable access, tap Settings> Location and select Always";
 "user_other_session_security_recommendation_title" = "Security recommendation";
 "user_other_session_unverified_sessions_header_subtitle" = "Verify your sessions for enhanced secure messaging or sign out from those you don’t recognize or use anymore.";
 "user_other_session_unverified_current_session_details" =  "%@ · Your current session";
-
+"user_other_session_verified_sessions_header_subtitle" = "For best security, sign out from any session that you don’t recognize or use anymore.";
+
+"user_other_session_filter" = "Filter";
+"user_other_session_filter_menu_all" = "All sessions";
+"user_other_session_filter_menu_verified" = "Verified";
+"user_other_session_filter_menu_unverified" = "Unverified";
+"user_other_session_filter_menu_inactive" = "Inactive";
+
+"user_other_session_no_inactive_sessions" = "No inactive sessions found.";
+"user_other_session_no_verified_sessions" = "No verified sessions found.";
+"user_other_session_no_unverified_sessions" = "No unverified sessions found.";
+"user_other_session_clear_filter" = "Clear filter";
 // First item is client name and second item is session display name
 "user_session_name" = "%@: %@";
 

Riot/Generated/Images.swift

@@ -107,8 +107,11 @@ internal class Asset: NSObject {
     internal static let deviceTypeMobile = ImageAsset(name: "device_type_mobile")
     internal static let deviceTypeUnknown = ImageAsset(name: "device_type_unknown")
     internal static let deviceTypeWeb = ImageAsset(name: "device_type_web")
+    internal static let userOtherSessionsFilter = ImageAsset(name: "user_other_sessions_filter")
+    internal static let userOtherSessionsFilterSelected = ImageAsset(name: "user_other_sessions_filter_selected")
     internal static let userOtherSessionsInactive = ImageAsset(name: "user_other_sessions_inactive")
     internal static let userOtherSessionsUnverified = ImageAsset(name: "user_other_sessions_unverified")
+    internal static let userOtherSessionsVerified = ImageAsset(name: "user_other_sessions_verified")
     internal static let userSessionListItemInactiveSession = ImageAsset(name: "user_session_list_item_inactive_session")
     internal static let userSessionUnverified = ImageAsset(name: "user_session_unverified")
     internal static let userSessionVerificationUnknown = ImageAsset(name: "user_session_verification_unknown")

Riot/Generated/Strings.swift

@@ -8635,6 +8635,42 @@ public class VectorL10n: NSObject {
   public static func userInactiveSessionItemWithDate(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "user_inactive_session_item_with_date", p1)
   }
+  /// Clear filter
+  public static var userOtherSessionClearFilter: String { 
+    return VectorL10n.tr("Vector", "user_other_session_clear_filter") 
+  }
+  /// Filter
+  public static var userOtherSessionFilter: String { 
+    return VectorL10n.tr("Vector", "user_other_session_filter") 
+  }
+  /// All sessions
+  public static var userOtherSessionFilterMenuAll: String { 
+    return VectorL10n.tr("Vector", "user_other_session_filter_menu_all") 
+  }
+  /// Inactive
+  public static var userOtherSessionFilterMenuInactive: String { 
+    return VectorL10n.tr("Vector", "user_other_session_filter_menu_inactive") 
+  }
+  /// Unverified
+  public static var userOtherSessionFilterMenuUnverified: String { 
+    return VectorL10n.tr("Vector", "user_other_session_filter_menu_unverified") 
+  }
+  /// Verified
+  public static var userOtherSessionFilterMenuVerified: String { 
+    return VectorL10n.tr("Vector", "user_other_session_filter_menu_verified") 
+  }
+  /// No inactive sessions found.
+  public static var userOtherSessionNoInactiveSessions: String { 
+    return VectorL10n.tr("Vector", "user_other_session_no_inactive_sessions") 
+  }
+  /// No unverified sessions found.
+  public static var userOtherSessionNoUnverifiedSessions: String { 
+    return VectorL10n.tr("Vector", "user_other_session_no_unverified_sessions") 
+  }
+  /// No verified sessions found.
+  public static var userOtherSessionNoVerifiedSessions: String { 
+    return VectorL10n.tr("Vector", "user_other_session_no_verified_sessions") 
+  }
   /// Security recommendation
   public static var userOtherSessionSecurityRecommendationTitle: String { 
     return VectorL10n.tr("Vector", "user_other_session_security_recommendation_title") 
@@ -8647,6 +8683,10 @@ public class VectorL10n: NSObject {
   public static var userOtherSessionUnverifiedSessionsHeaderSubtitle: String { 
     return VectorL10n.tr("Vector", "user_other_session_unverified_sessions_header_subtitle") 
   }
+  /// For best security, sign out from any session that you don’t recognize or use anymore.
+  public static var userOtherSessionVerifiedSessionsHeaderSubtitle: String { 
+    return VectorL10n.tr("Vector", "user_other_session_verified_sessions_header_subtitle") 
+  }
   /// Name
   public static var userSessionDetailsApplicationName: String { 
     return VectorL10n.tr("Vector", "user_session_details_application_name") 

RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift

@@ -141,7 +141,7 @@ final class UserSessionsFlowCoordinator: Coordinator, Presentable {
         return UserSessionOverviewCoordinator(parameters: parameters)
     }
 
-    private func openOtherSessions(sessionInfos: [UserSessionInfo], filterBy filter: OtherUserSessionsFilter) {
+    private func openOtherSessions(sessionInfos: [UserSessionInfo], filterBy filter: UserOtherSessionsFilter) {
         let title = filter == .all ? VectorL10n.userSessionsOverviewOtherSessionsSectionTitle : VectorL10n.userOtherSessionSecurityRecommendationTitle
         let coordinator = createOtherSessionsCoordinator(sessionInfos: sessionInfos,
                                                          filterBy: filter,
@@ -157,7 +157,7 @@ final class UserSessionsFlowCoordinator: Coordinator, Presentable {
     }
 
     private func createOtherSessionsCoordinator(sessionInfos: [UserSessionInfo],
-                                                filterBy filter: OtherUserSessionsFilter,
+                                                filterBy filter: UserOtherSessionsFilter,
                                                 title: String) -> UserOtherSessionsCoordinator {
         let parameters = UserOtherSessionsCoordinatorParameters(sessionInfos: sessionInfos,
                                                                 filter: filter,

RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Coordinator/UserOtherSessionsCoordinator.swift

@@ -19,7 +19,7 @@ import SwiftUI
 
 struct UserOtherSessionsCoordinatorParameters {
     let sessionInfos: [UserSessionInfo]
-    let filter: OtherUserSessionsFilter
+    let filter: UserOtherSessionsFilter
     let title: String
 }
 

RiotSwiftUI/Modules/UserSessions/UserOtherSessions/MockUserOtherSessionsScreenState.swift

@@ -27,6 +27,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
     case all
     case inactiveSessions
     case unverifiedSessions
+    case verifiedSessions
 
     /// The associated screen
     var screenType: Any.Type {
@@ -36,7 +37,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
     /// A list of screen state definitions
     static var allCases: [MockUserOtherSessionsScreenState] {
         // Each of the presence statuses
-        [.all, .inactiveSessions, .unverifiedSessions]
+        [.all, .inactiveSessions, .unverifiedSessions, .verifiedSessions]
     }
 
     /// Generate the view struct for the screen state.
@@ -55,6 +56,10 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
             viewModel = UserOtherSessionsViewModel(sessionInfos: unverifiedSessions(),
                                                    filter: .unverified,
                                                    title: VectorL10n.userOtherSessionSecurityRecommendationTitle)
+        case .verifiedSessions:
+            viewModel = UserOtherSessionsViewModel(sessionInfos: verifiedSessions(),
+                                                   filter: .verified,
+                                                   title: VectorL10n.userOtherSessionSecurityRecommendationTitle)
         }
 
         // can simulate service and viewModel actions here if needs be.
@@ -167,6 +172,41 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
                          isCurrent: false)]
     }
 
+    private func verifiedSessions() -> [UserSessionInfo] {
+        [UserSessionInfo(id: "0",
+                         name: "iOS",
+                         deviceType: .mobile,
+                         verificationState: .verified,
+                         lastSeenIP: "10.0.0.10",
+                         lastSeenTimestamp: nil,
+                         applicationName: nil,
+                         applicationVersion: nil,
+                         applicationURL: nil,
+                         deviceModel: nil,
+                         deviceOS: nil,
+                         lastSeenIPLocation: nil,
+                         clientName: nil,
+                         clientVersion: nil,
+                         isActive: true,
+                         isCurrent: true),
+         UserSessionInfo(id: "1",
+                         name: "macOS",
+                         deviceType: .desktop,
+                         verificationState: .verified,
+                         lastSeenIP: "1.0.0.1",
+                         lastSeenTimestamp: Date().timeIntervalSince1970 - 8_000_000,
+                         applicationName: nil,
+                         applicationVersion: nil,
+                         applicationURL: nil,
+                         deviceModel: nil,
+                         deviceOS: nil,
+                         lastSeenIPLocation: nil,
+                         clientName: nil,
+                         clientVersion: nil,
+                         isActive: true,
+                         isCurrent: false)]
+    }
+
     private func allSessions() -> [UserSessionInfo] {
         [UserSessionInfo(id: "0",
                          name: "iOS",

RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift

@@ -21,7 +21,7 @@ class UserOtherSessionsUITests: MockScreenTestCase {
     func test_whenOtherSessionsWithInactiveSessionFilterPresented_correctHeaderDisplayed() {
         app.goToScreenWithIdentifier(MockUserOtherSessionsScreenState.inactiveSessions.title)
 
-        XCTAssertTrue(app.staticTexts[VectorL10n.userSessionsOverviewSecurityRecommendationsInactiveTitle].exists)
+        XCTAssertTrue(app.staticTexts[VectorL10n.userOtherSessionFilterMenuInactive].exists)
         XCTAssertTrue(app.staticTexts[VectorL10n.userSessionsOverviewSecurityRecommendationsInactiveInfo].exists)
     }
 
@@ -34,7 +34,7 @@ class UserOtherSessionsUITests: MockScreenTestCase {
     func test_whenOtherSessionsWithUnverifiedSessionFilterPresented_correctHeaderDisplayed() {
         app.goToScreenWithIdentifier(MockUserOtherSessionsScreenState.unverifiedSessions.title)
 
-        XCTAssertTrue(app.staticTexts[VectorL10n.userSessionsOverviewSecurityRecommendationsUnverifiedTitle].exists)
+        XCTAssertTrue(app.staticTexts[VectorL10n.userSessionUnverifiedShort].exists)
         XCTAssertTrue(app.staticTexts[VectorL10n.userOtherSessionUnverifiedSessionsHeaderSubtitle].exists)
     }
 
@@ -49,4 +49,11 @@ class UserOtherSessionsUITests: MockScreenTestCase {
 
         XCTAssertTrue(app.staticTexts[VectorL10n.userSessionsOverviewOtherSessionsSectionInfo].exists)
     }
+
+    func test_whenOtherSessionsWithVerifiedSessionFilterPresented_correctHeaderDisplayed() {
+        app.goToScreenWithIdentifier(MockUserOtherSessionsScreenState.verifiedSessions.title)
+
+        XCTAssertTrue(app.staticTexts[VectorL10n.userSessionVerifiedShort].exists)
+        XCTAssertTrue(app.staticTexts[VectorL10n.userOtherSessionVerifiedSessionsHeaderSubtitle].exists)
+    }
 }