Adding last seen details + fix observation of wrong deviceId in ViewModel

library/ui-strings/src/main/res/values/strings.xml

@@ -3247,5 +3247,6 @@
     </plurals>
     <string name="device_manager_current_session_title">Current Session</string>
     <string name="device_manager_session_title">Session</string>
+    <string name="device_manager_session_last_activity">Last activity %1$s</string>
 
 </resources>

vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt

@@ -31,6 +31,7 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.dialogs.ManuallyVerifyDialog
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSettingsDevicesBinding
@@ -55,6 +56,8 @@ class VectorSettingsDevicesFragment :
 
     @Inject lateinit var viewNavigator: VectorSettingsDevicesViewNavigator
 
+    @Inject lateinit var dateFormatter: VectorDateFormatter
+
     private val viewModel: DevicesViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSettingsDevicesBinding {
@@ -214,7 +217,7 @@ class VectorSettingsDevicesFragment :
                     isCurrentSession = true,
                     deviceFullInfo = it
             )
-            views.deviceListCurrentSession.render(viewState)
+            views.deviceListCurrentSession.render(viewState, dateFormatter)
             views.deviceListCurrentSession.debouncedClicks {
                 currentDeviceInfo.deviceInfo.deviceId?.let { deviceId -> navigateToSessionOverview(deviceId) }
             }
@@ -226,10 +229,10 @@ class VectorSettingsDevicesFragment :
         }
     }
 
