From 1c38fc000a3322f96f9b7e9fde34c3d3de32ea28 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 27 Feb 2024 10:36:13 +1030 Subject: [PATCH] Push empty convos to bottom and hide thread date when unknown --- .../main/java/org/thoughtcrime/securesms/database/Storage.kt | 4 ++-- .../java/org/thoughtcrime/securesms/home/ConversationView.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index f22371eb5..2760ee302 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -496,7 +496,7 @@ open class Storage( // create note to self thread if needed (?) val address = recipient.address val ourThread = getThreadId(address) ?: getOrCreateThreadIdFor(address).also { - setThreadDate(it, SnodeAPI.nowWithOffset - 14.days.inWholeMilliseconds) + setThreadDate(it, 0) } DatabaseComponent.get(context).threadDatabase().setHasSent(ourThread, true) setPinned(ourThread, userProfile.getNtsPriority() > 0) @@ -1188,7 +1188,7 @@ open class Storage( } else { ( getThreadId(address) ?: getOrCreateThreadIdFor(address).also { - setThreadDate(it, SnodeAPI.nowWithOffset - 14.days.inWholeMilliseconds) + setThreadDate(it, 0) } ).also { setPinned(it, contact.priority == PRIORITY_PINNED) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt index 31b281c6d..c876edb82 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt @@ -92,7 +92,7 @@ class ConversationView : LinearLayout { val senderDisplayName = getUserDisplayName(thread.recipient) ?: thread.recipient.address.toString() binding.conversationViewDisplayNameTextView.text = senderDisplayName - binding.timestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), thread.date) + binding.timestampTextView.text = thread.date.takeIf { it != 0L }?.let { DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), it) } val recipient = thread.recipient binding.muteIndicatorImageView.isVisible = recipient.isMuted || recipient.notifyType != NOTIFY_TYPE_ALL val drawableRes = if (recipient.isMuted || recipient.notifyType == NOTIFY_TYPE_NONE) {