mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-29 04:55:15 +00:00
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
This commit is contained in:
commit
7175a3121c
@ -1658,8 +1658,11 @@ open class Storage @Inject constructor(
|
|||||||
if (recipient.isLocalNumber || !recipient.isContactRecipient) return
|
if (recipient.isLocalNumber || !recipient.isContactRecipient) return
|
||||||
configFactory.withMutableUserConfigs {
|
configFactory.withMutableUserConfigs {
|
||||||
it.contacts.upsertContact(recipient.address.serialize()) {
|
it.contacts.upsertContact(recipient.address.serialize()) {
|
||||||
|
// if the contact wasn't approved before but is approved now, make sure it's visible
|
||||||
|
if(approved && !this.approved) this.priority = PRIORITY_VISIBLE
|
||||||
|
|
||||||
|
// update approval
|
||||||
this.approved = approved
|
this.approved = approved
|
||||||
this.priority = PRIORITY_VISIBLE
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user