make RetrieveProfileAvatarJob work

pull/1164/head
ryanzhao 1 year ago
parent b494088c3d
commit fa71ea1850

@ -77,6 +77,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
JobQueue.shared.add(RetrieveProfileAvatarJob(newValue, ourRecipient.address)) JobQueue.shared.add(RetrieveProfileAvatarJob(newValue, ourRecipient.address))
} }
override fun setProfileAvatar(recipient: Recipient, profileAvatar: String) {
val database = DatabaseComponent.get(context).recipientDatabase()
database.setProfileAvatar(recipient, profileAvatar)
}
override fun getOrGenerateRegistrationID(): Int { override fun getOrGenerateRegistrationID(): Int {
var registrationID = TextSecurePreferences.getLocalRegistrationId(context) var registrationID = TextSecurePreferences.getLocalRegistrationId(context)
if (registrationID == 0) { if (registrationID == 0) {

@ -41,7 +41,6 @@ class ProfileManager : SSKEnvironment.ProfileManagerProtocol {
override fun setProfilePictureURL(context: Context, recipient: Recipient, profilePictureURL: String) { override fun setProfilePictureURL(context: Context, recipient: Recipient, profilePictureURL: String) {
val job = RetrieveProfileAvatarJob(profilePictureURL, recipient.address) val job = RetrieveProfileAvatarJob(profilePictureURL, recipient.address)
job.context = context
JobQueue.shared.add(job) JobQueue.shared.add(job)
val sessionID = recipient.address.serialize() val sessionID = recipient.address.serialize()
val contactDatabase = DatabaseComponent.get(context).sessionContactDatabase() val contactDatabase = DatabaseComponent.get(context).sessionContactDatabase()

@ -38,7 +38,7 @@ interface StorageProtocol {
fun getUserX25519KeyPair(): ECKeyPair fun getUserX25519KeyPair(): ECKeyPair
fun getUserProfile(): Profile fun getUserProfile(): Profile
fun setUserProfilePictureURL(newProfilePicture: String) fun setUserProfilePictureURL(newProfilePicture: String)
fun fun setProfileAvatar(recipient: Recipient, profileAvatar: String)
// Signal // Signal
fun getOrGenerateRegistrationID(): Int fun getOrGenerateRegistrationID(): Int

@ -125,6 +125,7 @@ class JobQueue : JobDelegate {
is NotifyPNServerJob, is AttachmentUploadJob, is MessageSendJob -> { is NotifyPNServerJob, is AttachmentUploadJob, is MessageSendJob -> {
txQueue.send(job) txQueue.send(job)
} }
is RetrieveProfileAvatarJob,
is AttachmentDownloadJob -> { is AttachmentDownloadJob -> {
mediaQueue.send(job) mediaQueue.send(job)
} }
@ -224,6 +225,7 @@ class JobQueue : JobDelegate {
GroupAvatarDownloadJob.KEY, GroupAvatarDownloadJob.KEY,
BackgroundGroupAddJob.KEY, BackgroundGroupAddJob.KEY,
OpenGroupDeleteJob.KEY, OpenGroupDeleteJob.KEY,
RetrieveProfileAvatarJob.KEY,
) )
allJobTypes.forEach { type -> allJobTypes.forEach { type ->
resumePendingJobs(type) resumePendingJobs(type)

@ -1,6 +1,5 @@
package org.session.libsession.messaging.jobs package org.session.libsession.messaging.jobs
import android.content.Context
import android.text.TextUtils import android.text.TextUtils
import org.session.libsession.avatars.AvatarHelper import org.session.libsession.avatars.AvatarHelper
import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.MessagingModuleConfiguration
@ -13,7 +12,6 @@ import org.session.libsession.utilities.Address
import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.recipients.Recipient
import org.session.libsignal.streams.ProfileCipherInputStream import org.session.libsignal.streams.ProfileCipherInputStream
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.dependencies.DatabaseComponent.Companion.get
import java.io.File import java.io.File
import java.io.FileInputStream import java.io.FileInputStream
import java.io.FileOutputStream import java.io.FileOutputStream

Loading…
Cancel
Save