Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for versioned expiration timers.

Browse Source 
Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
Cody Henthorne
2024-08-27 07:41:35 -04:00
committed by Nicholas Tinsley
parent 4152294b57
commit 1f196f74ff
43 changed files with 392 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMessage.kt
View File

@@ -25,6 +25,7 @@ data class OutgoingMessage(
val body: String = "",
val distributionType: Int = ThreadTable.DistributionTypes.DEFAULT,
val expiresIn: Long = 0L,
val expireTimerVersion: Int = threadRecipient.expireTimerVersion,
val isViewOnce: Boolean = false,
val outgoingQuote: QuoteModel? = null,
val storyType: StoryType = StoryType.NONE,
@@ -70,6 +71,7 @@ data class OutgoingMessage(
attachments: List<Attachment> = emptyList(),
timestamp: Long,
expiresIn: Long = 0L,
expireTimerVersion: Int = 1,
viewOnce: Boolean = false,
distributionType: Int = ThreadTable.DistributionTypes.DEFAULT,
storyType: StoryType = StoryType.NONE,
@@ -92,6 +94,7 @@ data class OutgoingMessage(
attachments = attachments,
sentTimeMillis = timestamp,
expiresIn = expiresIn,
expireTimerVersion = expireTimerVersion,
isViewOnce = viewOnce,
distributionType = distributionType,
storyType = storyType,
@@ -119,6 +122,7 @@ data class OutgoingMessage(
body: String? = "",
timestamp: Long,
expiresIn: Long = 0L,
expiresTimerVersion: Int = 1,
viewOnce: Boolean = false,
storyType: StoryType = StoryType.NONE,
linkPreviews: List<LinkPreview> = emptyList(),
@@ -132,6 +136,7 @@ data class OutgoingMessage(
attachments = slideDeck.asAttachments(),
sentTimeMillis = timestamp,
expiresIn = expiresIn,
expireTimerVersion = expiresTimerVersion,
isViewOnce = viewOnce,
storyType = storyType,
linkPreviews = linkPreviews,
@@ -143,8 +148,8 @@ data class OutgoingMessage(
val subscriptionId = -1
fun withExpiry(expiresIn: Long): OutgoingMessage {
return copy(expiresIn = expiresIn)
fun withExpiry(expiresIn: Long, expireTimerVersion: Int): OutgoingMessage {
return copy(expiresIn = expiresIn, expireTimerVersion = expireTimerVersion)
}
fun stripAttachments(): OutgoingMessage {
@@ -351,12 +356,13 @@ data class OutgoingMessage(
* Helper for creating expiration update messages.
*/
@JvmStatic
fun expirationUpdateMessage(threadRecipient: Recipient, sentTimeMillis: Long, expiresIn: Long): OutgoingMessage {
fun expirationUpdateMessage(threadRecipient: Recipient, sentTimeMillis: Long, expiresIn: Long, expireTimerVersion: Int): OutgoingMessage {
return OutgoingMessage(
threadRecipient = threadRecipient,
sentTimeMillis = sentTimeMillis,
expiresIn = expiresIn,
isExpirationUpdate = true,
expireTimerVersion = expireTimerVersion,
isUrgent = false,
isSecure = true
)