From 6c9f81fd6491cbc62bc989bc55fa70a1a9dc79ac Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Wed, 24 Jun 2026 23:18:09 +0000
Subject: [PATCH] fix(messaging): stabilize message paging queries to prevent
 duplicate LazyColumn keys (COLUMBA-9W)

---
 .../main/java/network/columba/app/data/db/dao/MessageDao.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt b/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt
index 5a3124f09..a2c51a8d7 100644
--- a/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt
+++ b/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt
@@ -164,7 +164,7 @@ interface MessageDao {
         """
         SELECT * FROM messages
         WHERE conversationHash = :peerHash AND identityHash = :identityHash
-        ORDER BY COALESCE(receivedAt, timestamp) DESC
+        ORDER BY COALESCE(receivedAt, timestamp) DESC, rowid DESC
         """,
     )
     fun getMessagesForConversationPaged(
@@ -179,7 +179,7 @@ interface MessageDao {
         """
         SELECT * FROM messages
         WHERE conversationHash = :peerHash AND identityHash = :identityHash
-        ORDER BY timestamp DESC
+        ORDER BY timestamp DESC, rowid DESC
         """,
     )
     fun getMessagesForConversationPagedBySentTime(