From b69e01a5f343917900fb73b3ffc28a941ef3f821 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Jul 2023 12:11:52 +0200
Subject: [PATCH] Enable detekt rules `UseLet` and fix existing issues.

---
 .../matrix/ui/room/MatrixRoomMembers.kt        | 11 +++--------
 .../push/impl/push/DefaultPushHandler.kt       | 18 +++++++++---------
 tools/detekt/detekt.yml                        |  2 ++
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
index 7995672e92..668b963bf1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
@@ -57,14 +57,9 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
     val roomMembers = roomMembersState.roomMembers()
     return remember(roomMembersState) {
         derivedStateOf {
-            if (roomMembers == null) {
-                null
-            } else if (roomMembers.size == 2 && isDirect && isEncrypted) {
-                roomMembers.find { it.userId != this.sessionId }
-            } else {
-                null
-            }
+            roomMembers
+                ?.takeIf { it.size == 2 && isDirect && isEncrypted }
+                ?.find { it.userId != sessionId }
         }
     }
 }
-
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
index aa1d0032e0..c3d68e52ac 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
@@ -100,15 +100,15 @@ class DefaultPushHandler @Inject constructor(
             }
 
             val clientSecret = pushData.clientSecret
-            val userId = if (clientSecret == null) {
-                // Should not happen. In this case, restore default session
-                null
-            } else {
-                // Get userId from client secret
-                pushClientSecret.getUserIdFromSecret(clientSecret)
-            } ?: run {
-                matrixAuthenticationService.getLatestSessionId()
-            }
+            // clientSecret should not be null. If this happens, restore default session
+            val userId = clientSecret
+                ?.let {
+                    // Get userId from client secret
+                    pushClientSecret.getUserIdFromSecret(clientSecret)
+                }
+                ?: run {
+                    matrixAuthenticationService.getLatestSessionId()
+                }
 
             if (userId == null) {
                 Timber.w("Unable to get a session")
diff --git a/tools/detekt/detekt.yml b/tools/detekt/detekt.yml
index fbecf65073..c7dc36ad74 100644
--- a/tools/detekt/detekt.yml
+++ b/tools/detekt/detekt.yml
@@ -63,6 +63,8 @@ style:
   UseDataClass:
     active: true
     allowVars: false
+  UseLet:
+    active: true
 
 coroutines:
   GlobalCoroutineUsage: