From 6b87d372e659478432845a374308a54a286b2c1f Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 12 Jul 2022 14:24:37 +0200 Subject: [PATCH] Fixes sorting isse --- .../main/java/net/pokeranalytics/android/model/Criteria.kt | 4 ++-- .../net/pokeranalytics/android/model/filter/QueryCondition.kt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt index 9f602193..4ff1f0a1 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt @@ -283,13 +283,13 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row inline fun , reified T : NameManageable> compare(): List { val objects = mutableListOf() val realm = Realm.getDefaultInstance() - realm.where().findAll().forEach { + realm.where().sort("name").findAll().forEach { val condition = (QueryCondition.getInstance() as S).apply { setObject(it) } objects.add(condition) } - objects.sort() +// objects.sort() realm.close() return objects.map { Query(it) } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index ae3d40a1..ebf26095 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -324,6 +324,7 @@ sealed class QueryCondition : RowRepresentable { val query = realm.where(entity) return query.equalTo("id", value).findFirst()?.name ?: NULL_TEXT } + } interface DateTime {