From 705b17e7f1014105372eb9344d1d9de5f74126e0 Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Mon, 22 May 2023 19:26:05 +0200
Subject: [PATCH 1/3] fix always returning live devices for current user

---
 .../matrix/android/sdk/internal/crypto/RustCryptoService.kt   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
index 4769d57dc9..6d96c2c836 100755
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
@@ -360,9 +360,7 @@ internal class RustCryptoService @Inject constructor(
     }
 
     override fun getLiveCryptoDeviceInfo(userIds: List<String>): LiveData<List<CryptoDeviceInfo>> {
-        return olmMachine.getLiveDevices(listOf(myUserId)).map {
-            it.filter { it.userId == myUserId }
-        }
+        return olmMachine.getLiveDevices(userIds)
     }
 
     override fun getLiveCryptoDeviceInfoWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>> {

From b98d6ca55b6b7154fa48dacffc33d6848477d546 Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Tue, 23 May 2023 08:08:02 +0200
Subject: [PATCH 2/3] Add changelog

---
 vector-app/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 9a2506391e..71e2c589e2 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -58,11 +58,11 @@ def generateVersionCodeFromVersionName() {
 }
 
 def getVersionCode() {
-    if (gitBranchName() == "develop") {
+//    if (gitBranchName() == "develop") {
         return generateVersionCodeFromTimestamp()
-    } else {
-        return generateVersionCodeFromVersionName()
-    }
+//    } else {
+//        return generateVersionCodeFromVersionName()
+//    }
 }
 
 def getNightlyUniversalApkPath() {

From 19dc812719d0232e8e2e0639fcb0447d0bce13ce Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Tue, 23 May 2023 08:32:14 +0200
Subject: [PATCH 3/3] add changelog

---
 changelog.d/8457.bugfix | 1 +
 vector-app/build.gradle | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/8457.bugfix

diff --git a/changelog.d/8457.bugfix b/changelog.d/8457.bugfix
new file mode 100644
index 0000000000..2f50364c1d
--- /dev/null
+++ b/changelog.d/8457.bugfix
@@ -0,0 +1 @@
+Fix: The device list screen from the member profile page was always showing the current user devices (rust crypto).
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 71e2c589e2..9a2506391e 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -58,11 +58,11 @@ def generateVersionCodeFromVersionName() {
 }
 
 def getVersionCode() {
-//    if (gitBranchName() == "develop") {
+    if (gitBranchName() == "develop") {
         return generateVersionCodeFromTimestamp()
-//    } else {
-//        return generateVersionCodeFromVersionName()
-//    }
+    } else {
+        return generateVersionCodeFromVersionName()
+    }
 }
 
 def getNightlyUniversalApkPath() {