Reverted the logic to only download attachments when opening a conversation (new flag in future)

Fixed a minor bug where the UpdateProfilePictureJob could get stuck in a "defer loop"

Session/Conversations/ConversationViewModel.swift

@@ -36,12 +36,6 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
     public var lastSearchedText: String?
     public let focusedInteractionId: Int64?    // Note: This is used for global search
     
-    /// We maintain a local set of ids for attachments which we have automatically created attachmentDownload jobs for
-    /// in order to avoid creating excessive jobs while the user is actively chatting in a conversation (the attachmentDownload
-    /// jobs run serially and will only actually perform the download if the attachment hasn't already been downloaded so
-    /// we don't need to worry about duplicate jobs but it's better to avoid creating duplicate jobs when possible)
-    private var autoStartedDownloadJobAttachmentIds: Set<String> = []
-    
     public lazy var blockedBannerMessage: String = {
         switch self.threadData.threadVariant {
             case .contact:
@@ -260,44 +254,6 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
             .filter { $0.isTypingIndicator != true }
             .sorted { lhs, rhs -> Bool in lhs.timestampMs < rhs.timestampMs }
         
-        // Add download jobs for any attachments which need to be downloaded
-        let pendingAttachmentsToDownload: [(attachment: Attachment, interactionId: Int64)] = sortedData
-            .flatMap { viewModel -> [(attachment: Attachment, interactionId: Int64)] in
-                // Do nothing if this is an incoming message on an untrusted contact thread
-                guard
-                    viewModel.variant != .standardIncoming ||
-                    viewModel.threadIsTrusted ||
-                    viewModel.threadVariant != .contact
-                else { return [] }
-                
-                return (viewModel.attachments ?? [])
-                    .appending(viewModel.quoteAttachment)
-                    .appending(viewModel.linkPreviewAttachment)
-                    .filter { $0.state == .pendingDownload }
-                    .filter { !self.autoStartedDownloadJobAttachmentIds.contains($0.id) }
-                    .map { ($0, viewModel.id) }
-            }
-        
-        if !pendingAttachmentsToDownload.isEmpty {
-            Storage.shared.writeAsync { db in
-                pendingAttachmentsToDownload.forEach { attachment, interactionId in
-                    JobRunner.add(
-                        db,
-                        job: Job(
-                            variant: .attachmentDownload,
-                            threadId: self.threadId,
-                            interactionId: interactionId,
-                            details: AttachmentDownloadJob.Details(
-                                attachmentId: attachment.id
-                            )
-                        )
-                    )
-                    
-                    self.autoStartedDownloadJobAttachmentIds.insert(attachment.id)
-                }
-            }
-        }
-        
         // We load messages from newest to oldest so having a pageOffset larger than zero means
         // there are newer pages to load
         return [

SessionMessagingKit/Jobs/Types/UpdateProfilePictureJob.swift

@@ -28,6 +28,15 @@ public enum UpdateProfilePictureJob: JobExecutor {
             let lastProfilePictureUpload: Date = UserDefaults.standard[.lastProfilePictureUpload],
             Date().timeIntervalSince(lastProfilePictureUpload) > (14 * 24 * 60 * 60)
         else {
+            // Reset the `nextRunTimestamp` value just in case the last run failed so we don't get stuck
+            // in a loop endlessly deferring the job
+            if let jobId: Int64 = job.id {
+                Storage.shared.write { db in
+                    try Job
+                        .filter(id: jobId)
+                        .updateAll(db, Job.Columns.nextRunTimestamp.set(to: 0))
+                }
+            }
             deferred(job)
             return
         }

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift

@@ -204,20 +204,20 @@ extension MessageReceiver {
         message.attachmentIds = attachments.map { $0.id }
         
         // Persist quote if needed
-        try? Quote(
+        let quote: Quote? = try? Quote(
             db,
             proto: dataMessage,
             interactionId: interactionId,
             thread: thread
-        )?.insert(db)
+        )?.inserted(db)
         
         // Parse link preview if needed
-        try? LinkPreview(
+        let linkPreview: LinkPreview? = try? LinkPreview(
             db,
             proto: dataMessage,
             body: message.text,
             sentTimestampMs: (messageSentTimestamp * 1000)
-        )?.save(db)
+        )?.saved(db)
         
         // Open group invitations are stored as LinkPreview values so create one if needed
         if
@@ -232,6 +232,31 @@ extension MessageReceiver {
             ).save(db)
         }
         
+        // Start attachment downloads if needed (ie. trusted contact or group thread)
+        // FIXME: Replace this to check the `autoDownloadAttachments` flag we are adding to threads
+        let isContactTrusted: Bool = ((try? Contact.fetchOne(db, id: sender))?.isTrusted ?? false)
+
+        if isContactTrusted || thread.variant != .contact {
+            attachments
+                .map { $0.id }
+                .appending(quote?.attachmentId)
+                .appending(linkPreview?.attachmentId)
+                .forEach { attachmentId in
+                    JobRunner.add(
+                        db,
+                        job: Job(
+                            variant: .attachmentDownload,
+                            threadId: thread.id,
+                            interactionId: interactionId,
+                            details: AttachmentDownloadJob.Details(
+                                attachmentId: attachmentId
+                            )
+                        ),
+                        canStartJob: isMainAppActive
+                    )
+                }
+        }
+        
         // Cancel any typing indicators if needed
         if isMainAppActive {
             TypingIndicators.didStopTyping(db, threadId: thread.id, direction: .incoming)