empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Light refactor to thread update.

Browse source
This commit is contained in:
Clark 2023-05-31 11:43:38 -04:00 • committed by Cody Henthorne
parent f6bac2f476
commit 63d8549865
1 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
View file

@ -1405,48 +1405,43 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
}
}
val record: MessageRecord = try {
val record: MessageRecord? = try {
messages.getConversationSnippet(threadId)
} catch (e: NoSuchMessageException) {
val scheduledMessage: MessageRecord? = messages.getScheduledMessagesInThread(threadId).lastOrNull()
if (scheduledMessage == null) {
Log.w(TAG, "Failed to get a conversation snippet for thread $threadId")
if (shouldDelete) {
deleteConversation(threadId)
} else if (isPinned) {
updateThread(
threadId = threadId,
meaningfulMessages = meaningfulMessages,
body = null,
attachment = null,
contentType = null,
extra = null,
date = 0,
status = 0,
deliveryReceiptCount = 0,
type = 0,
unarchive = unarchive,
expiresIn = 0,
readReceiptCount = 0
)
}
return@withinTransaction true
} else {
if (scheduledMessage != null) {
Log.i(TAG, "Using scheduled message for conversation snippet")
scheduledMessage
}
scheduledMessage
}
val drafts: DraftTable.Drafts = SignalDatabase.drafts.getDrafts(threadId)
if (drafts.isNotEmpty()) {
val threadRecord: ThreadRecord? = getThreadRecord(threadId)
if (threadRecord != null &&
threadRecord.type == MessageTypes.BASE_DRAFT_TYPE &&
threadRecord.date > record.timestamp
) {
return@withinTransaction false
if (record == null) {
Log.w(TAG, "Failed to get a conversation snippet for thread $threadId")
if (shouldDelete) {
deleteConversation(threadId)
} else if (isPinned) {
updateThread(
threadId = threadId,
meaningfulMessages = meaningfulMessages,
body = null,
attachment = null,
contentType = null,
extra = null,
date = 0,
status = 0,
deliveryReceiptCount = 0,
type = 0,
unarchive = unarchive,
expiresIn = 0,
readReceiptCount = 0
)
}
return@withinTransaction true
}
if (hasMoreRecentDraft(threadId, record.timestamp)) {
return@withinTransaction false
}
val threadBody: ThreadBody = ThreadBodyUtil.getFormattedBodyFor(context, record)
@ -1474,6 +1469,20 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
}
}
private fun hasMoreRecentDraft(threadId: Long, timestamp: Long): Boolean {
val drafts: DraftTable.Drafts = SignalDatabase.drafts.getDrafts(threadId)
if (drafts.isNotEmpty()) {
val threadRecord: ThreadRecord? = getThreadRecord(threadId)
if (threadRecord != null &&
threadRecord.type == MessageTypes.BASE_DRAFT_TYPE &&
threadRecord.date > timestamp
) {
return true
}
}
return false
}
fun updateSnippetTypeSilently(threadId: Long) {
if (threadId == -1L) {
return