From 55d0a06fc19dcba0f0dbb3a9b9fe5f682e2b2a5d Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 29 Aug 2022 13:35:32 +0300
Subject: [PATCH 01/17] Create security recommendations section header.

---
 .../src/main/res/values/strings.xml           |  2 ++
 .../res/layout/fragment_settings_devices.xml  | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index f8eb4b8de0..2411492c72 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3225,5 +3225,7 @@
     <string name="device_manager_other_sessions_view_all">View All (%1$d)</string>
     <string name="device_manager_other_sessions_description_verified">Verified · Last activity %1$s</string>
     <string name="device_manager_other_sessions_description_unverified">Unverified · Last activity %1$s</string>
+    <string name="device_manager_header_section_security_recommendations_title">Security recommendations</string>
+    <string name="device_manager_header_section_security_recommendations_description">Improve your account security by following these recommendations.</string>
 
 </resources>
diff --git a/vector/src/main/res/layout/fragment_settings_devices.xml b/vector/src/main/res/layout/fragment_settings_devices.xml
index 1367835d2c..8b4df5070b 100644
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@@ -8,6 +8,26 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <im.vector.app.features.settings.devices.v2.list.DevicesListHeaderView
+            android:id="@+id/deviceListHeaderSectionSecurityRecommendations"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:devicesListHeaderDescription="@string/device_manager_header_section_security_recommendations_description"
+            app:devicesListHeaderTitle="@string/device_manager_header_section_security_recommendations_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/deviceListSecurityRecommendationsDivider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/divider_horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations" />
+
         <im.vector.app.features.settings.devices.v2.list.DevicesListHeaderView
             android:id="@+id/deviceListHeaderCurrentSession"
             android:layout_width="0dp"
@@ -16,7 +36,7 @@
             app:devicesListHeaderTitle="@string/device_manager_header_section_current_session"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/deviceListSecurityRecommendationsDivider" />
 
         <im.vector.app.features.settings.devices.v2.list.CurrentSessionView
             android:id="@+id/deviceListCurrentSession"

From 7e8bbda8563644110668a44d77ea5d73208b1b47 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 29 Aug 2022 15:41:58 +0300
Subject: [PATCH 02/17] Create security recommendations view layout.

---
 .../src/main/res/values/strings.xml           |  4 ++
 .../ui-styles/src/main/res/values/colors.xml  |  1 +
 .../bg_security_recommendation_shield.xml     |  9 ++++
 .../layout/view_security_recommendation.xml   | 53 +++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 vector/src/main/res/drawable/bg_security_recommendation_shield.xml
 create mode 100644 vector/src/main/res/layout/view_security_recommendation.xml

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 2411492c72..f4a88ad354 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3227,5 +3227,9 @@
     <string name="device_manager_other_sessions_description_unverified">Unverified · Last activity %1$s</string>
     <string name="device_manager_header_section_security_recommendations_title">Security recommendations</string>
     <string name="device_manager_header_section_security_recommendations_description">Improve your account security by following these recommendations.</string>
+    <string name="device_manager_unverified_sessions_title">Unverified sessions</string>
+    <string name="device_manager_unverified_sessions_description">Verify or sign out from unverified sessions.</string>
+    <string name="device_manager_inactive_sessions_title">Inactive sessions</string>
+    <string name="device_manager_inactive_sessions_description">Consider signing out from old sessions (90 days or older) you don’t use anymore.</string>
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index e72d02f51e..01af740d43 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -143,6 +143,7 @@
     <color name="shield_color_trust">#0DBD8B</color>
     <color name="shield_color_black">#17191C</color>
     <color name="shield_color_warning">#FF4B55</color>
+    <color name="shield_color_warning_background">#0FFF4B55</color>
 
     <!-- Badge Colors -->
     <attr name="vctr_badge_color_border" format="color" />
diff --git a/vector/src/main/res/drawable/bg_security_recommendation_shield.xml b/vector/src/main/res/drawable/bg_security_recommendation_shield.xml
new file mode 100644
index 0000000000..3d46fd4ff6
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_security_recommendation_shield.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="?android:colorBackground" />
+
+    <corners android:radius="8dp" />
+
+</shape>
diff --git a/vector/src/main/res/layout/view_security_recommendation.xml b/vector/src/main/res/layout/view_security_recommendation.xml
new file mode 100644
index 0000000000..949c6e99ae
--- /dev/null
+++ b/vector/src/main/res/layout/view_security_recommendation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_current_session"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/recommendationShieldImageView"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:background="@drawable/bg_security_recommendation_shield"
+        android:importantForAccessibility="no"
+        android:padding="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:backgroundTint="@color/shield_color_warning_background"
+        tools:src="@drawable/ic_shield_warning_no_border" />
+
+    <TextView
+        android:id="@+id/recommendationTitleTextView"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        app:layout_constraintStart_toEndOf="@id/recommendationShieldImageView"
+        app:layout_constraintTop_toTopOf="@id/recommendationShieldImageView"
+        tools:text="@string/device_manager_unverified_sessions_title" />
+
+    <TextView
+        android:id="@+id/recommendationDescriptionTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/recommendationTitleTextView"
+        tools:text="@string/device_manager_unverified_sessions_description" />
+
+    <Button
+        android:id="@+id/recommendationViewAllButton"
+        style="@style/Widget.Vector.Button.Text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:padding="0dp"
+        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/recommendationDescriptionTextView"
+        tools:text="@string/device_manager_other_sessions_view_all" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From e6c9409156a0aa0c551460841903096ee2ad51e4 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 29 Aug 2022 18:33:19 +0300
Subject: [PATCH 03/17] Create generic security recommendations view.

---
 .../stylable_security_recommendation_view.xml | 11 +++++++
 .../res/drawable/ic_inactive_sessions.xml     |  9 ++++++
 .../res/layout/fragment_settings_devices.xml  | 30 ++++++++++++++++++-
 .../layout/view_security_recommendation.xml   |  2 +-
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml
 create mode 100644 vector/src/main/res/drawable/ic_inactive_sessions.xml

