mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 04:58:45 +00:00
Remove maximum denial tracking.
This commit is contained in:
@@ -21,10 +21,6 @@ data class PendingParticipantCollection(
|
||||
private val nowProvider: () -> Duration = { System.currentTimeMillis().milliseconds }
|
||||
) {
|
||||
|
||||
companion object {
|
||||
private val MAX_DENIALS = 2
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new collection with the given recipients applied to it with the following rules:
|
||||
*
|
||||
@@ -47,7 +43,7 @@ data class PendingParticipantCollection(
|
||||
val newEntryMap = (participantMap + newEntries)
|
||||
.filterNot { it.value.state == State.PENDING && it.key !in submittedIdSet }
|
||||
.mapValues {
|
||||
if (it.value.state == State.DENIED && it.key in submittedIdSet && it.value.denialCount < MAX_DENIALS) {
|
||||
if (it.value.state == State.DENIED && it.key in submittedIdSet) {
|
||||
it.value.copy(state = State.PENDING, stateChangeAt = now)
|
||||
} else {
|
||||
it.value
|
||||
|
||||
@@ -245,26 +245,6 @@ class PendingParticipantCollectionTest {
|
||||
assertEquals(expected, actual.first())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `Given a participant is denied twice, when I withRecipients, then I expect the state to be DENIED`() {
|
||||
val recipients = createRecipients(1)
|
||||
val expected = PendingParticipantCollection.Entry(
|
||||
recipient = recipients[0],
|
||||
state = PendingParticipantCollection.State.DENIED,
|
||||
stateChangeAt = 2.milliseconds,
|
||||
denialCount = 2
|
||||
)
|
||||
|
||||
val actual = testSubject
|
||||
.withRecipients(recipients)
|
||||
.withDenial(recipients[0])
|
||||
.withDenial(recipients[0])
|
||||
.withRecipients(recipients)
|
||||
.getAllPendingParticipants(0.milliseconds)
|
||||
|
||||
assertEquals(expected, actual.first())
|
||||
}
|
||||
|
||||
private fun createRecipients(count: Int): List<Recipient> {
|
||||
return (1..count).map { RecipientDatabaseTestUtils.createRecipient() }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user