TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-20 20:48:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add some more contact syncing: nicknames, approved statuses, blocked statuses

Browse Source
This commit is contained in:
0x330a
2023-02-24 17:05:33 +11:00
parent b3ae2e967f
commit c36387175d
9 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import network.loki.messenger.libsession_util.Contacts
import network.loki.messenger.libsession_util.ConversationVolatileConfig
import network.loki.messenger.libsession_util.UserProfile
import network.loki.messenger.libsession_util.util.Conversation
import network.loki.messenger.libsession_util.util.UserPic
import org.session.libsession.avatars.AvatarHelper
import org.session.libsession.database.StorageProtocol
import org.session.libsession.messaging.BlindedIdMapping
@@ -318,7 +319,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
}
// update pfp
if (userPic == null) {
if (userPic == UserPic.DEFAULT) {
// clear picture if userPic is null
TextSecurePreferences.setProfileKey(context, null)
ProfileKeyUtil.setEncodedProfileKey(context, null)
@@ -335,10 +336,23 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
private fun updateContacts(contacts: Contacts) {
val extracted = contacts.all().toList()
val profileManager = SSKEnvironment.shared.profileManager
extracted.forEach { contact ->
val address = fromSerialized(contact.id)
val recipient = Recipient.from(context, address, false)
setBlocked(listOf(recipient), contact.blocked)
setBlocked(listOf(recipient), contact.blocked, fromConfigUpdate = true)
setRecipientApproved(recipient, contact.approved)
setRecipientApprovedMe(recipient, contact.approvedMe)
profileManager.setName(context, recipient, contact.name)
profileManager.setNickname(context, recipient, contact.nickname)
if (contact.profilePicture != UserPic.DEFAULT) {
val (url, key) = contact.profilePicture
if (key.size != ProfileKeyUtil.PROFILE_KEY_BYTES) return@forEach
profileManager.setProfileKey(context, recipient, key)
profileManager.setUnidentifiedAccessMode(context, recipient, Recipient.UnidentifiedAccessMode.UNKNOWN)
profileManager.setProfilePictureURL(context, recipient, url)
}
Log.d("Loki-DBG", "Updated contact $contact")
}
}
@@ -356,7 +370,6 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
getOrCreateThreadIdFor("",null, it)
}
}
Log.d("Loki-DBG", "Should update thread $threadId")
if (threadId >= 0) {
markConversationAsRead(threadId, conversation.lastRead)
updateThread(threadId, false)
@@ -761,6 +774,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
override fun setContact(contact: Contact) {
DatabaseComponent.get(context).sessionContactDatabase().setContact(contact)
SSKEnvironment.shared.profileManager.contactUpdatedInternal(contact)
}
override fun getRecipientForThread(threadId: Long): Recipient? {
@@ -823,7 +837,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
threadDatabase.setHasSent(threadId, true)
}
if (contact.isBlocked == true) {
setBlocked(listOf(recipient), true)
setBlocked(listOf(recipient), true, fromConfigUpdate = true)
threadDatabase.deleteConversation(threadId)
}
}
@@ -1125,16 +1139,17 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
DatabaseComponent.get(context).reactionDatabase().deleteMessageReactions(MessageId(messageId, mms))
}
override fun setBlocked(recipients: List<Recipient>, isBlocked: Boolean) {
override fun setBlocked(recipients: List<Recipient>, isBlocked: Boolean, fromConfigUpdate: Boolean) {
val recipientDb = DatabaseComponent.get(context).recipientDatabase()
recipientDb.setBlocked(recipients, isBlocked)
recipients.filter { it.isContactRecipient }.forEach { recipient ->
configFactory.contacts?.upsertContact(recipient.address.serialize()) {
this.blocked = true
this.blocked = isBlocked
}
}
val contactsConfig = configFactory.contacts ?: return
if (contactsConfig.needsDump()) {
if (contactsConfig.needsPush() && !fromConfigUpdate) {
Log.d("Loki-DBG", "Needs to push contacts after blocking ${recipients.map { it.toShortString() }}")
ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(context)
}
}

7
app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
View File

@@ -25,7 +25,6 @@ import org.session.libsession.utilities.recipients.Recipient
import org.session.libsignal.utilities.IdPrefix
import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
import org.thoughtcrime.securesms.database.ThreadDatabase
import org.thoughtcrime.securesms.dependencies.DatabaseComponent
import org.thoughtcrime.securesms.mms.GlideApp
import org.thoughtcrime.securesms.util.UiModeUtilities
import javax.inject.Inject
@@ -131,10 +130,10 @@ class UserDetailsBottomSheet: BottomSheetDialogFragment() {
newNickName = nicknameEditText.text.toString()
}
val publicKey = recipient.address.serialize()
val contactDB = DatabaseComponent.get(requireContext()).sessionContactDatabase()
val contact = contactDB.getContactWithSessionID(publicKey) ?: Contact(publicKey)
val storage = MessagingModuleConfiguration.shared.storage
val contact = storage.getContactWithSessionID(publicKey) ?: Contact(publicKey)
contact.nickname = newNickName
contactDB.setContact(contact)
storage.setContact(contact)
nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
}

4
app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt
View File

@@ -82,7 +82,7 @@ class ProfileManager(private val context: Context, private val configFactory: Co
database.setUnidentifiedAccessMode(recipient, unidentifiedAccessMode)
}
private fun contactUpdatedInternal(contact: Contact) {
override fun contactUpdatedInternal(contact: Contact) {
val contactConfig = configFactory.contacts ?: return
contactConfig.upsertContact(contact.sessionID) {
this.name = contact.name.orEmpty()
@@ -93,7 +93,7 @@ class ProfileManager(private val context: Context, private val configFactory: Co
this.profilePicture = UserPic(url, key)
}
}
if (contactConfig.needsDump()) {
if (contactConfig.needsPush()) {
ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(context)
}
}

5
app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt
View File

@@ -70,7 +70,10 @@ object ConfigurationMessageUtilities {
// don't schedule job if we already have one
val ourDestination = Destination.Contact(userPublicKey)
val currentStorageJob = storage.getConfigSyncJob(ourDestination)
if (currentStorageJob != null && !(currentStorageJob as ConfigurationSyncJob).isRunning.get()) return Promise.ofFail(NullPointerException("A job is already pending or in progress, don't schedule another job"))
if (currentStorageJob != null) {
(currentStorageJob as ConfigurationSyncJob).shouldRunAgain.set(true)
return Promise.ofFail(NullPointerException("A job is already pending or in progress, don't schedule another job"))
}
val newConfigSync = ConfigurationSyncJob(ourDestination)
Log.d("Loki", "Scheduling new ConfigurationSyncJob")
JobQueue.shared.add(newConfigSync)