empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Implement 1:1 call event delete syncs.

Browse source
This commit is contained in:
Alex Hart 2024-06-21 11:36:07 -03:00 • committed by Greyson Parrelli
parent 187fd63a75
commit 37cec7d44f
3 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt
View file

@ -56,7 +56,7 @@ class CallTableTest {
)
val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
SignalDatabase.calls.deleteGroupCall(call!!)
SignalDatabase.calls.markCallDeletedFromSyncEvent(call!!)
val deletedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
@ -69,9 +69,10 @@ class CallTableTest {
@Test
fun givenNoPreExistingEvent_whenIDeleteGroupCall_thenIInsertAndMarkCallDeleted() {
val callId = 1L
SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
SignalDatabase.calls.insertDeletedCallFromSyncEvent(
callId,
groupRecipientId,
CallTable.Type.GROUP_CALL,
CallTable.Direction.OUTGOING,
System.currentTimeMillis()
)
@ -438,11 +439,12 @@ class CallTableTest {
@Test
fun givenADeletedCallEvent_whenIReceiveARingUpdate_thenIIgnoreTheRingUpdate() {
val callId = 1L
SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
SignalDatabase.calls.insertDeletedCallFromSyncEvent(
callId = callId,
recipientId = groupRecipientId,
direction = CallTable.Direction.INCOMING,
timestamp = System.currentTimeMillis()
timestamp = System.currentTimeMillis(),
type = CallTable.Type.GROUP_CALL
)
SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(

26
app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
View file

@ -368,10 +368,12 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
AppDependencies.databaseObserver.notifyCallUpdateObservers()
}
// region Group / Ad-Hoc Calling
fun deleteGroupCall(call: Call) {
checkIsGroupOrAdHocCall(call)
/**
* Marks the given call event DELETED. This deletes the associated message, but
* keeps the call event around for several hours to ensure out of order messages
* do not bring it back.
*/
fun markCallDeletedFromSyncEvent(call: Call) {
val filter: SqlUtil.Query = getCallSelectionQuery(call.callId, call.peer)
writableDatabase.withinTransaction { db ->
@ -391,18 +393,21 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
AppDependencies.messageNotifier.updateNotification(context)
AppDependencies.databaseObserver.notifyCallUpdateObservers()
Log.d(TAG, "Marked group call event for deletion: ${call.callId}")
Log.d(TAG, "Marked call event for deletion: ${call.callId}")
}
fun insertDeletedGroupCallFromSyncEvent(
/**
* Inserts a call event in the DELETED state with the corresponding data.
* Deleted calls are kept around for several hours to ensure they don't reappear
* due to out of order messages.
*/
fun insertDeletedCallFromSyncEvent(
callId: Long,
recipientId: RecipientId,
type: Type,
direction: Direction,
timestamp: Long
) {
val recipient = Recipient.resolved(recipientId)
val type = if (recipient.isCallLink) Type.AD_HOC_CALL else Type.GROUP_CALL
writableDatabase
.insertInto(TABLE_NAME)
.values(
@ -418,8 +423,11 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
.run(SQLiteDatabase.CONFLICT_ABORT)
AppDependencies.deletedCallEventManager.scheduleIfNecessary()
Log.d(TAG, "Inserted deleted call event: $callId, $type, $direction, $timestamp")
}
// region Group / Ad-Hoc Calling
fun acceptIncomingGroupCall(call: Call) {
checkIsGroupOrAdHocCall(call)

16
app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
View file

@ -1354,16 +1354,20 @@ object SyncMessageProcessor {
val call = SignalDatabase.calls.getCallById(callId, recipientId)
if (call != null) {
val typeMismatch = call.type !== type
val directionMismatch = call.direction !== direction
val eventDowngrade = call.event === CallTable.Event.ACCEPTED && event !== CallTable.Event.ACCEPTED
val typeMismatch = call.type != type
val directionMismatch = call.direction != direction
val eventDowngrade = call.event == CallTable.Event.ACCEPTED && event != CallTable.Event.ACCEPTED && event != CallTable.Event.DELETE
val peerMismatch = call.peer != recipientId
if (typeMismatch || directionMismatch || eventDowngrade || peerMismatch) {
if (typeMismatch || directionMismatch || peerMismatch || eventDowngrade) {
warn(envelopeTimestamp, "Call event sync message is not valid for existing call record, ignoring. type: $type direction: $direction event: $event peerMismatch: $peerMismatch")
} else if (event == CallTable.Event.DELETE) {
SignalDatabase.calls.markCallDeletedFromSyncEvent(call)
} else {
SignalDatabase.calls.updateOneToOneCall(callId, event)
}
} else if (event == CallTable.Event.DELETE) {
SignalDatabase.calls.insertDeletedCallFromSyncEvent(callId, recipientId, type, direction, timestamp)
} else {
SignalDatabase.calls.insertOneToOneCall(callId, timestamp, recipientId, type, direction, event)
}
@ -1432,7 +1436,7 @@ object SyncMessageProcessor {
return
}
when (event) {
CallTable.Event.DELETE -> SignalDatabase.calls.deleteGroupCall(call)
CallTable.Event.DELETE -> SignalDatabase.calls.markCallDeletedFromSyncEvent(call)
CallTable.Event.ACCEPTED -> {
if (call.timestamp > timestamp) {
SignalDatabase.calls.setTimestamp(call.callId, recipient.id, timestamp)
@ -1457,7 +1461,7 @@ object SyncMessageProcessor {
}
} else {
when (event) {
CallTable.Event.DELETE -> SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(callEvent.id!!, recipient.id, direction, timestamp)
CallTable.Event.DELETE -> SignalDatabase.calls.insertDeletedCallFromSyncEvent(callEvent.id!!, recipient.id, type, direction, timestamp)
CallTable.Event.ACCEPTED -> SignalDatabase.calls.insertAcceptedGroupCall(callEvent.id!!, recipient.id, direction, timestamp)
CallTable.Event.NOT_ACCEPTED -> {
if (callEvent.direction == SyncMessage.CallEvent.Direction.INCOMING) {