Implemented PSG-680 - Sessions overview security recommendations

- remove uppercased strings from localizables
- moved inactivity computation to the service

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsOverviewService.swift

@@ -18,6 +18,9 @@ import Foundation
 import MatrixSDK
 
 class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
+    /// Delay after which session is considered inactive, 90 days
+    static private let inactiveSessionDurationTreshold: TimeInterval = 90 * 86400
+    
     private let mxSession: MXSession
     
     private(set) var overviewData: UserSessionsOverviewData
@@ -52,7 +55,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
             return overviewData.currentSession
         }
         
-        return overviewData.otherSessions.first(where: { $0.sessionId == sessionId })
+        return overviewData.otherSessions.first(where: { $0.id == sessionId })
     }
     
     // MARK: - Private
@@ -85,7 +88,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
         var otherSessions: [UserSessionInfo] = []
         
         for session in allSessions {
-            if session.isCurrentSession {
+            if session.isCurrent {
                 currentSession = session
             } else {
                 otherSessions.append(session)
@@ -94,7 +97,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
                     unverifiedSessions.append(session)
                 }
                 
-                if session.isSessionActive == false {
+                if session.isActive == false {
                     inactiveSessions.append(session)
                 }
             }
@@ -114,13 +117,20 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
             lastSeenTs = TimeInterval(device.lastSeenTs / 1000)
         }
         
-        return UserSessionInfo(sessionId: device.deviceId,
-                               sessionName: device.displayName,
+        var isSessionActive = true
+        if let lastSeenTimestamp = lastSeenTs {
+            let elapsedTime = Date().timeIntervalSince1970 - lastSeenTimestamp
+            isSessionActive = elapsedTime < Self.inactiveSessionDurationTreshold
+        }
+        
+        return UserSessionInfo(id: device.deviceId,
+                               name: device.displayName,
                                deviceType: .unknown,
                                isVerified: isSessionVerified,
                                lastSeenIP: device.lastSeenIp,
                                lastSeenTimestamp: lastSeenTs,
-                               isCurrentSession: isCurrentSession)
+                               isActive: isSessionActive,
+                               isCurrent: isCurrentSession)
     }
     
     private func deviceInfo(for deviceId: String) -> MXDeviceInfo? {

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift

@@ -28,21 +28,49 @@ class MockUserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
     }
     
     init() {
-        let currentSessionInfo = UserSessionInfo(sessionId: "alice", sessionName: "iOS", deviceType: .mobile, isVerified: false, lastSeenIP: "10.0.0.10", lastSeenTimestamp: nil, isCurrentSession: true)
+        let currentSession = UserSessionInfo(id: "alice",
+                                             name: "iOS",
+                                             deviceType: .mobile,
+                                             isVerified: false,
+                                             lastSeenIP: "10.0.0.10",
+                                             lastSeenTimestamp: nil,
+                                             isActive: true,
+                                             isCurrent: 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, 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)
+        let otherSessions: [UserSessionInfo] = [
+            UserSessionInfo(id: "1",
+                            name: "macOS",
+                            deviceType: .desktop,
+                            isVerified: true,
+                            lastSeenIP: "1.0.0.1",
+                            lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000,
+                            isActive: false,
+                            isCurrent: false),
+            UserSessionInfo(id: "2",
+                            name: "Firefox on Windows",
+                            deviceType: .web,
+                            isVerified: true,
+                            lastSeenIP: "2.0.0.2",
+                            lastSeenTimestamp: Date().timeIntervalSince1970 - 100,
+                            isActive: true,
+                            isCurrent: false),
+            UserSessionInfo(id: "3",
+                            name: "Android",
+                            deviceType: .mobile,
+                            isVerified: false,
+                            lastSeenIP: "3.0.0.3",
+                            lastSeenTimestamp: Date().timeIntervalSince1970 - 10,
+                            isActive: true,
+                            isCurrent: false)
         ]
         
-        overviewData = UserSessionsOverviewData(currentSession: currentSessionInfo,
-                                                unverifiedSessions: unverifiedSessionsInfo,
-                                                inactiveSessions: inactiveSessionsInfo,
-                                                otherSessions: otherSessionsInfo)
+        let unverifiedSessions: [UserSessionInfo] = otherSessions.filter { !$0.isVerified }
+        
+        let inactiveSessions: [UserSessionInfo] = otherSessions.filter { !$0.isActive }
+        
+        overviewData = UserSessionsOverviewData(currentSession: currentSession,
+                                                unverifiedSessions: unverifiedSessions,
+                                                inactiveSessions: inactiveSessions,
+                                                otherSessions: otherSessions)
     }
 }

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/SecurityRecommendationCard.swift

