From 2db5f5a5f0a03131078d84ae4575b1cd7a5862a3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 18 Oct 2022 14:07:01 +0200 Subject: [PATCH] Reuse $0 parameter --- .../sdk/internal/database/query/ThreadSummaryEntityQueries.kt | 2 +- .../sdk/internal/session/profile/FinalizeAddingThreePidTask.kt | 2 +- .../matrix/android/sdk/internal/session/user/UserDataSource.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt index a9d83eef0a..f16f0193a0 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt @@ -57,7 +57,7 @@ internal fun RealmList.find(rootThreadEventId: String): Thr internal fun ThreadSummaryEntity.Companion.findRootOrLatest(realm: TypedRealm, eventId: String): ThreadSummaryEntity? { return realm.query(ThreadSummaryEntity::class) - .query("rootThreadEventId == $0 OR latestThreadEventEntity.eventId == $1", eventId, eventId) + .query("rootThreadEventId == $0 OR latestThreadEventEntity.eventId == $0", eventId) .first() .find() } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt index 1a026a032c..e313b6fc35 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt @@ -99,7 +99,7 @@ internal class DefaultFinalizeAddingThreePidTask @Inject constructor( // Delete the pending three pid realmInstance.write { val pendingThreePidEntities = query(PendingThreePidEntity::class) - .query("email == $0 OR msisdn == $1", params.threePid.value, params.threePid.value) + .query("email == $0 OR msisdn == $0", params.threePid.value) .find() delete(pendingThreePidEntities) } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt index 9a2b3172ec..61fbda354a 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt @@ -73,7 +73,7 @@ internal class UserDataSource @Inject constructor( query = if (filter.isNullOrEmpty()) { query.query("userId != ''") } else { - query.query("displayName CONTAINS[c] $0 OR userId CONTAINS $1", filter, filter) + query.query("displayName CONTAINS[c] $0 OR userId CONTAINS $0", filter) } excludedUserIds ?.takeIf { it.isNotEmpty() }