From cac246aa15b5e56bfb02d2b42443afcbb870c234 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 30 Apr 2020 15:43:05 +0200
Subject: [PATCH 1/2] update copy

---
 .../java/im/vector/riotx/features/home/HomeDetailFragment.kt    | 2 +-
 vector/src/main/res/values/strings.xml                          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
index b2638e65fc..1357b30413 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
@@ -113,7 +113,7 @@ class HomeDetailFragment @Inject constructor(
                 VerificationVectorAlert(
                         uid = uid,
                         title = getString(R.string.new_session),
-                        description = getString(R.string.new_session_review_with_info, newest.displayName ?: "", newest.deviceId ?: ""),
+                        description = getString(R.string.verify_this_session, newest.displayName ?: newest.deviceId ?: ""),
                         iconId = R.drawable.ic_shield_warning
                 ).apply {
                     matrixItem = user
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 700b852fd2..ccf4dfee3d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2354,6 +2354,8 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="encrypted_unverified">Encrypted by an unverified device</string>
     <string name="review_logins">Review where you’re logged in</string>
     <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
+    <!-- Argument will be replaced by the other session name (e.g, Riot Desktop, mobile) -->
+    <string name="verify_this_session">Verify the new login accessing your account: %1$s</string>
 
     <string name="cross_signing_verify_by_text">Manually Verify by Text</string>
     <string name="crosssigning_verify_session">Verify login</string>

From b3dbcd7936dddfca250043594b193be4591254a7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 30 Apr 2020 15:43:19 +0200
Subject: [PATCH 2/2] Show untrusted first

---
 .../roommemberprofile/devices/DeviceListEpoxyController.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt
index 50a87b24a4..87d156759d 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt
@@ -63,7 +63,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
                 }
             }
             is Success    -> {
-                val deviceList = data.cryptoDevices.invoke().sortedByDescending {
+                val deviceList = data.cryptoDevices.invoke().sortedBy {
                     it.isVerified
                 }