TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix approval not saved to user config

Browse Source
This commit is contained in:
Andrew 2024-05-06 15:41:07 +09:30
parent 7832f13562
commit b92c4065cc
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1491,14 +1491,8 @@ open class Storage(
val address = recipient.address.serialize() val address = recipient.address.serialize()
val blindedId = when { val blindedId = when {
recipient.isGroupRecipient -> null recipient.isGroupRecipient -> null
recipient.isOpenGroupInboxRecipient -> { recipient.isOpenGroupInboxRecipient -> GroupUtil.getDecodedOpenGroupInboxSessionId(address)
GroupUtil.getDecodedOpenGroupInboxSessionId(address) else -> address.takeIf { SessionId(it).prefix == IdPrefix.BLINDED }
}
else -> {
if (SessionId(address).prefix == IdPrefix.BLINDED) {
address
} else null
}
} ?: continue } ?: continue
mappingDb.getBlindedIdMapping(blindedId).firstOrNull()?.let { mappingDb.getBlindedIdMapping(blindedId).firstOrNull()?.let {
mappings[address] = it mappings[address] = it
@ -1516,8 +1510,8 @@ open class Storage(
smsDb.updateThreadId(blindedThreadId, threadId) smsDb.updateThreadId(blindedThreadId, threadId)
threadDB.deleteConversation(blindedThreadId) threadDB.deleteConversation(blindedThreadId)
} }
recipientDb.setApproved(sender, true) setRecipientApproved(sender, true)
recipientDb.setApprovedMe(sender, true) setRecipientApprovedMe(sender, true)
val message = IncomingMediaMessage( val message = IncomingMediaMessage(
sender.address, sender.address,
response.sentTimestamp!!, response.sentTimestamp!!,