From 1ee1d1795d26ca7f2eb2fb6b98c9a12d9a696b90 Mon Sep 17 00:00:00 2001 From: jubb Date: Fri, 9 Jul 2021 15:17:07 +1000 Subject: [PATCH] fix: only resume AttachmentDownloadJobs and fix boolean logic on returning early in download job --- .../securesms/conversation/v2/dialogs/DownloadDialog.kt | 3 ++- .../session/libsession/messaging/jobs/AttachmentDownloadJob.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt index fe8cbfcd69..db95e49ddd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt @@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog import kotlinx.android.synthetic.main.dialog_download.view.* import network.loki.messenger.R import org.session.libsession.messaging.contacts.Contact +import org.session.libsession.messaging.jobs.AttachmentDownloadJob import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog @@ -42,7 +43,7 @@ class DownloadDialog(private val recipient: Recipient) : BaseDialog() { val contact = contactDB.getContactWithSessionID(sessionID) ?: return val threadID = DatabaseFactory.getThreadDatabase(requireContext()).getThreadIdIfExistsFor(recipient) contactDB.setContactIsTrusted(contact, true, threadID) - JobQueue.shared.resumePendingJobs() + JobQueue.shared.resumePendingJobs(AttachmentDownloadJob.KEY) dismiss() } } \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt index ed08ed2a73..a2d673b266 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt @@ -76,7 +76,7 @@ class AttachmentDownloadJob(val attachmentID: Long, val databaseMessageID: Long) handleFailure(Error.NoSender, null) return } - if (!threadRecipient.isGroupRecipient && (!contact.isTrusted || storage.getUserPublicKey() != sender.address.serialize())) { + if (!threadRecipient.isGroupRecipient && !(contact.isTrusted || storage.getUserPublicKey() != sender.address.serialize())) { Log.e("Loki", "Thread isn't a group recipient, or contact isn't trusted or self-send") return }