-    private fun navigateToSessionOverview(sessionId: String) {
+    private fun navigateToSessionOverview(deviceId: String) {
         viewNavigator.navigateToSessionOverview(
                 context = requireActivity(),
-                sessionId = sessionId
+                deviceId = deviceId
         )
     }
 

vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt

@@ -22,7 +22,7 @@ import javax.inject.Inject
 
 class VectorSettingsDevicesViewNavigator @Inject constructor() {
 
-    fun navigateToSessionOverview(context: Context, sessionId: String) {
+    fun navigateToSessionOverview(context: Context, deviceId: String) {
-        context.startActivity(SessionOverviewActivity.newIntent(context, sessionId))
+        context.startActivity(SessionOverviewActivity.newIntent(context, deviceId))
     }
 }

vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoView.kt

@@ -19,11 +19,15 @@ package im.vector.app.features.settings.devices.v2.list
 import android.content.Context
 import android.util.AttributeSet
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.extensions.setTextWithColoredPart
 import im.vector.app.databinding.ViewSessionInfoBinding
 import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 
 class SessionInfoView @JvmOverloads constructor(
@@ -43,13 +47,14 @@ class SessionInfoView @JvmOverloads constructor(
 
     val viewDetailsButton = views.sessionInfoViewDetailsButton
 
-    fun render(sessionInfoViewState: SessionInfoViewState) {
+    fun render(sessionInfoViewState: SessionInfoViewState, dateFormatter: VectorDateFormatter) {
         renderDeviceInfo(sessionInfoViewState.deviceFullInfo.deviceInfo.displayName.orEmpty())
         renderVerificationStatus(
                 sessionInfoViewState.deviceFullInfo.trustLevelForShield,
                 sessionInfoViewState.isCurrentSession,
-                sessionInfoViewState.hasLearnMoreLink
+                sessionInfoViewState.isLearnMoreLinkVisible
         )
+        renderDeviceLastSeenDetails(sessionInfoViewState.deviceFullInfo.deviceInfo, dateFormatter, sessionInfoViewState.isLastSeenDetailsVisible)
         renderDetailsButton(sessionInfoViewState.isDetailsButtonVisible)
     }
 
@@ -117,6 +122,33 @@ class SessionInfoView @JvmOverloads constructor(
         views.sessionInfoNameTextView.text = sessionName
     }
 
+    private fun renderDeviceLastSeenDetails(
+            deviceInfo: DeviceInfo,
+            dateFormatter: VectorDateFormatter,
+            isLastSeenDetailsVisible: Boolean,
+    ) {
+        deviceInfo.lastSeenTs
+                ?.takeIf { isLastSeenDetailsVisible }
+                ?.let { timestamp ->
+                    views.sessionInfoLastActivityTextView.isVisible = true
+                    val formattedTs = dateFormatter.format(timestamp, DateFormatKind.DEFAULT_DATE_AND_TIME)
+                    views.sessionInfoLastActivityTextView.text = context.getString(R.string.device_manager_session_last_activity, formattedTs)
+                }
+                ?: run {
+                    views.sessionInfoLastActivityTextView.isGone = true
+                }
+
+        deviceInfo.lastSeenIp
+                ?.takeIf { isLastSeenDetailsVisible }
+                ?.let { ipAddress ->
+                    views.sessionInfoLastIPAddressTextView.isVisible = true
+                    views.sessionInfoLastIPAddressTextView.text = ipAddress
+                }
+                ?: run {
+                    views.sessionInfoLastIPAddressTextView.isGone = true
+                }
+    }
+
     private fun renderDetailsButton(isDetailsButtonVisible: Boolean) {
         views.sessionInfoViewDetailsButton.isVisible = isDetailsButtonVisible
     }

vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoViewState.kt

@@ -22,5 +22,6 @@ data class SessionInfoViewState(
         val isCurrentSession: Boolean,
         val deviceFullInfo: DeviceFullInfo,
         val isDetailsButtonVisible: Boolean = true,
-        val hasLearnMoreLink: Boolean = false
+        val isLearnMoreLinkVisible: Boolean = false,
+        val isLastSeenDetailsVisible: Boolean = false,
 )

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewActivity.kt

@@ -43,9 +43,9 @@ class SessionOverviewActivity : SimpleFragmentActivity() {
     }
 
     companion object {
-        fun newIntent(context: Context, sessionId: String): Intent {
+        fun newIntent(context: Context, deviceId: String): Intent {
             return Intent(context, SessionOverviewActivity::class.java).apply {
-                putExtra(Mavericks.KEY_ARG, SessionOverviewArgs(sessionId))
+                putExtra(Mavericks.KEY_ARG, SessionOverviewArgs(deviceId))
             }
         }
     }

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewArgs.kt

@@ -21,5 +21,5 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class SessionOverviewArgs(
-        val sessionId: String
+        val deviceId: String
 ) : Parcelable

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt

@@ -29,10 +29,12 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSessionOverviewBinding
 import im.vector.app.features.settings.devices.DeviceFullInfo
 import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
+import javax.inject.Inject
 
 /**
  * Display the overview info about a Session.
@@ -41,6 +43,8 @@ import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
 class SessionOverviewFragment :
         VectorBaseFragment<FragmentSessionOverviewBinding>() {
 
+    @Inject lateinit var dateFormatter: VectorDateFormatter
+
     private val viewModel: SessionOverviewViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSessionOverviewBinding {
@@ -89,9 +93,10 @@ class SessionOverviewFragment :
                 isCurrentSession = isCurrentSession,
                 deviceFullInfo = deviceFullInfo,
                 isDetailsButtonVisible = false,
-                hasLearnMoreLink = true
+                isLearnMoreLinkVisible = true,
+                isLastSeenDetailsVisible = true,
         )
-        views.sessionOverviewInfo.render(viewState)
+        views.sessionOverviewInfo.render(viewState, dateFormatter)
     }
 
     private fun hideSessionInfo() {

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModel.kt

@@ -46,10 +46,10 @@ class SessionOverviewViewModel @AssistedInject constructor(
     init {
         val currentDeviceId = session.sessionParams.deviceId.orEmpty()
         setState {
-            copy(isCurrentSession = sessionId.isNotEmpty() && sessionId == currentDeviceId)
+            copy(isCurrentSession = deviceId.isNotEmpty() && deviceId == currentDeviceId)
         }
 
-        observeSessionInfo(currentDeviceId)
+        observeSessionInfo(initialState.deviceId)
     }
 
     private fun observeSessionInfo(deviceId: String) {

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewState.kt

@@ -22,11 +22,11 @@ import com.airbnb.mvrx.Uninitialized
 import im.vector.app.features.settings.devices.DeviceFullInfo
 
 data class SessionOverviewViewState(
-        val sessionId: String,
+        val deviceId: String,
         val isCurrentSession: Boolean = false,
         val deviceInfo: Async<DeviceFullInfo> = Uninitialized,
 ) : MavericksState {
     constructor(args: SessionOverviewArgs) : this(
-            sessionId = args.sessionId
+            deviceId = args.deviceId
     )
 }

vector/src/main/res/layout/view_session_info.xml

@@ -72,6 +72,35 @@
         app:layout_constraintTop_toBottomOf="@id/sessionInfoVerificationStatusContainer"
         tools:text="@string/device_manager_verification_status_detail_current_session_verified" />
 
+    <TextView
+        android:id="@+id/sessionInfoLastActivityTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="32dp"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoVerificationStatusDetailTextView"
+        tools:text="Last activity Fri 14:59" />
+
+    <TextView
+        android:id="@+id/sessionInfoLastIPAddressTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="32dp"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoLastActivityTextView"
+        tools:text="81.235.41.100 (United Kingdom)" />
+
     <Button
         android:id="@+id/sessionInfoVerifySessionButton"
         android:layout_width="0dp"
@@ -81,7 +110,7 @@
         android:text="@string/device_manager_verify_session"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sessionInfoVerificationStatusDetailTextView" />
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoLastIPAddressTextView" />
 
     <Button
         android:id="@+id/sessionInfoViewDetailsButton"

vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt

@@ -39,7 +39,7 @@ class SessionOverviewViewModelTest {
     val mvRxTestRule = MvRxTestRule(testDispatcher = UnconfinedTestDispatcher())
 
     private val args = SessionOverviewArgs(
-            sessionId = A_SESSION_ID
+            deviceId = A_SESSION_ID
     )
     private val fakeSession = FakeSession()
     private val getDeviceFullInfoUseCase = mockk<GetDeviceFullInfoUseCase>()
@@ -56,7 +56,7 @@ class SessionOverviewViewModelTest {
         val deviceFullInfo = mockk<DeviceFullInfo>()
         every { getDeviceFullInfoUseCase.execute(A_SESSION_ID) } returns flowOf(Optional(deviceFullInfo))
         val expectedState = SessionOverviewViewState(
-                sessionId = A_SESSION_ID,
+                deviceId = A_SESSION_ID,
                 isCurrentSession = true,
                 deviceInfo = Success(deviceFullInfo)
         )