diff --git a/library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml b/library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml
new file mode 100644
index 0000000000..4283c8da8a
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="SecurityRecommendationView">
+        <attr name="recommendationTitle" format="string" />
+        <attr name="recommendationDescription" format="string" />
+        <attr name="recommendationImageResource" format="reference" />
+        <attr name="recommendationImageBackgroundTint" format="color" />
+    </declare-styleable>
+
+</resources>
diff --git a/vector/src/main/res/drawable/ic_inactive_sessions.xml b/vector/src/main/res/drawable/ic_inactive_sessions.xml
new file mode 100644
index 0000000000..30ee2b3b3c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_inactive_sessions.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="14dp"
+    android:viewportWidth="8"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M1.333,0.333C0.6,0.333 0,0.933 0,1.666L0.007,3.786C0.007,4.14 0.147,4.473 0.393,4.726L2.667,7L0.393,9.286C0.147,9.533 0.007,9.873 0.007,10.226L0,12.333C0,13.066 0.6,13.666 1.333,13.666H6.667C7.4,13.666 8,13.066 8,12.333V10.226C8,9.873 7.86,9.533 7.613,9.286L5.333,7L7.607,4.733C7.86,4.48 8,4.14 8,3.786V1.666C8,0.933 7.4,0.333 6.667,0.333H1.333ZM6.667,10.273V11.666C6.667,12.033 6.367,12.333 6,12.333H2C1.633,12.333 1.333,12.033 1.333,11.666V10.273C1.333,10.093 1.407,9.926 1.527,9.8L4,7.333L6.473,9.806C6.593,9.926 6.667,10.1 6.667,10.273Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_settings_devices.xml b/vector/src/main/res/layout/fragment_settings_devices.xml
index 8b4df5070b..220e49f28f 100644
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@@ -18,6 +18,34 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
+            android:id="@+id/deviceListUnverifiedSessionsRecommendation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="16dp"
+            app:recommendationTitle="@string/device_manager_unverified_sessions_title"
+            app:recommendationDescription="@string/device_manager_unverified_sessions_description"
+            app:recommendationImageResource="@drawable/ic_shield_warning_no_border"
+            app:recommendationImageBackgroundTint="@color/shield_color_warning_background"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations"/>
+
+        <im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
+            android:id="@+id/deviceListInactiveSessionsRecommendation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="16dp"
+            app:recommendationTitle="@string/device_manager_inactive_sessions_title"
+            app:recommendationDescription="@string/device_manager_inactive_sessions_description"
+            app:recommendationImageResource="@drawable/ic_inactive_sessions"
+            app:recommendationImageBackgroundTint="?vctr_system"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListUnverifiedSessionsRecommendation"/>
+
         <View
             android:id="@+id/deviceListSecurityRecommendationsDivider"
             android:layout_width="0dp"
@@ -26,7 +54,7 @@
             android:background="@drawable/divider_horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations" />
+            app:layout_constraintTop_toBottomOf="@id/deviceListInactiveSessionsRecommendation" />
 
         <im.vector.app.features.settings.devices.v2.list.DevicesListHeaderView
             android:id="@+id/deviceListHeaderCurrentSession"
diff --git a/vector/src/main/res/layout/view_security_recommendation.xml b/vector/src/main/res/layout/view_security_recommendation.xml
index 949c6e99ae..1fe62761a6 100644
--- a/vector/src/main/res/layout/view_security_recommendation.xml
+++ b/vector/src/main/res/layout/view_security_recommendation.xml
@@ -48,6 +48,6 @@
         android:padding="0dp"
         app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
         app:layout_constraintTop_toBottomOf="@id/recommendationDescriptionTextView"
-        tools:text="@string/device_manager_other_sessions_view_all" />
+        android:text="@string/device_manager_other_sessions_view_all" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From c23a4e460159fad84249a5113fbb9e1925dc5cdf Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 29 Aug 2022 18:33:50 +0300
Subject: [PATCH 04/17] Implement security recommendation view class.

---
 .../v2/list/SecurityRecommendationView.kt     | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
new file mode 100644
index 0000000000..f2f653183c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.databinding.ViewSecurityRecommendationBinding
+
+class SecurityRecommendationView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val views: ViewSecurityRecommendationBinding
+
+    init {
+        inflate(context, R.layout.view_security_recommendation, this)
+        views = ViewSecurityRecommendationBinding.bind(this)
+
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SecurityRecommendationView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+            setImage(it)
+        }
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.SecurityRecommendationView_recommendationTitle)
+        views.recommendationTitleTextView.text = title
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.SecurityRecommendationView_recommendationDescription)
+        views.recommendationDescriptionTextView.text = description
+    }
+
+    private fun setImage(typedArray: TypedArray) {
+        val imageResource = typedArray.getResourceId(R.styleable.SecurityRecommendationView_recommendationImageResource, 0)
+        val backgroundTint = typedArray.getColor(R.styleable.SecurityRecommendationView_recommendationImageBackgroundTint, 0)
+        views.recommendationShieldImageView.setImageResource(imageResource)
+        views.recommendationShieldImageView.backgroundTintList = ColorStateList.valueOf(backgroundTint)
+    }
+}

From 58846038ce3f8c434d1cfeffb04a9bf08c8a86fe Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 30 Aug 2022 14:20:01 +0300
Subject: [PATCH 05/17] Render security recommendations.

