From 7b356484ae6e21d4efa236d397894de20d989782 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 27 Oct 2021 14:34:40 +0100 Subject: [PATCH] removing noisy log which duplicates a type clause and fixing when casing formatting to have a case per line --- .../internal/query/QueryStringValueProcessor.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt index 33564eb610..b42bf2b8c7 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt @@ -22,7 +22,6 @@ import io.realm.RealmQuery import org.matrix.android.sdk.api.query.QueryStringValue import org.matrix.android.sdk.api.query.QueryStringValue.ContentQueryStringValue import org.matrix.android.sdk.internal.util.Normalizer -import timber.log.Timber import javax.inject.Inject class QueryStringValueProcessor @Inject constructor( @@ -31,10 +30,7 @@ class QueryStringValueProcessor @Inject constructor( fun RealmQuery.process(field: String, queryStringValue: QueryStringValue): RealmQuery { return when (queryStringValue) { - is QueryStringValue.NoCondition -> { - Timber.v("No condition to process") - this - } + is QueryStringValue.NoCondition -> this is QueryStringValue.IsNotNull -> isNotNull(field) is QueryStringValue.IsNull -> isNull(field) is QueryStringValue.IsEmpty -> isEmpty(field) @@ -48,15 +44,17 @@ class QueryStringValueProcessor @Inject constructor( private fun ContentQueryStringValue.toRealmValue(): String { return when (case) { - QueryStringValue.Case.NORMALIZED -> normalizer.normalize(string) - QueryStringValue.Case.SENSITIVE, QueryStringValue.Case.INSENSITIVE -> string + QueryStringValue.Case.NORMALIZED -> normalizer.normalize(string) + QueryStringValue.Case.SENSITIVE, + QueryStringValue.Case.INSENSITIVE -> string } } } private fun QueryStringValue.Case.toRealmCase(): Case { return when (this) { - QueryStringValue.Case.INSENSITIVE -> Case.INSENSITIVE - QueryStringValue.Case.SENSITIVE, QueryStringValue.Case.NORMALIZED -> Case.SENSITIVE + QueryStringValue.Case.INSENSITIVE -> Case.INSENSITIVE + QueryStringValue.Case.SENSITIVE, + QueryStringValue.Case.NORMALIZED -> Case.SENSITIVE } }