From 540036f83cb0aaa54b14f74a608cca4a6ffc4181 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 27 Oct 2021 14:36:26 +0100
Subject: [PATCH] removing extra query definition by chaining the query
 creation with modifiers

---
 .../room/summary/RoomSummaryDataSource.kt     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index f9f78b9181..9fdc27f224 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -244,16 +244,18 @@ internal class RoomSummaryDataSource @Inject constructor(
 
     private fun roomSummariesQuery(realm: Realm, queryParams: RoomSummaryQueryParams): RealmQuery<RoomSummaryEntity> {
         val query = with(queryStringValueProcessor) {
-            val query = RoomSummaryEntity.where(realm)
-            query.process(RoomSummaryEntityFields.ROOM_ID, queryParams.roomId)
-            if (queryParams.displayName.isNormalized()) {
-                query.process(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, queryParams.displayName)
-            } else {
-                query.process(RoomSummaryEntityFields.DISPLAY_NAME, queryParams.displayName)
-            }
-            query.process(RoomSummaryEntityFields.CANONICAL_ALIAS, queryParams.canonicalAlias)
-            query.process(RoomSummaryEntityFields.MEMBERSHIP_STR, queryParams.memberships)
-            query.equalTo(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, false)
+            RoomSummaryEntity.where(realm)
+                    .process(RoomSummaryEntityFields.ROOM_ID, queryParams.roomId)
+                    .let {
+                        if (queryParams.displayName.isNormalized()) {
+                            it.process(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, queryParams.displayName)
+                        } else {
+                            it.process(RoomSummaryEntityFields.DISPLAY_NAME, queryParams.displayName)
+                        }
+                    }
+                    .process(RoomSummaryEntityFields.CANONICAL_ALIAS, queryParams.canonicalAlias)
+                    .process(RoomSummaryEntityFields.MEMBERSHIP_STR, queryParams.memberships)
+                    .equalTo(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, false)
         }
 
         queryParams.roomCategoryFilter?.let {