From 5f5a92faac200858a6c7a680b310a9c452a19bda Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 2 Aug 2025 13:05:41 -0700 Subject: [PATCH] Fix draft being sorted at the bottom In some cases, if no date was set, it would get sorted to the bottom --- .../com/moez/QKSMS/migration/QkRealmMigration.kt | 12 +++++++----- .../QKSMS/repository/ConversationRepositoryImpl.kt | 1 + .../main/java/com/moez/QKSMS/model/Conversation.kt | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index a29afbb4..3e56541f 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -36,7 +36,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SchemaVersion: Long = 12 + const val SchemaVersion: Long = 13 } @SuppressLint("ApplySharedPref") @@ -239,10 +239,6 @@ class QkRealmMigration @Inject constructor( // Because there was never any property associated with which conversation/recipients a scheduled message was for, // we can't update this field on a realm migration. It will be set to a default of 0 - version++ - } - - if (version == 11L) { realm.schema.create("MessageContentFilter") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) .addField("value", String::class.java, FieldAttribute.REQUIRED) @@ -253,6 +249,12 @@ class QkRealmMigration @Inject constructor( version++ } + if (version == 12L) { + realm.schema.get("Conversation") + ?.addField("draftDate", Long::class.java, FieldAttribute.REQUIRED) + version++ + } + check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 11da4d2f..ac5c0102 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -353,6 +353,7 @@ class ConversationRepositoryImpl @Inject constructor( realm.executeTransaction { conversation?.takeIf { it.isValid }?.draft = draft + conversation?.takeIf { it.isValid }?.draftDate = System.currentTimeMillis() } } diff --git a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt index 4210ba69..37293297 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt @@ -31,6 +31,7 @@ open class Conversation( var recipients: RealmList = RealmList(), var lastMessage: Message? = null, var draft: String = "", + var draftDate: Long = 0, var blockingClient: Int? = null, var blockReason: String? = null, @@ -38,7 +39,7 @@ open class Conversation( var name: String = "" // For group chats, the user is allowed to set a custom title for the conversation ) : RealmObject() { - val date: Long get() = lastMessage?.date ?: 0 + val date: Long get() = lastMessage?.date ?: if (draft.isNotEmpty()) draftDate else 0 val snippet: String? get() = lastMessage?.getSummary() val unread: Boolean get() = lastMessage?.read == false val me: Boolean get() = lastMessage?.isMe() == true