Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge MediaMmsMessageRecord into MmsMessageRecord.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-11-12 12:47:26 -05:00
parent 5f6fa73be9
commit 2f52664820
41 changed files with 407 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.kt
View File

@@ -5,7 +5,6 @@ package org.thoughtcrime.securesms.util
import android.content.Context
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.MessageTypes
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.database.model.MmsMessageRecord
import org.thoughtcrime.securesms.database.model.Quote
@@ -19,7 +18,7 @@ const val MAX_BODY_DISPLAY_LENGTH = 1000
fun MessageRecord.isMediaMessage(): Boolean {
return isMms &&
!isMmsNotification &&
(this as MediaMmsMessageRecord).containsMediaSlide() &&
(this as MmsMessageRecord).containsMediaSlide() &&
slideDeck.stickerSlide == null
}
@@ -145,7 +144,7 @@ fun MessageRecord.isTextOnly(context: Context): Boolean {
}
fun MessageRecord.isScheduled(): Boolean {
return (this as? MediaMmsMessageRecord)?.scheduledDate?.let { it != -1L } ?: false
return (this as? MmsMessageRecord)?.scheduledDate?.let { it != -1L } ?: false
}
/**
@@ -156,7 +155,7 @@ fun MessageRecord.getRecordQuoteType(): QuoteModel.Type {
}
fun MessageRecord.isEditMessage(): Boolean {
return this is MediaMmsMessageRecord && isEditMessage
return this is MmsMessageRecord && isEditMessage
}
/**

4
app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
View File

@@ -26,7 +26,7 @@ import org.signal.core.util.StreamUtil
import org.signal.core.util.logging.Log
import org.signal.core.util.orNull
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
import org.thoughtcrime.securesms.database.model.MmsMessageRecord
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.mms.PartAuthority
import java.io.File
@@ -63,7 +63,7 @@ object SaveAttachmentUtil {
.show()
}
fun getAttachmentsForRecord(record: MediaMmsMessageRecord): Set<SaveAttachment> {
fun getAttachmentsForRecord(record: MmsMessageRecord): Set<SaveAttachment> {
return record.slideDeck.slides
.filter { it.uri != null && (it.hasImage() || it.hasVideo() || it.hasAudio() || it.hasDocument()) }
.map { SaveAttachment(it.uri!!, it.contentType, record.dateSent, it.fileName.orNull()) }