TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 11:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into closed_groups

Browse Source 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
This commit is contained in:
SessionHero01 2024-10-10 13:56:05 +11:00
commit 7175a3121c
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ open class Storage @Inject constructor(
private val clock: SnodeClock, private val clock: SnodeClock,
private val preferences: TextSecurePreferences, private val preferences: TextSecurePreferences,
) : Database(context, helper), StorageProtocol, ThreadDatabase.ConversationThreadUpdateListener { ) : Database(context, helper), StorageProtocol, ThreadDatabase.ConversationThreadUpdateListener {
init { init {
threadDatabase.setUpdateListener(this) threadDatabase.setUpdateListener(this)
} }
@ -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
} }
} }
} }