oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'disappear-2' of github.com:bemusementpark/session-android into disappear-2

This commit is contained in:
andrew 2023-11-13 23:41:49 +10:30
parent d3911fbedd 565c92f45e
commit fc9ea46ed8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -1774,12 +1774,17 @@ open class Storage(
disappearingState: Recipient.DisappearingState disappearingState: Recipient.DisappearingState
) { ) {
val threadDb = DatabaseComponent.get(context).threadDatabase() val threadDb = DatabaseComponent.get(context).threadDatabase()
val lokiDb = DatabaseComponent.get(context).lokiAPIDatabase()
val recipient = threadDb.getRecipientForThreadId(threadID) ?: return val recipient = threadDb.getRecipientForThreadId(threadID) ?: return
val recipientAddress = recipient.address.serialize()
val recipientDb = DatabaseComponent.get(context).recipientDatabase() val recipientDb = DatabaseComponent.get(context).recipientDatabase()
recipientDb.setDisappearingState(recipient, disappearingState); recipientDb.setDisappearingState(recipient, disappearingState);
if (disappearingState == DisappearingState.LEGACY) { val currentLegacyRecipient = lokiDb.getLastLegacySenderAddress(recipientAddress)
DatabaseComponent.get(context).lokiAPIDatabase() if (disappearingState == DisappearingState.LEGACY
.setLastLegacySenderAddress(recipient.address.serialize(), messageSender) && ExpirationConfiguration.isNewConfigEnabled) { // only set "this person is legacy" if new config enabled
lokiDb.setLastLegacySenderAddress(recipientAddress, messageSender)
} else if (messageSender == currentLegacyRecipient) {
lokiDb.setLastLegacySenderAddress(recipientAddress, null)
} }
} }
} }