From ec5d950b7bf4bff28084f21c661fb792b7d3c4ae Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 23 Aug 2022 17:20:01 +0300
Subject: [PATCH] Fix current session device name.

---
 .../settings/devices/v2/VectorSettingsDevicesFragment.kt | 9 +++++----
 .../settings/devices/v2/list/CurrentSessionView.kt       | 8 ++++----
 vector/src/main/res/values/strings.xml                   | 1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

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 28a7fd513b..166d28f7d3 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
@@ -130,7 +130,7 @@ class VectorSettingsDevicesFragment @Inject constructor() : VectorBaseFragment<F
                 }
 
         if (state.devices is Success && currentDeviceInfo != null) {
-            renderCurrentDevice(state)
+            renderCurrentDevice(state.accountCrossSigningIsTrusted, !state.hasAccountCrossSigning, currentDeviceInfo.deviceInfo.displayName ?: "")
         } else {
             hideCurrentSessionView()
         }
@@ -143,12 +143,13 @@ class VectorSettingsDevicesFragment @Inject constructor() : VectorBaseFragment<F
         views.deviceListCurrentSession.isVisible = false
     }
 
-    private fun renderCurrentDevice(state: DevicesViewState) {
+    private fun renderCurrentDevice(accountCrossSigningIsTrusted: Boolean, legacyMode: Boolean, sessionName: String) {
         views.deviceListHeaderSectionCurrent.isVisible = true
         views.deviceListCurrentSession.isVisible = true
         views.deviceListCurrentSession.update(
-                accountCrossSigningIsTrusted = state.accountCrossSigningIsTrusted,
-                legacyMode = !state.hasAccountCrossSigning
+                accountCrossSigningIsTrusted = accountCrossSigningIsTrusted,
+                legacyMode = legacyMode,
+                sessionName = sessionName
         )
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt
index baf30e35b5..6d7c96420b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt
@@ -39,8 +39,8 @@ class CurrentSessionView @JvmOverloads constructor(
         views = ViewCurrentSessionBinding.bind(this)
     }
 
-    fun update(accountCrossSigningIsTrusted: Boolean, legacyMode: Boolean) {
-        renderDeviceType()
+    fun update(accountCrossSigningIsTrusted: Boolean, legacyMode: Boolean, sessionName: String) {
+        renderDeviceInfo(sessionName)
         renderVerificationStatus(accountCrossSigningIsTrusted, legacyMode)
     }
 
@@ -75,9 +75,9 @@ class CurrentSessionView @JvmOverloads constructor(
     }
 
     // TODO. We don't have this info yet. Update later accordingly.
-    private fun renderDeviceType() {
+    private fun renderDeviceInfo(sessionName: String) {
         views.currentSessionDeviceTypeImageView.setImageResource(R.drawable.ic_device_type_mobile)
         views.currentSessionDeviceTypeImageView.contentDescription = context.getString(R.string.a11y_device_manager_device_type_mobile)
-        views.currentSessionDeviceTypeTextView.text = context.getString(R.string.device_manager_device_type_android)
+        views.currentSessionNameTextView.text = sessionName
     }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index c2e8228728..5e866bab50 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3209,7 +3209,6 @@
     <string name="a11y_device_manager_device_type_mobile">Mobile</string>
     <string name="a11y_device_manager_device_type_web" tools:ignore="UnusedResources">Web</string>
     <string name="a11y_device_manager_device_type_desktop" tools:ignore="UnusedResources">Desktop</string>
-    <string name="device_manager_device_type_android">${app_name} Mobile: Android</string>
     <string name="device_manager_verification_status_verified">Verified session</string>
     <string name="device_manager_verification_status_unverified">Unverified session</string>
     <string name="device_manager_verification_status_detail_verified">Your current session is ready for secure messaging.</string>