Remove the rest of MmsSmsTable.

This commit is contained in:
Greyson Parrelli
2022-12-31 13:43:12 -05:00
parent 6cd6073bc7
commit fecfd7cd78
20 changed files with 194 additions and 307 deletions

View File

@@ -7,9 +7,11 @@ import org.thoughtcrime.securesms.database.MessageTable
import org.thoughtcrime.securesms.database.NoSuchMessageException
import org.thoughtcrime.securesms.database.RecipientTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
import org.thoughtcrime.securesms.database.model.MessageId
import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.database.model.ReactionRecord
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.isStoryReaction
@@ -25,7 +27,7 @@ object NotificationStateProvider {
fun constructNotificationState(stickyThreads: Map<ConversationId, DefaultMessageNotifier.StickyThread>, notificationProfile: NotificationProfile?): NotificationState {
val messages: MutableList<NotificationMessage> = mutableListOf()
SignalDatabase.mmsSms.getMessagesForNotificationState(stickyThreads.values).use { unreadMessages ->
SignalDatabase.messages.getMessagesForNotificationState(stickyThreads.values).use { unreadMessages ->
if (unreadMessages.count == 0) {
return NotificationState.EMPTY
}
@@ -50,6 +52,13 @@ object NotificationStateProvider {
SignalDatabase.messages.hasGroupReplyOrReactionInStory(it)
}
if (record is MediaMmsMessageRecord) {
val attachments = SignalDatabase.attachments.getAttachmentsForMessage(record.id)
if (attachments.isNotEmpty()) {
record = record.withAttachments(ApplicationDependencies.getApplication(), attachments)
}
}
messages += NotificationMessage(
messageRecord = record,
reactions = if (hasUnreadReactions) SignalDatabase.reactions.getReactions(MessageId(record.id)) else emptyList(),