mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-02-15 07:28:30 +00:00
Update remote delete send threshold.
This commit is contained in:
@@ -13,9 +13,7 @@ import kotlin.time.Duration.Companion.milliseconds
|
||||
*/
|
||||
object MessageConstraintsUtil {
|
||||
private val RECEIVE_THRESHOLD = TimeUnit.DAYS.toMillis(2)
|
||||
|
||||
private val REMOTE_DELETE_SEND_THRESHOLD = TimeUnit.HOURS.toMillis(3)
|
||||
private val EDIT_SEND_THRESHOLD = TimeUnit.DAYS.toMillis(1)
|
||||
private val SEND_THRESHOLD = TimeUnit.DAYS.toMillis(1)
|
||||
|
||||
const val MAX_EDIT_COUNT = 10
|
||||
|
||||
@@ -51,7 +49,7 @@ object MessageConstraintsUtil {
|
||||
|
||||
@JvmStatic
|
||||
fun getEditMessageThresholdHours(): Int {
|
||||
return EDIT_SEND_THRESHOLD.milliseconds.inWholeHours.toInt()
|
||||
return SEND_THRESHOLD.milliseconds.inWholeHours.toInt()
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -64,7 +62,7 @@ object MessageConstraintsUtil {
|
||||
} else {
|
||||
targetMessage
|
||||
}
|
||||
return isValidRemoteDeleteSend(originalMessage, currentTime, EDIT_SEND_THRESHOLD) &&
|
||||
return isValidRemoteDeleteSend(originalMessage, currentTime) &&
|
||||
targetMessage.revisionNumber < MAX_EDIT_COUNT &&
|
||||
!targetMessage.isViewOnceMessage() &&
|
||||
!targetMessage.hasAudio() &&
|
||||
@@ -79,7 +77,7 @@ object MessageConstraintsUtil {
|
||||
return isValidEditMessageSend(targetMessage, targetMessage.dateSent)
|
||||
}
|
||||
|
||||
private fun isValidRemoteDeleteSend(message: MessageRecord, currentTime: Long, validDuration: Long = REMOTE_DELETE_SEND_THRESHOLD): Boolean {
|
||||
private fun isValidRemoteDeleteSend(message: MessageRecord, currentTime: Long): Boolean {
|
||||
return !message.isUpdate &&
|
||||
message.isOutgoing &&
|
||||
message.isPush &&
|
||||
@@ -87,7 +85,7 @@ object MessageConstraintsUtil {
|
||||
!message.isRemoteDelete &&
|
||||
!message.hasGiftBadge() &&
|
||||
!message.isPaymentNotification &&
|
||||
(currentTime - message.dateSent < validDuration || message.toRecipient.isSelf)
|
||||
(currentTime - message.dateSent < SEND_THRESHOLD || message.toRecipient.isSelf)
|
||||
}
|
||||
|
||||
private fun isSelf(recipientId: RecipientId): Boolean {
|
||||
|
||||
Reference in New Issue
Block a user