---
 .../settings/devices/DevicesViewModel.kt      | 23 +++++++++++++++++++
 .../v2/VectorSettingsDevicesFragment.kt       | 23 +++++++++++++++++++
 .../v2/list/SecurityRecommendationView.kt     |  4 ++++
 .../devices/v2/list/SessionListConstants.kt   |  1 +
 .../layout/view_security_recommendation.xml   |  3 ++-
 5 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 11fc6ecd64..7355465aa0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -30,10 +30,13 @@ import im.vector.app.R
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.DateProvider
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.toTimestamp
 import im.vector.app.core.utils.PublishDataSource
 import im.vector.app.features.auth.ReAuthActivity
 import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
 import im.vector.lib.core.utils.flow.throttleFirst
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
@@ -52,6 +55,7 @@ import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
@@ -67,6 +71,7 @@ import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.fromBase64
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.net.ssl.HttpsURLConnection
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -81,6 +86,8 @@ data class DevicesViewState(
         val request: Async<Unit> = Uninitialized,
         val hasAccountCrossSigning: Boolean = false,
         val accountCrossSigningIsTrusted: Boolean = false,
+        val unverifiedSessionsCount: Int = 0,
+        val inactiveSessionsCount: Int = 0,
 ) : MavericksState
 
 data class DeviceFullInfo(
@@ -125,6 +132,14 @@ class DevicesViewModel @AssistedInject constructor(
                 session.flow().liveUserCryptoDevices(session.myUserId),
                 session.flow().liveMyDevicesInfo()
         ) { cryptoList, infoList ->
+            val unverifiedSessionsCount = cryptoList.count { !it.trustLevel?.isVerified().orFalse() }
+            val inactiveSessionsCount = infoList.count { isInactiveSession(it.date) }
+            setState {
+                copy(
+                        unverifiedSessionsCount = unverifiedSessionsCount,
+                        inactiveSessionsCount = inactiveSessionsCount
+                )
+            }
             infoList
                     .sortedByDescending { it.lastSeenTs }
                     .map { deviceInfo ->
@@ -188,6 +203,14 @@ class DevicesViewModel @AssistedInject constructor(
         queryRefreshDevicesList()
     }
 
+    private fun isInactiveSession(lastSeenTs: Long): Boolean {
+        val lastSeenDate = DateProvider.toLocalDateTime(lastSeenTs)
+        val currentDate = DateProvider.currentLocalDateTime()
+        val diffMilliseconds = currentDate.toTimestamp() - lastSeenDate.toTimestamp()
+        val diffDays = TimeUnit.MILLISECONDS.toDays(diffMilliseconds)
+        return diffDays > SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+    }
+
     override fun onCleared() {
         session.cryptoService().verificationService().removeListener(this)
         super.onCleared()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 80dfe25c77..245cfe9809 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -131,9 +131,11 @@ class VectorSettingsDevicesFragment :
             }
             val otherDevices = devices?.filter { it.deviceInfo.deviceId != state.myDeviceId }
 
+            renderSecurityRecommendations(state.inactiveSessionsCount, state.unverifiedSessionsCount)
             renderCurrentDevice(currentDeviceInfo)
             renderOtherSessionsView(otherDevices)
         } else {
+            hideSecurityRecommendations()
             hideCurrentSessionView()
             hideOtherSessionsView()
         }
@@ -141,6 +143,26 @@ class VectorSettingsDevicesFragment :
         handleRequestStatus(state.request)
     }
 
+    private fun renderSecurityRecommendations(inactiveSessionsCount: Int, unverifiedSessionsCount: Int) {
+        if (unverifiedSessionsCount == 0 && inactiveSessionsCount == 0) {
+            hideSecurityRecommendations()
+        } else {
+            views.deviceListHeaderSectionSecurityRecommendations.isVisible = true
+            views.deviceListSecurityRecommendationsDivider.isVisible = true
+            views.deviceListUnverifiedSessionsRecommendation.isVisible = unverifiedSessionsCount > 0
+            views.deviceListInactiveSessionsRecommendation.isVisible = inactiveSessionsCount > 0
+            views.deviceListUnverifiedSessionsRecommendation.setCount(unverifiedSessionsCount)
+            views.deviceListInactiveSessionsRecommendation.setCount(inactiveSessionsCount)
+        }
+    }
+
+    private fun hideSecurityRecommendations() {
+        views.deviceListHeaderSectionSecurityRecommendations.isVisible = false
+        views.deviceListUnverifiedSessionsRecommendation.isVisible = false
+        views.deviceListInactiveSessionsRecommendation.isVisible = false
+        views.deviceListSecurityRecommendationsDivider.isVisible = false
+    }
+
     private fun renderOtherSessionsView(otherDevices: List<DeviceFullInfo>?) {
         if (otherDevices.isNullOrEmpty()) {
             hideOtherSessionsView()
@@ -169,6 +191,7 @@ class VectorSettingsDevicesFragment :
     private fun hideCurrentSessionView() {
         views.deviceListHeaderCurrentSession.isVisible = false
         views.deviceListCurrentSession.isVisible = false
+        views.deviceListCurrentSessionDivider.isVisible = false
     }
 
     private fun handleRequestStatus(unIgnoreRequest: Async<Unit>) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
index f2f653183c..73d8d74bfd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
@@ -65,4 +65,8 @@ class SecurityRecommendationView @JvmOverloads constructor(
         views.recommendationShieldImageView.setImageResource(imageResource)
         views.recommendationShieldImageView.backgroundTintList = ColorStateList.valueOf(backgroundTint)
     }
+
+    fun setCount(sessionsCount: Int) {
+        views.recommendationViewAllButton.text = context.getString(R.string.device_manager_other_sessions_view_all, sessionsCount)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt
index c1dbbdff4f..662ce536e7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt
@@ -17,3 +17,4 @@
 package im.vector.app.features.settings.devices.v2.list
 
 internal const val NUMBER_OF_OTHER_DEVICES_TO_RENDER = 5
+internal const val SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS = 90
diff --git a/vector/src/main/res/layout/view_security_recommendation.xml b/vector/src/main/res/layout/view_security_recommendation.xml
index 1fe62761a6..b5e7fb9beb 100644
--- a/vector/src/main/res/layout/view_security_recommendation.xml
+++ b/vector/src/main/res/layout/view_security_recommendation.xml
@@ -32,10 +32,11 @@
     <TextView
         android:id="@+id/recommendationDescriptionTextView"
         style="@style/TextAppearance.Vector.Body.DevicesManagement"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/recommendationTitleTextView"
         tools:text="@string/device_manager_unverified_sessions_description" />
 

From 2f94b80c420848b4e289d8896958dc2b3dbb48d9 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 30 Aug 2022 14:30:05 +0300
Subject: [PATCH 06/17] Add changelog.

---
 changelog.d/6964.wip | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6964.wip

diff --git a/changelog.d/6964.wip b/changelog.d/6964.wip
new file mode 100644
index 0000000000..f96dfe41ed
--- /dev/null
+++ b/changelog.d/6964.wip
@@ -0,0 +1 @@
+[Device Manager] Render Security Recommendations

From 32f1a660f51d81fdc7771e7ae57a34c27efc3a15 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 30 Aug 2022 14:40:20 +0300
Subject: [PATCH 07/17] Format layout.

---
 .../main/res/layout/view_security_recommendation.xml   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/layout/view_security_recommendation.xml b/vector/src/main/res/layout/view_security_recommendation.xml
index b5e7fb9beb..6710864048 100644
--- a/vector/src/main/res/layout/view_security_recommendation.xml
+++ b/vector/src/main/res/layout/view_security_recommendation.xml
@@ -5,7 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_current_session"
-    android:padding="16dp">
+    android:paddingHorizontal="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="8dp">
 
     <ImageView
         android:id="@+id/recommendationShieldImageView"
@@ -35,8 +37,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
         app:layout_constraintTop_toBottomOf="@id/recommendationTitleTextView"
         tools:text="@string/device_manager_unverified_sessions_description" />
 
@@ -47,8 +49,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:padding="0dp"
+        android:text="@string/device_manager_other_sessions_view_all"
         app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
-        app:layout_constraintTop_toBottomOf="@id/recommendationDescriptionTextView"
-        android:text="@string/device_manager_other_sessions_view_all" />
+        app:layout_constraintTop_toBottomOf="@id/recommendationDescriptionTextView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From abd826561df231a574d6727e23acdc25b32568e9 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 30 Aug 2022 17:13:22 +0300
Subject: [PATCH 08/17] Fix image background.

---
 vector/src/main/res/layout/view_current_session.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/view_current_session.xml b/vector/src/main/res/layout/view_current_session.xml
index 31ad3cce2c..91977eba40 100644
--- a/vector/src/main/res/layout/view_current_session.xml
+++ b/vector/src/main/res/layout/view_current_session.xml
@@ -12,12 +12,12 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginTop="16dp"
+        android:background="@drawable/bg_device_type"
         android:contentDescription="@string/a11y_device_manager_device_type_mobile"
         android:padding="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:background="@drawable/bg_device_type"
         tools:src="@drawable/ic_device_type_mobile" />
 
     <TextView

From aeb64892fa7dddf6a6bd0db442cd1a60af4be838 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Wed, 31 Aug 2022 17:04:05 +0300
Subject: [PATCH 09/17] Move inactive session logic into use case.

---
 .../settings/devices/DevicesViewModel.kt      | 16 ++-------
 .../list/CheckIfSessionIsInactiveUseCase.kt   | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 7355465aa0..7aa3955d07 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -30,13 +30,11 @@ import im.vector.app.R
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.DateProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.resources.toTimestamp
 import im.vector.app.core.utils.PublishDataSource
 import im.vector.app.features.auth.ReAuthActivity
 import im.vector.app.features.login.ReAuthHelper
-import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
 import im.vector.lib.core.utils.flow.throttleFirst
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
@@ -71,7 +69,6 @@ import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.fromBase64
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 import javax.net.ssl.HttpsURLConnection
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -102,6 +99,7 @@ class DevicesViewModel @AssistedInject constructor(
         private val reAuthHelper: ReAuthHelper,
         private val stringProvider: StringProvider,
         private val matrix: Matrix,
+        private val checkIfSessionIsInactiveUseCase: CheckIfSessionIsInactiveUseCase,
 ) : VectorViewModel<DevicesViewState, DevicesAction, DevicesViewEvents>(initialState), VerificationService.Listener {
 
     var uiaContinuation: Continuation<UIABaseAuth>? = null
@@ -133,7 +131,7 @@ class DevicesViewModel @AssistedInject constructor(
                 session.flow().liveMyDevicesInfo()
         ) { cryptoList, infoList ->
             val unverifiedSessionsCount = cryptoList.count { !it.trustLevel?.isVerified().orFalse() }
-            val inactiveSessionsCount = infoList.count { isInactiveSession(it.date) }
+            val inactiveSessionsCount = infoList.count { checkIfSessionIsInactiveUseCase.execute(it.date) }
             setState {
                 copy(
                         unverifiedSessionsCount = unverifiedSessionsCount,
@@ -203,14 +201,6 @@ class DevicesViewModel @AssistedInject constructor(
         queryRefreshDevicesList()
     }
 
-    private fun isInactiveSession(lastSeenTs: Long): Boolean {
-        val lastSeenDate = DateProvider.toLocalDateTime(lastSeenTs)
-        val currentDate = DateProvider.currentLocalDateTime()
-        val diffMilliseconds = currentDate.toTimestamp() - lastSeenDate.toTimestamp()
-        val diffDays = TimeUnit.MILLISECONDS.toDays(diffMilliseconds)
-        return diffDays > SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
-    }
-
     override fun onCleared() {
         session.cryptoService().verificationService().removeListener(this)
         super.onCleared()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
new file mode 100644
index 0000000000..c5d5f804a6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import im.vector.app.core.resources.DateProvider
+import im.vector.app.core.resources.toTimestamp
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class CheckIfSessionIsInactiveUseCase @Inject constructor() {
+
+    fun execute(lastSeenTs: Long): Boolean {
+        val lastSeenDate = DateProvider.toLocalDateTime(lastSeenTs)
+        val currentDate = DateProvider.currentLocalDateTime()
+        val diffMilliseconds = currentDate.toTimestamp() - lastSeenDate.toTimestamp()
+        val diffDays = TimeUnit.MILLISECONDS.toDays(diffMilliseconds)
+        return diffDays >= SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+    }
+}

From 396da93a93b19bf9579a7e1659330cdfe0bfdefd Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Wed, 31 Aug 2022 17:04:29 +0300
Subject: [PATCH 10/17] Test inactive sessions use case.

---
 .../CheckIfSessionIsInactiveUseCaseTest.kt    | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt

diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
new file mode 100644
index 0000000000..32f809057b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import im.vector.app.core.resources.DateProvider
+import im.vector.app.core.resources.toTimestamp
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.ZoneId
+import org.threeten.bp.ZoneId.systemDefault
+import org.threeten.bp.ZoneOffset
+import org.threeten.bp.zone.ZoneRules
+
+class CheckIfSessionIsInactiveUseCaseTest {
+
+    private val checkIfSessionIsInactiveUseCase = CheckIfSessionIsInactiveUseCase()
+    private val zoneId = mockk<ZoneId>()
+    private val zoneRules = mockk<ZoneRules>()
+
+    @Before
+    fun setup() {
+        mockkStatic(ZoneId::class)
+        every { systemDefault() } returns zoneId
+        every { zoneId.rules } returns zoneRules
+        every { zoneRules.getOffset(any<Instant>()) } returns ZoneOffset.UTC
+        every { zoneRules.getOffset(any<LocalDateTime>()) } returns ZoneOffset.UTC
+    }
+
+    @Test
+    fun `given an old last seen date then session is inactive`() {
+        val lastSeenDate = DateProvider.currentLocalDateTime().minusDays((SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS + 1).toLong())
+
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo true
+    }
+
+    @Test
+    fun `given a last seen date equal to the threshold then session is inactive`() {
+        val lastSeenDate = DateProvider.currentLocalDateTime().minusDays((SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS).toLong())
+
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo true
+    }
+
+    @Test
+    fun `given a recent last seen date then session is active`() {
+        val lastSeenDate = DateProvider.currentLocalDateTime().minusDays((SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS - 1).toLong())
+
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo false
+    }
+
+    @Test
+    fun `given a last seen date as zero then session is inactive`() {
+        // In case of the server doesn't send the last seen date.
+        val lastSeenDate = DateProvider.toLocalDateTime(0)
+
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo true
+    }
+}

From ed1244aa8f946d17397e090263ceeb4141daea7d Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Wed, 31 Aug 2022 19:11:12 +0300
Subject: [PATCH 11/17] Fix description of inactive sessions.

---
 library/ui-strings/src/main/res/values/strings.xml   |  1 +
 .../features/settings/devices/DevicesViewModel.kt    |  4 +++-
 .../settings/devices/v2/list/OtherSessionItem.kt     |  5 +++++
 .../devices/v2/list/OtherSessionsController.kt       | 12 +++++++++++-
 vector/src/main/res/layout/item_other_session.xml    |  1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index f4a88ad354..ed21c2de8a 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3225,6 +3225,7 @@
     <string name="device_manager_other_sessions_view_all">View All (%1$d)</string>
     <string name="device_manager_other_sessions_description_verified">Verified · Last activity %1$s</string>
     <string name="device_manager_other_sessions_description_unverified">Unverified · Last activity %1$s</string>
+    <string name="device_manager_other_sessions_description_inactive">Inactive for %1$d+ days (%2$s)</string>
     <string name="device_manager_header_section_security_recommendations_title">Security recommendations</string>
     <string name="device_manager_header_section_security_recommendations_description">Improve your account security by following these recommendations.</string>
     <string name="device_manager_unverified_sessions_title">Unverified sessions</string>
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 7aa3955d07..3b5bcb61d9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -91,6 +91,7 @@ data class DeviceFullInfo(
         val deviceInfo: DeviceInfo,
         val cryptoDeviceInfo: CryptoDeviceInfo?,
         val trustLevelForShield: RoomEncryptionTrustLevel,
+        val isInactive: Boolean,
 )
 
 class DevicesViewModel @AssistedInject constructor(
@@ -148,7 +149,8 @@ class DevicesViewModel @AssistedInject constructor(
                                 deviceTrustLevel = cryptoDeviceInfo?.trustLevel,
                                 isCurrentDevice = deviceInfo.deviceId == session.sessionParams.deviceId
                         )
-                        DeviceFullInfo(deviceInfo, cryptoDeviceInfo, trustLevelForShield)
+                        val isInactive = checkIfSessionIsInactiveUseCase.execute(deviceInfo.lastSeenTs ?: 0)
+                        DeviceFullInfo(deviceInfo, cryptoDeviceInfo, trustLevelForShield, isInactive)
                     }
         }
                 .distinctUntilChanged()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
index 2a62100994..e9376953e0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.settings.devices.v2.list
 
+import android.graphics.drawable.Drawable
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
@@ -42,6 +43,9 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
     @EpoxyAttribute
     var sessionDescription: String? = null
 
+    @EpoxyAttribute
+    var sessionDescriptionDrawable: Drawable? = null
+
     @EpoxyAttribute
     lateinit var stringProvider: StringProvider
 
@@ -68,6 +72,7 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
         holder.otherSessionVerificationStatusImageView.render(roomEncryptionTrustLevel)
         holder.otherSessionNameTextView.text = sessionName
         holder.otherSessionDescriptionTextView.text = sessionDescription
+        holder.otherSessionDescriptionTextView.setCompoundDrawablesWithIntrinsicBounds(sessionDescriptionDrawable, null, null, null)
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index 44c73e6eb7..04427d4cb6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -21,6 +21,7 @@ import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.devices.DeviceFullInfo
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
@@ -29,6 +30,7 @@ import javax.inject.Inject
 class OtherSessionsController @Inject constructor(
         private val stringProvider: StringProvider,
         private val dateFormatter: VectorDateFormatter,
+        private val drawableProvider: DrawableProvider,
 ) : TypedEpoxyController<List<DeviceFullInfo>>() {
 
     override fun buildModels(data: List<DeviceFullInfo>?) {
@@ -42,11 +44,18 @@ class OtherSessionsController @Inject constructor(
         } else {
             data.take(NUMBER_OF_OTHER_DEVICES_TO_RENDER).forEach { device ->
                 val formattedLastActivityDate = host.dateFormatter.format(device.deviceInfo.lastSeenTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
-                val description = if (device.trustLevelForShield == RoomEncryptionTrustLevel.Trusted) {
+                val description = if (device.isInactive) {
+                    stringProvider.getString(
+                            R.string.device_manager_other_sessions_description_inactive,
+                            SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                            formattedLastActivityDate
+                    )
+                } else if (device.trustLevelForShield == RoomEncryptionTrustLevel.Trusted) {
                     stringProvider.getString(R.string.device_manager_other_sessions_description_verified, formattedLastActivityDate)
                 } else {
                     stringProvider.getString(R.string.device_manager_other_sessions_description_unverified, formattedLastActivityDate)
                 }
+                val descriptionDrawable = if (device.isInactive) drawableProvider.getDrawable(R.drawable.ic_inactive_sessions) else null
 
                 otherSessionItem {
                     id(device.deviceInfo.deviceId)
@@ -54,6 +63,7 @@ class OtherSessionsController @Inject constructor(
                     roomEncryptionTrustLevel(device.trustLevelForShield)
                     sessionName(device.deviceInfo.displayName)
                     sessionDescription(description)
+                    sessionDescriptionDrawable(descriptionDrawable)
                     stringProvider(this@OtherSessionsController.stringProvider)
                 }
             }
diff --git a/vector/src/main/res/layout/item_other_session.xml b/vector/src/main/res/layout/item_other_session.xml
index 84b813c977..2c41ce6a56 100644
--- a/vector/src/main/res/layout/item_other_session.xml
+++ b/vector/src/main/res/layout/item_other_session.xml
@@ -50,6 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
+        android:drawablePadding="8dp"
         app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
         app:layout_constraintTop_toBottomOf="@id/otherSessionNameTextView"
         tools:text="@string/device_manager_verification_status_verified" />

From 8d378408c5e9086fc5776134416a314ad15eead1 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Wed, 31 Aug 2022 20:19:01 +0300
Subject: [PATCH 12/17] Code review fixes.

---
 .../src/main/res/values/strings.xml           |  2 +-
 .../v2/VectorSettingsDevicesFragment.kt       |  4 ++
 .../list/CheckIfSessionIsInactiveUseCase.kt   | 17 +++----
 .../v2/list/SecurityRecommendationView.kt     |  8 ++++
 .../CheckIfSessionIsInactiveUseCaseTest.kt    | 46 ++++++-------------
 5 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index ed21c2de8a..8cf89196e1 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3231,6 +3231,6 @@
     <string name="device_manager_unverified_sessions_title">Unverified sessions</string>
     <string name="device_manager_unverified_sessions_description">Verify or sign out from unverified sessions.</string>
     <string name="device_manager_inactive_sessions_title">Inactive sessions</string>
-    <string name="device_manager_inactive_sessions_description">Consider signing out from old sessions (90 days or older) you don’t use anymore.</string>
+    <string name="device_manager_inactive_sessions_description">Consider signing out from old sessions (%1$d days or more) that you don’t use anymore.</string>
 
 </resources>
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 245cfe9809..9d1f446b33 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -40,6 +40,7 @@ import im.vector.app.features.settings.devices.DeviceFullInfo
 import im.vector.app.features.settings.devices.DevicesAction
 import im.vector.app.features.settings.devices.DevicesViewEvents
 import im.vector.app.features.settings.devices.DevicesViewModel
+import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
 
 /**
  * Display the list of the user's devices and sessions.
@@ -153,6 +154,9 @@ class VectorSettingsDevicesFragment :
             views.deviceListInactiveSessionsRecommendation.isVisible = inactiveSessionsCount > 0
             views.deviceListUnverifiedSessionsRecommendation.setCount(unverifiedSessionsCount)
             views.deviceListInactiveSessionsRecommendation.setCount(inactiveSessionsCount)
+            views.deviceListInactiveSessionsRecommendation.setDescription(
+                    getString(R.string.device_manager_inactive_sessions_description, SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS)
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
index c5d5f804a6..8991ad1e3d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
@@ -16,18 +16,19 @@
 
 package im.vector.app.features.settings.devices.v2.list
 
-import im.vector.app.core.resources.DateProvider
-import im.vector.app.core.resources.toTimestamp
+import im.vector.app.core.time.Clock
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class CheckIfSessionIsInactiveUseCase @Inject constructor() {
+class CheckIfSessionIsInactiveUseCase @Inject constructor(
+        private val clock: Clock,
+) {
 
     fun execute(lastSeenTs: Long): Boolean {
-        val lastSeenDate = DateProvider.toLocalDateTime(lastSeenTs)
-        val currentDate = DateProvider.currentLocalDateTime()
-        val diffMilliseconds = currentDate.toTimestamp() - lastSeenDate.toTimestamp()
-        val diffDays = TimeUnit.MILLISECONDS.toDays(diffMilliseconds)
-        return diffDays >= SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+        // In case of the server doesn't send the last seen date.
+        if (lastSeenTs == 0L) return true
+
+        val diffMilliseconds = clock.epochMillis() - lastSeenTs
+        return diffMilliseconds >= TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong())
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
index 73d8d74bfd..c715704444 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
@@ -66,6 +66,14 @@ class SecurityRecommendationView @JvmOverloads constructor(
         views.recommendationShieldImageView.backgroundTintList = ColorStateList.valueOf(backgroundTint)
     }
 
+    fun setTitle(title: String) {
+        views.recommendationTitleTextView.text = title
+    }
+
+    fun setDescription(description: String) {
+        views.recommendationDescriptionTextView.text = description
+    }
+
     fun setCount(sessionsCount: Int) {
         views.recommendationViewAllButton.text = context.getString(R.string.device_manager_other_sessions_view_all, sessionsCount)
     }
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
index 32f809057b..b7d56a88bf 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
@@ -16,62 +16,44 @@
 
 package im.vector.app.features.settings.devices.v2.list
 
-import im.vector.app.core.resources.DateProvider
-import im.vector.app.core.resources.toTimestamp
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
+import im.vector.app.test.fakes.FakeClock
 import org.amshove.kluent.shouldBeEqualTo
-import org.junit.Before
 import org.junit.Test
-import org.threeten.bp.Instant
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.ZoneId
-import org.threeten.bp.ZoneId.systemDefault
-import org.threeten.bp.ZoneOffset
-import org.threeten.bp.zone.ZoneRules
+import java.util.concurrent.TimeUnit
+
+private const val A_TIMESTAMP = 1654689143L
 
 class CheckIfSessionIsInactiveUseCaseTest {
 
-    private val checkIfSessionIsInactiveUseCase = CheckIfSessionIsInactiveUseCase()
-    private val zoneId = mockk<ZoneId>()
-    private val zoneRules = mockk<ZoneRules>()
-
-    @Before
-    fun setup() {
-        mockkStatic(ZoneId::class)
-        every { systemDefault() } returns zoneId
-        every { zoneId.rules } returns zoneRules
-        every { zoneRules.getOffset(any<Instant>()) } returns ZoneOffset.UTC
-        every { zoneRules.getOffset(any<LocalDateTime>()) } returns ZoneOffset.UTC
-    }
+    private val clock = FakeClock().apply { givenEpoch(A_TIMESTAMP) }
+    private val checkIfSessionIsInactiveUseCase = CheckIfSessionIsInactiveUseCase(clock)
 
     @Test
     fun `given an old last seen date then session is inactive`() {
-        val lastSeenDate = DateProvider.currentLocalDateTime().minusDays((SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS + 1).toLong())
+        val lastSeenDate = A_TIMESTAMP - TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong()) - 1
 
-        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo true
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate) shouldBeEqualTo true
     }
 
     @Test
     fun `given a last seen date equal to the threshold then session is inactive`() {
-        val lastSeenDate = DateProvider.currentLocalDateTime().minusDays((SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS).toLong())
+        val lastSeenDate = A_TIMESTAMP - TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong())
 
-        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo true
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate) shouldBeEqualTo true
     }
 
     @Test
     fun `given a recent last seen date then session is active`() {
-        val lastSeenDate = DateProvider.currentLocalDateTime().minusDays((SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS - 1).toLong())
+        val lastSeenDate = A_TIMESTAMP - TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong()) + 1
 
-        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo false
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate) shouldBeEqualTo false
     }
 
     @Test
     fun `given a last seen date as zero then session is inactive`() {
         // In case of the server doesn't send the last seen date.
-        val lastSeenDate = DateProvider.toLocalDateTime(0)
+        val lastSeenDate = 0L
 
-        checkIfSessionIsInactiveUseCase.execute(lastSeenDate.toTimestamp()) shouldBeEqualTo true
+        checkIfSessionIsInactiveUseCase.execute(lastSeenDate) shouldBeEqualTo true
     }
 }

From 2b50208a231ef00f36904690404679597251b116 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Fri, 2 Sep 2022 14:37:49 +0200
Subject: [PATCH 13/17] Post rebase fix

---
 .../settings/devices/v2/VectorSettingsDevicesFragment.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 9d1f446b33..ef42a6e5a7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -195,7 +195,7 @@ class VectorSettingsDevicesFragment :
     private fun hideCurrentSessionView() {
         views.deviceListHeaderCurrentSession.isVisible = false
         views.deviceListCurrentSession.isVisible = false
-        views.deviceListCurrentSessionDivider.isVisible = false
+        views.deviceListDividerCurrentSession.isVisible = false
     }
 
     private fun handleRequestStatus(unIgnoreRequest: Async<Unit>) {

From 5791a4d3cdcc7ca096f5ccdc4e2d650027919c31 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Fri, 2 Sep 2022 15:00:53 +0200
Subject: [PATCH 14/17] Using plurals when needed

---
 library/ui-strings/src/main/res/values/strings.xml    | 11 +++++++++--
 .../devices/v2/VectorSettingsDevicesFragment.kt       |  6 +++++-
 .../devices/v2/list/OtherSessionsController.kt        |  5 +++--
 .../src/main/res/layout/fragment_settings_devices.xml |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 8cf89196e1..df0e10627a 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3225,12 +3225,19 @@
     <string name="device_manager_other_sessions_view_all">View All (%1$d)</string>
     <string name="device_manager_other_sessions_description_verified">Verified · Last activity %1$s</string>
     <string name="device_manager_other_sessions_description_unverified">Unverified · Last activity %1$s</string>
-    <string name="device_manager_other_sessions_description_inactive">Inactive for %1$d+ days (%2$s)</string>
+    <!--  Example: Inactive for 90+ days (Dec 25, 2021) -->
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inactive for %1$d+ day (%2$s)</item>
+        <item quantity="other">Inactive for %1$d+ days (%2$s)</item>
+    </plurals>
     <string name="device_manager_header_section_security_recommendations_title">Security recommendations</string>
     <string name="device_manager_header_section_security_recommendations_description">Improve your account security by following these recommendations.</string>
     <string name="device_manager_unverified_sessions_title">Unverified sessions</string>
     <string name="device_manager_unverified_sessions_description">Verify or sign out from unverified sessions.</string>
     <string name="device_manager_inactive_sessions_title">Inactive sessions</string>
-    <string name="device_manager_inactive_sessions_description">Consider signing out from old sessions (%1$d days or more) that you don’t use anymore.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Consider signing out from old sessions (%1$d day or more) that you don’t use anymore.</item>
+        <item quantity="other">Consider signing out from old sessions (%1$d days or more) that you don’t use anymore.</item>
+    </plurals>
 
 </resources>
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index ef42a6e5a7..1850f2d847 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -155,7 +155,11 @@ class VectorSettingsDevicesFragment :
             views.deviceListUnverifiedSessionsRecommendation.setCount(unverifiedSessionsCount)
             views.deviceListInactiveSessionsRecommendation.setCount(inactiveSessionsCount)
             views.deviceListInactiveSessionsRecommendation.setDescription(
-                    getString(R.string.device_manager_inactive_sessions_description, SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS)
+                    resources.getQuantityString(
+                            R.plurals.device_manager_inactive_sessions_description,
+                            SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                            SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+                    )
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index 04427d4cb6..817878cf0f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -45,8 +45,9 @@ class OtherSessionsController @Inject constructor(
             data.take(NUMBER_OF_OTHER_DEVICES_TO_RENDER).forEach { device ->
                 val formattedLastActivityDate = host.dateFormatter.format(device.deviceInfo.lastSeenTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
                 val description = if (device.isInactive) {
-                    stringProvider.getString(
-                            R.string.device_manager_other_sessions_description_inactive,
+                    stringProvider.getQuantityString(
+                            R.plurals.device_manager_other_sessions_description_inactive,
+                            SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
                             SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
                             formattedLastActivityDate
                     )
diff --git a/vector/src/main/res/layout/fragment_settings_devices.xml b/vector/src/main/res/layout/fragment_settings_devices.xml
index 220e49f28f..6710f345ce 100644
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@@ -39,7 +39,7 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginVertical="16dp"
             app:recommendationTitle="@string/device_manager_inactive_sessions_title"
-            app:recommendationDescription="@string/device_manager_inactive_sessions_description"
+            app:recommendationDescription="@plurals/device_manager_inactive_sessions_description"
             app:recommendationImageResource="@drawable/ic_inactive_sessions"
             app:recommendationImageBackgroundTint="?vctr_system"
             app:layout_constraintEnd_toEndOf="parent"

From fbff8d6408984db70e5a704e30fde34bbc0cc725 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Fri, 2 Sep 2022 15:07:58 +0200
Subject: [PATCH 15/17] Use a different date format when device is inactive

---
 vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt | 2 +-
 .../settings/devices/v2/list/OtherSessionsController.kt        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt b/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt
index b08a1dc725..a66066ac8b 100644
--- a/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt
+++ b/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt
@@ -27,7 +27,7 @@ enum class DateFormatKind {
     // Will show hour or date relative (9:30am or yesterday or Sep 7 or 09/07/2020)
     ROOM_LIST,
 
-    // Will show full date (Sep 7 2020)
+    // Will show full date (Sep 7, 2020)
     TIMELINE_DAY_DIVIDER,
 
     // Will show full date and time (Mon, Sep 7 2020, 9:30am)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index 817878cf0f..c992505e37 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -43,7 +43,8 @@ class OtherSessionsController @Inject constructor(
             }
         } else {
             data.take(NUMBER_OF_OTHER_DEVICES_TO_RENDER).forEach { device ->
-                val formattedLastActivityDate = host.dateFormatter.format(device.deviceInfo.lastSeenTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
+                val dateFormatKind = if (device.isInactive) DateFormatKind.TIMELINE_DAY_DIVIDER else DateFormatKind.DEFAULT_DATE_AND_TIME
+                val formattedLastActivityDate = host.dateFormatter.format(device.deviceInfo.lastSeenTs, dateFormatKind)
                 val description = if (device.isInactive) {
                     stringProvider.getQuantityString(
                             R.plurals.device_manager_other_sessions_description_inactive,

From c53a8f32887bcfb576f9d7138d8b20924466deae Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Fri, 2 Sep 2022 15:23:10 +0200
Subject: [PATCH 16/17] Creation of a viewState for the
 SecurityRecommendationView

---
 .../v2/VectorSettingsDevicesFragment.kt       | 16 +++++++++-----
 .../v2/list/SecurityRecommendationView.kt     | 15 +++++++------
 .../list/SecurityRecommendationViewState.kt   | 22 +++++++++++++++++++
 3 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 1850f2d847..78b8c66f9c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -41,6 +41,7 @@ import im.vector.app.features.settings.devices.DevicesAction
 import im.vector.app.features.settings.devices.DevicesViewEvents
 import im.vector.app.features.settings.devices.DevicesViewModel
 import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+import im.vector.app.features.settings.devices.v2.list.SecurityRecommendationViewState
 
 /**
  * Display the list of the user's devices and sessions.
@@ -152,15 +153,20 @@ class VectorSettingsDevicesFragment :
             views.deviceListSecurityRecommendationsDivider.isVisible = true
             views.deviceListUnverifiedSessionsRecommendation.isVisible = unverifiedSessionsCount > 0
             views.deviceListInactiveSessionsRecommendation.isVisible = inactiveSessionsCount > 0
-            views.deviceListUnverifiedSessionsRecommendation.setCount(unverifiedSessionsCount)
-            views.deviceListInactiveSessionsRecommendation.setCount(inactiveSessionsCount)
-            views.deviceListInactiveSessionsRecommendation.setDescription(
-                    resources.getQuantityString(
+            val unverifiedSessionsViewState = SecurityRecommendationViewState(
+                    description = getString(R.string.device_manager_unverified_sessions_description),
+                    sessionsCount = unverifiedSessionsCount,
+            )
+            views.deviceListUnverifiedSessionsRecommendation.render(unverifiedSessionsViewState)
+            val inactiveSessionsViewState = SecurityRecommendationViewState(
+                    description = resources.getQuantityString(
                             R.plurals.device_manager_inactive_sessions_description,
                             SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
                             SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
-                    )
+                    ),
+                    sessionsCount = inactiveSessionsCount,
             )
+            views.deviceListInactiveSessionsRecommendation.render(inactiveSessionsViewState)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
index c715704444..93cf3c0501 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
@@ -56,7 +56,7 @@ class SecurityRecommendationView @JvmOverloads constructor(
 
     private fun setDescription(typedArray: TypedArray) {
         val description = typedArray.getString(R.styleable.SecurityRecommendationView_recommendationDescription)
-        views.recommendationDescriptionTextView.text = description
+        setDescription(description)
     }
 
     private fun setImage(typedArray: TypedArray) {
@@ -66,15 +66,16 @@ class SecurityRecommendationView @JvmOverloads constructor(
         views.recommendationShieldImageView.backgroundTintList = ColorStateList.valueOf(backgroundTint)
     }
 
-    fun setTitle(title: String) {
-        views.recommendationTitleTextView.text = title
-    }
-
-    fun setDescription(description: String) {
+    private fun setDescription(description: String?) {
         views.recommendationDescriptionTextView.text = description
     }
 
-    fun setCount(sessionsCount: Int) {
+    private fun setCount(sessionsCount: Int) {
         views.recommendationViewAllButton.text = context.getString(R.string.device_manager_other_sessions_view_all, sessionsCount)
     }
+
+    fun render(viewState: SecurityRecommendationViewState) {
+        setDescription(viewState.description)
+        setCount(viewState.sessionsCount)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt
new file mode 100644
index 0000000000..a5b30ea13b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+data class SecurityRecommendationViewState(
+        val description: String,
+        val sessionsCount: Int,
+)

From 9dc0a36ca0a66acb3da8ef3676e0110eb5744faa Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Fri, 2 Sep 2022 16:11:43 +0200
Subject: [PATCH 17/17] Apply correct tint to inactive status drawable

---
 .../settings/devices/v2/list/OtherSessionsController.kt      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index c992505e37..8a5ee05af7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -21,6 +21,7 @@ import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.devices.DeviceFullInfo
@@ -31,6 +32,7 @@ class OtherSessionsController @Inject constructor(
         private val stringProvider: StringProvider,
         private val dateFormatter: VectorDateFormatter,
         private val drawableProvider: DrawableProvider,
+        private val colorProvider: ColorProvider,
 ) : TypedEpoxyController<List<DeviceFullInfo>>() {
 
     override fun buildModels(data: List<DeviceFullInfo>?) {
@@ -57,7 +59,8 @@ class OtherSessionsController @Inject constructor(
                 } else {
                     stringProvider.getString(R.string.device_manager_other_sessions_description_unverified, formattedLastActivityDate)
                 }
-                val descriptionDrawable = if (device.isInactive) drawableProvider.getDrawable(R.drawable.ic_inactive_sessions) else null
+                val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+                val descriptionDrawable = if (device.isInactive) drawableProvider.getDrawable(R.drawable.ic_inactive_sessions, drawableColor) else null
 
                 otherSessionItem {
                     id(device.deviceInfo.deviceId)