Greptile Summary

This PR fixes clock-drift message reordering in LXMF conversations by introducing a receivedAt column (Room migration 40→41) that captures System.currentTimeMillis() at local reception time, independently of the sender's potentially-skewed clock. All DAO queries are updated to ORDER BY COALESCE(receivedAt, timestamp), conversation card ordering is similarly fixed, and a user-facing toggle in Settings allows opting back into sender-time ordering.

• Database: receivedAt INTEGER column added via ALTER TABLE; migration is correctly registered and all existing rows get null, with COALESCE providing a safe fallback.
• Data flow: MessageCollector now stores receivedMessage.timestamp (sender's clock) in timestamp and our wall clock in receivedAt, which correctly separates the two concerns.
• Settings toggle: sortMessagesBySentTime preference drives selection between getMessagesPagedBySentTime (sender time) and getMessagesForConversationPaged (receive time) inside MessagingViewModel, reactively via a combine on the paging flow.
• Message detail screen: Incoming messages now show both a "Received" card and a "Sent by Sender" card; however, messages predating the feature (receivedAt == null) will display two identical timestamps, which is slightly confusing.
• Test regression risk: The ServicePersistenceManagerDatabaseTest assertion for lastMessageTimestamp was weakened to > 500L, which effectively never fails and would not catch a regression where the old message.timestamp mock value (1000L) was inadvertently used instead of the local wall clock.

Confidence Score: 4/5

• PR is safe to merge; the core fix is correct and backward-compatible, with two minor issues worth addressing.
• The migration, DAO queries, data-flow changes, and settings toggle are all implemented correctly and consistently. The main detractors are: (1) a near-useless test assertion that won't catch regressions in the new timestamp path, and (2) a minor UX redundancy in the detail screen for pre-feature messages. Neither blocks correctness.
• ServicePersistenceManagerDatabaseTest.kt (weak assertion) and MessageDetailScreen.kt (duplicate timestamp display for legacy messages)

Important Files Changed

Sequence Diagram

sequenceDiagram
    participant Sender as Remote Sender
    participant MC as MessageCollector
    participant SPM as ServicePersistenceManager
    participant DB as Room DB (messages)
    participant DAO as MessageDao
    participant CR as ConversationRepository
    participant VM as MessagingViewModel
    participant UI as MessagingScreen

    Sender->>MC: LXMF message (timestamp = sender's clock)
    MC->>MC: val now = System.currentTimeMillis()
    MC->>CR: saveMessage(DataMessage(timestamp=sender_ts, receivedAt=now))
    CR->>DB: INSERT message (receivedAt=now)
    CR->>DB: UPDATE conversation (lastMessageTimestamp = receivedAt ?: timestamp)

    Note over SPM: Alternate path (service-layer save)
    SPM->>SPM: val receivedAt = System.currentTimeMillis()
    SPM->>DB: INSERT message (receivedAt=receivedAt)
    SPM->>DB: UPDATE conversation (lastMessageTimestamp=receivedAt)

    VM->>VM: combine(peerHash, refreshTrigger, sortBySentTime)
    alt sortBySentTime = false (default)
        VM->>DAO: getMessagesForConversationPaged → ORDER BY COALESCE(receivedAt, timestamp) DESC
    else sortBySentTime = true
        VM->>DAO: getMessagesForConversationPagedBySentTime → ORDER BY timestamp DESC
    end
    DAO-->>VM: PagingData<MessageEntity>
    VM-->>UI: PagingData<MessageUi>
    UI->>UI: Bubble shows receivedAt ?: timestamp

_{Last reviewed commit: 6fd20f4}

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@greptileai