mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-25 11:05:25 +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
@ -122,7 +122,7 @@ open class Storage @Inject constructor(
|
||||
private val clock: SnodeClock,
|
||||
private val preferences: TextSecurePreferences,
|
||||
) : Database(context, helper), StorageProtocol, ThreadDatabase.ConversationThreadUpdateListener {
|
||||
|
||||
|
||||
init {
|
||||
threadDatabase.setUpdateListener(this)
|
||||
}
|
||||
@ -1658,8 +1658,11 @@ open class Storage @Inject constructor(
|
||||
if (recipient.isLocalNumber || !recipient.isContactRecipient) return
|
||||
configFactory.withMutableUserConfigs {
|
||||
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.priority = PRIORITY_VISIBLE
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user