@@ -0,0 +1,111 @@
+//
+// Copyright 2022 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+
+struct SecurityRecommendationCard: View {
+    enum Style {
+        case unverified
+        case inactive
+    }
+    
+    @Environment(\.theme) var theme: ThemeSwiftUI
+    
+    let style: SecurityRecommendationCard.Style
+    let sessionCount: Int
+    let action: () -> Void
+    
+    var body: some View {
+        HStack(alignment: .top) {
+            Image(iconName)
+            VStack(alignment: .leading, spacing: 16.0) {
+                VStack(alignment: .leading, spacing: 8.0) {
+                    Text(title)
+                        .font(theme.fonts.calloutSB)
+                        .foregroundColor(theme.colors.primaryContent)
+                    
+                    Text(subtitle)
+                        .font(theme.fonts.footnote)
+                        .foregroundColor(theme.colors.secondaryContent)
+                }
+                
+                Button {
+                    action()
+                } label: {
+                    Text(buttonTitle)
+                        .font(theme.fonts.body)
+                }
+                .foregroundColor(theme.colors.accent)
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+        .padding(16)
+        .background(theme.colors.background)
+        .clipShape(backgroundShape)
+        .shapedBorder(color: theme.colors.quinaryContent, borderWidth: 1.0, shape: backgroundShape)
+    }
+    
+    private var backgroundShape: RoundedRectangle {
+        RoundedRectangle(cornerRadius: 8)
+    }
+    
+    private var iconName: String {
+        switch style {
+        case .unverified:
+            return Asset.Images.userSessionsUnverified.name
+        case .inactive:
+            return Asset.Images.userSessionsInactive.name
+        }
+    }
+    
+    private var title: String {
+        switch style {
+        case .unverified:
+            return VectorL10n.userSessionsOverviewSecurityRecommendationsUnverifiedTitle
+        case .inactive:
+            return VectorL10n.userSessionsOverviewSecurityRecommendationsInactiveTitle
+        }
+    }
+    
+    private var subtitle: String {
+        switch style {
+        case .unverified:
+            return VectorL10n.userSessionsOverviewSecurityRecommendationsUnverifiedInfo
+        case .inactive:
+            return VectorL10n.userSessionsOverviewSecurityRecommendationsInactiveInfo
+        }
+    }
+    
+    private var buttonTitle: String {
+        VectorL10n.userSessionsViewAllAction(sessionCount)
+    }
+}
+
+struct SecurityRecommendationCard_Previews: PreviewProvider {
+    static var previews: some View {
+        body.theme(.light).preferredColorScheme(.light)
+        body.theme(.dark).preferredColorScheme(.dark)
+    }
+
+    @ViewBuilder
+    static var body: some View {
+        VStack {
+            SecurityRecommendationCard(style: .unverified, sessionCount: 4, action: { })
+            SecurityRecommendationCard(style: .inactive, sessionCount: 100, action: { })
+        }
+    }
+}

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift

@@ -69,6 +69,10 @@ struct UserSessionListItemViewData: Identifiable {
 
 extension UserSessionListItemViewData {
     init(session: UserSessionInfo) {
-        self.init(sessionId: session.sessionId, sessionDisplayName: session.sessionName, deviceType: session.deviceType, isVerified: session.isVerified, lastActivityDate: session.lastSeenTimestamp)
+        self.init(sessionId: session.id,
+                  sessionDisplayName: session.name,
+                  deviceType: session.deviceType,
+                  isVerified: session.isVerified,
+                  lastActivityDate: session.lastSeenTimestamp)
     }
 }

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift

@@ -19,43 +19,14 @@ import SwiftUI
 struct UserSessionsOverview: View {
     @Environment(\.theme) private var theme: ThemeSwiftUI
     
-    @ViewBuilder
-    private var currentSessionsSection: some View {
-        if let currentSessionViewData = viewModel.viewState.currentSessionViewData {
-            SwiftUI.Section {
-                UserSessionCardView(viewData: currentSessionViewData, onVerifyAction: { _ in
-                    viewModel.send(viewAction: .verifyCurrentSession)
-                }, onViewDetailsAction: { _ in
-                    viewModel.send(viewAction: .viewCurrentSessionDetails)
-                })
-                .padding(.horizontal, 16)
-            } header: {
-                Text(VectorL10n.userSessionsOverviewCurrentSessionSectionTitle)
-                    .font(theme.fonts.footnote)
-                    .foregroundColor(theme.colors.secondaryContent)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .padding(.horizontal, 16)
-                    .padding(.top, 24)
-                    .padding(.bottom, 11)
-            }
-        }
-    }
-    
-    // MARK: Public
-    
     @ObservedObject var viewModel: UserSessionsOverviewViewModel.Context
     
     var body: some View {
         ScrollView {
-            // Security recommendations section
-            if viewModel.viewState.unverifiedSessionsViewData.isEmpty == false || viewModel.viewState.inactiveSessionsViewData.isEmpty == false {
-                // TODO:
-            }
+            securityRecommendationsSection
             
-            // Current session section
             currentSessionsSection
             
-            // Other sessions section
             if viewModel.viewState.otherSessionsViewData.isEmpty == false {
                 otherSessionsSection
             }
@@ -68,6 +39,69 @@ struct UserSessionsOverview: View {
             viewModel.send(viewAction: .viewAppeared)
         }
     }
+    
+    @ViewBuilder
+    private var securityRecommendationsSection: some View {
+        if hasSecurityRecommendations {
+            SwiftUI.Section {
+                if !viewModel.viewState.unverifiedSessionsViewData.isEmpty {
+                    SecurityRecommendationCard(style: .unverified,
+                                               sessionCount: viewModel.viewState.unverifiedSessionsViewData.count) {
+                        viewModel.send(viewAction: .viewAllUnverifiedSessions)
+                    }
+                }
+                
+                if !viewModel.viewState.inactiveSessionsViewData.isEmpty {
+                    SecurityRecommendationCard(style: .inactive,
+                                               sessionCount: viewModel.viewState.inactiveSessionsViewData.count) {
+                        viewModel.send(viewAction: .viewAllInactiveSessions)
+                    }
+                }
+            } header: {
+                VStack(alignment: .leading) {
+                    Text(VectorL10n.userSessionsOverviewSecurityRecommendationsSectionTitle)
+                        .textCase(.uppercase)
+                        .font(theme.fonts.footnote)
+                        .foregroundColor(theme.colors.secondaryContent)
+                        .padding(.bottom, 8.0)
+                    
+                    Text(VectorL10n.userSessionsOverviewSecurityRecommendationsSectionInfo)
+                        .font(theme.fonts.footnote)
+                        .foregroundColor(theme.colors.secondaryContent)
+                        .padding(.bottom, 12.0)
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(.top, 24)
+            }
+            .padding(.horizontal, 16)
+        }
+    }
+    
+    var hasSecurityRecommendations: Bool {
+        !viewModel.viewState.unverifiedSessionsViewData.isEmpty || !viewModel.viewState.inactiveSessionsViewData.isEmpty
+    }
+    
+    @ViewBuilder
+    private var currentSessionsSection: some View {
+        if let currentSessionViewData = viewModel.viewState.currentSessionViewData {
+            SwiftUI.Section {
+                UserSessionCardView(viewData: currentSessionViewData, onVerifyAction: { _ in
+                    viewModel.send(viewAction: .verifyCurrentSession)
+                }, onViewDetailsAction: { _ in
+                    viewModel.send(viewAction: .viewCurrentSessionDetails)
+                })
+            } header: {
+                Text(VectorL10n.userSessionsOverviewCurrentSessionSectionTitle)
+                    .textCase(.uppercase)
+                    .font(theme.fonts.footnote)
+                    .foregroundColor(theme.colors.secondaryContent)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(.bottom, 12.0)
+                    .padding(.top, 24.0)
+            }
+            .padding(.horizontal, 16)
+        }
+    }
 
     private var otherSessionsSection: some View {
         SwiftUI.Section {
@@ -83,17 +117,19 @@ struct UserSessionsOverview: View {
         } header: {
             VStack(alignment: .leading) {
                 Text(VectorL10n.userSessionsOverviewOtherSessionsSectionTitle)
+                    .textCase(.uppercase)
                     .font(theme.fonts.footnote)
                     .foregroundColor(theme.colors.secondaryContent)
-                    .padding(.bottom, 10)
+                    .padding(.bottom, 8.0)
                 
                 Text(VectorL10n.userSessionsOverviewOtherSessionsSectionInfo)
                     .font(theme.fonts.footnote)
                     .foregroundColor(theme.colors.secondaryContent)
-                    .padding(.bottom, 11)
+                    .padding(.bottom, 12.0)
             }
-            .padding(.horizontal, 16)
-            .padding(.top, 24)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.horizontal, 16.0)
+            .padding(.top, 24.0)
         }
     }
 }