From 960e500acdac1bfc62065c0b1c1d1af854433983 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 5 Mar 2021 11:48:31 +1100 Subject: [PATCH] Don't auto-download attachments from untrusted contacts --- Session.xcodeproj/project.pbxproj | 8 ++ .../ConversationVC+Interaction.swift | 47 ++++++----- .../Content Views/MediaPlaceholderView.swift | 50 ++++++++++++ .../Message Cells/VisibleMessageCell.swift | 43 +++++----- .../DownloadAttachmentModal.swift | 79 +++++++++++++++++++ SessionMessagingKit/Contacts/Contact.swift | 7 +- .../Database/Storage+Contacts.swift | 6 ++ .../Database/Storage+Jobs.swift | 19 +++++ .../Jobs/AttachmentDownloadJob.swift | 7 +- .../MessageReceiver+Handling.swift | 3 + 10 files changed, 229 insertions(+), 40 deletions(-) create mode 100644 Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift create mode 100644 Session/Conversations/Views & Modals/DownloadAttachmentModal.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index ff013c04e..464a05f38 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -288,6 +288,8 @@ B8F5F58325EC94A6003BF8D4 /* Collection+Subscripting.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F58225EC94A6003BF8D4 /* Collection+Subscripting.swift */; }; B8F5F60325EDE16F003BF8D4 /* DataExtractionNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F60225EDE16F003BF8D4 /* DataExtractionNotification.swift */; }; B8F5F61B25EDE4BF003BF8D4 /* DataExtractionNotificationInfoMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F61A25EDE4BF003BF8D4 /* DataExtractionNotificationInfoMessage.swift */; }; + B8F5F71A25F1B35C003BF8D4 /* MediaPlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F71925F1B35C003BF8D4 /* MediaPlaceholderView.swift */; }; + B8F5F72325F1B4CA003BF8D4 /* DownloadAttachmentModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F72225F1B4CA003BF8D4 /* DownloadAttachmentModal.swift */; }; B8FF8DAE25C0D00F004D1F22 /* SessionMessagingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A6F025539DE700C340D1 /* SessionMessagingKit.framework */; }; B8FF8DAF25C0D00F004D1F22 /* SessionUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A679255388CC00C340D1 /* SessionUtilitiesKit.framework */; }; B8FF8E6225C10DA5004D1F22 /* GeoLite2-Country-Blocks-IPv4 in Resources */ = {isa = PBXBuildFile; fileRef = B8FF8E6125C10DA5004D1F22 /* GeoLite2-Country-Blocks-IPv4 */; }; @@ -1283,6 +1285,8 @@ B8F5F58225EC94A6003BF8D4 /* Collection+Subscripting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+Subscripting.swift"; sourceTree = ""; }; B8F5F60225EDE16F003BF8D4 /* DataExtractionNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataExtractionNotification.swift; sourceTree = ""; }; B8F5F61A25EDE4BF003BF8D4 /* DataExtractionNotificationInfoMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataExtractionNotificationInfoMessage.swift; sourceTree = ""; }; + B8F5F71925F1B35C003BF8D4 /* MediaPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPlaceholderView.swift; sourceTree = ""; }; + B8F5F72225F1B4CA003BF8D4 /* DownloadAttachmentModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadAttachmentModal.swift; sourceTree = ""; }; B8FF8E6125C10DA5004D1F22 /* GeoLite2-Country-Blocks-IPv4 */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = "GeoLite2-Country-Blocks-IPv4"; path = "Countries/GeoLite2-Country-Blocks-IPv4"; sourceTree = ""; }; B8FF8E7325C10FC3004D1F22 /* GeoLite2-Country-Locations-English */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = "GeoLite2-Country-Locations-English"; path = "Countries/GeoLite2-Country-Locations-English"; sourceTree = ""; }; B8FF8EA525C11FEF004D1F22 /* IPv4.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPv4.swift; sourceTree = ""; }; @@ -2158,6 +2162,7 @@ B8569AD225CBA13D00DBA3DB /* MediaTextOverlayView.swift */, 3488F9352191CC4000E524CC /* MediaView.swift */, B8041A9425C8FA1D003C2166 /* MediaLoaderView.swift */, + B8F5F71925F1B35C003BF8D4 /* MediaPlaceholderView.swift */, C328251E25CA3A900062D0A7 /* QuoteView.swift */, 34B6A902218B3F62007C4606 /* TypingIndicatorView.swift */, C328250E25CA06020062D0A7 /* VoiceMessageView.swift */, @@ -2172,6 +2177,7 @@ isa = PBXGroup; children = ( B897621B25D201F7004F83B2 /* ScrollToBottomButton.swift */, + B8F5F72225F1B4CA003BF8D4 /* DownloadAttachmentModal.swift */, C3A76A8C25DB83F90074CB90 /* PermissionMissingModal.swift */, B821494525D4D6FF009C0F2A /* URLModal.swift */, B821494E25D4E163009C0F2A /* BodyTextView.swift */, @@ -4917,6 +4923,7 @@ 3496957121A301A100DCFE74 /* OWSBackupImportJob.m in Sources */, 34BECE301F7ABCF800D7438D /* GifPickerLayout.swift in Sources */, C331FFFE2558FF3B00070591 /* ConversationCell.swift in Sources */, + B8F5F72325F1B4CA003BF8D4 /* DownloadAttachmentModal.swift in Sources */, C3DFFAC623E96F0D0058DAF8 /* Sheet.swift in Sources */, C31FFE57254A5FFE00F19441 /* KeyPairUtilities.swift in Sources */, B8D84EA325DF745A005A043E /* LinkPreviewState.swift in Sources */, @@ -4933,6 +4940,7 @@ C328254925CA60E60062D0A7 /* ContextMenuVC+Action.swift in Sources */, 4542DF54208D40AC007B4E76 /* LoadingViewController.swift in Sources */, 34D5CCA91EAE3D30005515DB /* AvatarViewHelper.m in Sources */, + B8F5F71A25F1B35C003BF8D4 /* MediaPlaceholderView.swift in Sources */, 341341EF2187467A00192D59 /* ConversationViewModel.m in Sources */, 4C21D5D8223AC60F00EF8A77 /* PhotoCapture.swift in Sources */, C331FFF32558FF0300070591 /* PathStatusView.swift in Sources */, diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 83b37ef40..03761ab98 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -373,30 +373,37 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc case .audio: playOrPauseAudio(for: viewItem) case .mediaMessage: guard let index = viewItems.firstIndex(where: { $0 === viewItem }), - let cell = messagesTableView.cellForRow(at: IndexPath(row: index, section: 0)) as? VisibleMessageCell, let albumView = cell.albumView else { return } - let locationInCell = gestureRecognizer.location(in: cell) - // Figure out whether the "read more" button was tapped - if let overlayView = cell.mediaTextOverlayView { - let locationInOverlayView = cell.convert(locationInCell, to: overlayView) - if let readMoreButton = overlayView.readMoreButton, readMoreButton.frame.contains(locationInOverlayView) { - return showFullText(viewItem) // HACK: This is a dirty way to do this + let cell = messagesTableView.cellForRow(at: IndexPath(row: index, section: 0)) as? VisibleMessageCell else { return } + if let thread = viewItem.interaction.thread as? TSContactThread, + Storage.shared.getContact(with: thread.contactIdentifier())?.isTrusted != true { + // Ask the user whether they want to download this attachment + + } else { + guard let albumView = cell.albumView else { return } + let locationInCell = gestureRecognizer.location(in: cell) + // Figure out whether the "read more" button was tapped + if let overlayView = cell.mediaTextOverlayView { + let locationInOverlayView = cell.convert(locationInCell, to: overlayView) + if let readMoreButton = overlayView.readMoreButton, readMoreButton.frame.contains(locationInOverlayView) { + return showFullText(viewItem) // HACK: This is a dirty way to do this + } } - } - // Otherwise, figure out which of the media views was tapped - let locationInAlbumView = cell.convert(locationInCell, to: albumView) - guard let mediaView = albumView.mediaView(forLocation: locationInAlbumView) else { return } - if albumView.isMoreItemsView(mediaView: mediaView) && viewItem.mediaAlbumHasFailedAttachment() { - // TODO: Tapped a failed incoming attachment - } - let attachment = mediaView.attachment - if let pointer = attachment as? TSAttachmentPointer { - if pointer.state == .failed { + // Otherwise, figure out which of the media views was tapped + let locationInAlbumView = cell.convert(locationInCell, to: albumView) + guard let mediaView = albumView.mediaView(forLocation: locationInAlbumView) else { return } + if albumView.isMoreItemsView(mediaView: mediaView) && viewItem.mediaAlbumHasFailedAttachment() { // TODO: Tapped a failed incoming attachment } + let attachment = mediaView.attachment + if let pointer = attachment as? TSAttachmentPointer { + if pointer.state == .failed { + // TODO: Tapped a failed incoming attachment + } + } + guard let stream = attachment as? TSAttachmentStream else { return } + let gallery = MediaGallery(thread: thread, options: [ .sliderEnabled, .showAllMediaButton ]) + gallery.presentDetailView(fromViewController: self, mediaAttachment: stream) } - guard let stream = attachment as? TSAttachmentStream else { return } - let gallery = MediaGallery(thread: thread, options: [ .sliderEnabled, .showAllMediaButton ]) - gallery.presentDetailView(fromViewController: self, mediaAttachment: stream) case .genericAttachment: // Open the document if possible guard let url = viewItem.attachmentStream?.originalMediaURL else { return } diff --git a/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift b/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift new file mode 100644 index 000000000..59f3dab37 --- /dev/null +++ b/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift @@ -0,0 +1,50 @@ + +final class MediaPlaceholderView : UIView { + private let viewItem: ConversationViewItem + private let textColor: UIColor + + // MARK: Settings + private static let iconSize: CGFloat = 24 + private static let iconImageViewSize: CGFloat = 40 + + // MARK: Lifecycle + init(viewItem: ConversationViewItem, textColor: UIColor) { + self.viewItem = viewItem + self.textColor = textColor + super.init(frame: CGRect.zero) + setUpViewHierarchy() + } + + override init(frame: CGRect) { + preconditionFailure("Use init(viewItem:textColor:) instead.") + } + + required init?(coder: NSCoder) { + preconditionFailure("Use init(viewItem:textColor:) instead.") + } + + private func setUpViewHierarchy() { + // Image view + let iconSize = MediaPlaceholderView.iconSize + let icon = UIImage(named: "actionsheet_camera_roll_black")?.withTint(textColor)?.resizedImage(to: CGSize(width: iconSize, height: iconSize)) + let imageView = UIImageView(image: icon) + imageView.contentMode = .center + let iconImageViewSize = MediaPlaceholderView.iconImageViewSize + imageView.set(.width, to: iconImageViewSize) + imageView.set(.height, to: iconImageViewSize) + // Body label + let titleLabel = UILabel() + titleLabel.lineBreakMode = .byTruncatingTail + titleLabel.text = "Download Media?" + titleLabel.textColor = textColor + titleLabel.font = .systemFont(ofSize: Values.mediumFontSize) + // Stack view + let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ]) + stackView.axis = .horizontal + stackView.alignment = .center + stackView.isLayoutMarginsRelativeArrangement = true + stackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 12) + addSubview(stackView) + stackView.pin(to: self, withInset: Values.smallSpacing) + } +} diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index bb0e6d370..64ce2989a 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -331,25 +331,32 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate { stackView.pin(to: snContentView, withInset: inset) } case .mediaMessage: - guard let cache = delegate?.getMediaCache() else { preconditionFailure() } - let maxMessageWidth = VisibleMessageCell.getMaxWidth(for: viewItem) - let albumView = MediaAlbumView(mediaCache: cache, items: viewItem.mediaAlbumItems!, isOutgoing: isOutgoing, maxMessageWidth: maxMessageWidth) - self.albumView = albumView - snContentView.addSubview(albumView) - let size = getSize(for: viewItem) - albumView.set(.width, to: size.width) - albumView.set(.height, to: size.height) - albumView.pin(to: snContentView) - albumView.loadMedia() - albumView.layer.mask = bubbleViewMaskLayer - if let message = viewItem.interaction as? TSMessage, let body = message.body, body.count > 0, - let delegate = delegate { // delegate should always be set at this point - let overlayView = MediaTextOverlayView(viewItem: viewItem, albumViewWidth: size.width, delegate: delegate) - self.mediaTextOverlayView = overlayView - snContentView.addSubview(overlayView) - overlayView.pin([ UIView.HorizontalEdge.left, UIView.VerticalEdge.bottom, UIView.HorizontalEdge.right ], to: snContentView) + if let thread = viewItem.interaction.thread as? TSContactThread, + Storage.shared.getContact(with: thread.contactIdentifier())?.isTrusted != true { + let mediaPlaceholderView = MediaPlaceholderView(viewItem: viewItem, textColor: bodyLabelTextColor) + snContentView.addSubview(mediaPlaceholderView) + mediaPlaceholderView.pin(to: snContentView) + } else { + guard let cache = delegate?.getMediaCache() else { preconditionFailure() } + let maxMessageWidth = VisibleMessageCell.getMaxWidth(for: viewItem) + let albumView = MediaAlbumView(mediaCache: cache, items: viewItem.mediaAlbumItems!, isOutgoing: isOutgoing, maxMessageWidth: maxMessageWidth) + self.albumView = albumView + snContentView.addSubview(albumView) + let size = getSize(for: viewItem) + albumView.set(.width, to: size.width) + albumView.set(.height, to: size.height) + albumView.pin(to: snContentView) + albumView.loadMedia() + albumView.layer.mask = bubbleViewMaskLayer + if let message = viewItem.interaction as? TSMessage, let body = message.body, body.count > 0, + let delegate = delegate { // delegate should always be set at this point + let overlayView = MediaTextOverlayView(viewItem: viewItem, albumViewWidth: size.width, delegate: delegate) + self.mediaTextOverlayView = overlayView + snContentView.addSubview(overlayView) + overlayView.pin([ UIView.HorizontalEdge.left, UIView.VerticalEdge.bottom, UIView.HorizontalEdge.right ], to: snContentView) + } + unloadContent = { albumView.unloadMedia() } } - unloadContent = { albumView.unloadMedia() } case .audio: let voiceMessageView = VoiceMessageView(viewItem: viewItem) snContentView.addSubview(voiceMessageView) diff --git a/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift b/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift new file mode 100644 index 000000000..a9b6bcd8a --- /dev/null +++ b/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift @@ -0,0 +1,79 @@ + +final class DownloadAttachmentModal : Modal { + private let viewItem: ConversationViewItem + + // MARK: Lifecycle + init(viewItem: ConversationViewItem) { + self.viewItem = viewItem + super.init(nibName: nil, bundle: nil) + } + + override init(nibName: String?, bundle: Bundle?) { + preconditionFailure("Use init(viewItem:) instead.") + } + + required init?(coder: NSCoder) { + preconditionFailure("Use init(viewItem:) instead.") + } + + override func populateContentView() { + guard let publicKey = (viewItem.interaction as? TSIncomingMessage)?.authorId else { return } + // Name + let name = Storage.shared.getContact(with: publicKey)?.displayName(for: .regular) ?? publicKey + // Title + let titleLabel = UILabel() + titleLabel.textColor = Colors.text + titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) + titleLabel.text = "Trust \(name)?" + titleLabel.textAlignment = .center + // Message + let messageLabel = UILabel() + messageLabel.textColor = Colors.text + messageLabel.font = .systemFont(ofSize: Values.smallFontSize) + let message = "Are you sure you want to download media sent by \(name)?" + let attributedMessage = NSMutableAttributedString(string: message) + attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: name)) + messageLabel.attributedText = attributedMessage + messageLabel.numberOfLines = 0 + messageLabel.lineBreakMode = .byWordWrapping + messageLabel.textAlignment = .center + // Unblock button + let unblockButton = UIButton() + unblockButton.set(.height, to: Values.mediumButtonHeight) + unblockButton.layer.cornerRadius = Modal.buttonCornerRadius + unblockButton.backgroundColor = Colors.buttonBackground + unblockButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) + unblockButton.setTitleColor(Colors.text, for: UIControl.State.normal) + unblockButton.setTitle("Download", for: UIControl.State.normal) + unblockButton.addTarget(self, action: #selector(trust), for: UIControl.Event.touchUpInside) + // Button stack view + let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, unblockButton ]) + buttonStackView.axis = .horizontal + buttonStackView.spacing = Values.mediumSpacing + buttonStackView.distribution = .fillEqually + // Main stack view + let mainStackView = UIStackView(arrangedSubviews: [ titleLabel, messageLabel, buttonStackView ]) + mainStackView.axis = .vertical + mainStackView.spacing = Values.largeSpacing + contentView.addSubview(mainStackView) + mainStackView.pin(.leading, to: .leading, of: contentView, withInset: Values.largeSpacing) + mainStackView.pin(.top, to: .top, of: contentView, withInset: Values.largeSpacing) + contentView.pin(.trailing, to: .trailing, of: mainStackView, withInset: Values.largeSpacing) + contentView.pin(.bottom, to: .bottom, of: mainStackView, withInset: Values.largeSpacing) + } + + // MARK: Interaction + @objc private func trust() { + guard let message = viewItem.interaction as? TSIncomingMessage else { return } + let publicKey = message.authorId + let contact = Storage.shared.getContact(with: publicKey) ?? Contact(sessionID: publicKey) + contact.isTrusted = true + Storage.write(with: { transaction in + Storage.shared.setContact(contact, using: transaction) + message.touch(with: transaction) + }, completion: { + Storage.shared.resumeAttachmentDownloadJobsIfNeeded(for: message.uniqueId!) + }) + presentingViewController?.dismiss(animated: true, completion: nil) + } +} diff --git a/SessionMessagingKit/Contacts/Contact.swift b/SessionMessagingKit/Contacts/Contact.swift index 44b443db1..8c01e39b6 100644 --- a/SessionMessagingKit/Contacts/Contact.swift +++ b/SessionMessagingKit/Contacts/Contact.swift @@ -10,6 +10,8 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is @objc public var profilePictureEncryptionKey: OWSAES256Key? /// The ID of the thread associated with this contact. @objc public var threadID: String? + /// This flag is used to determine whether we should auto-download files sent by this contact. + @objc public var isTrusted = false // MARK: Name /// The name of the contact. Use this whenever you need the "real", underlying name of a user (e.g. when sending a message). @@ -54,8 +56,10 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is // MARK: Coding public required init?(coder: NSCoder) { - guard let sessionID = coder.decodeObject(forKey: "sessionID") as! String? else { return nil } + guard let sessionID = coder.decodeObject(forKey: "sessionID") as! String?, + let isTrusted = coder.decodeObject(forKey: "isTrusted") as! Bool? else { return nil } self.sessionID = sessionID + self.isTrusted = isTrusted if let name = coder.decodeObject(forKey: "displayName") as! String? { self.name = name } if let nickname = coder.decodeObject(forKey: "nickname") as! String? { self.nickname = nickname } if let profilePictureURL = coder.decodeObject(forKey: "profilePictureURL") as! String? { self.profilePictureURL = profilePictureURL } @@ -72,6 +76,7 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is coder.encode(profilePictureFileName, forKey: "profilePictureFileName") coder.encode(profilePictureEncryptionKey, forKey: "profilePictureEncryptionKey") coder.encode(threadID, forKey: "threadID") + coder.encode(isTrusted, forKey: "isTrusted") } // MARK: Equality diff --git a/SessionMessagingKit/Database/Storage+Contacts.swift b/SessionMessagingKit/Database/Storage+Contacts.swift index 8bb36ae74..74507c0f6 100644 --- a/SessionMessagingKit/Database/Storage+Contacts.swift +++ b/SessionMessagingKit/Database/Storage+Contacts.swift @@ -9,12 +9,18 @@ extension Storage { Storage.read { transaction in result = transaction.object(forKey: sessionID, inCollection: Storage.contactCollection) as? Contact } + if let result = result, result.sessionID == getUserHexEncodedPublicKey() { + result.isTrusted = true // Always trust ourselves + } return result } @objc(setContact:usingTransaction:) public func setContact(_ contact: Contact, using transaction: Any) { let transaction = transaction as! YapDatabaseReadWriteTransaction + if contact.sessionID == getUserHexEncodedPublicKey() { + contact.isTrusted = true // Always trust ourselves + } transaction.setObject(contact, forKey: contact.sessionID, inCollection: Storage.contactCollection) transaction.addCompletionQueue(DispatchQueue.main) { let notificationCenter = NotificationCenter.default diff --git a/SessionMessagingKit/Database/Storage+Jobs.swift b/SessionMessagingKit/Database/Storage+Jobs.swift index e07321f08..d5c520dde 100644 --- a/SessionMessagingKit/Database/Storage+Jobs.swift +++ b/SessionMessagingKit/Database/Storage+Jobs.swift @@ -72,6 +72,25 @@ extension Storage { #endif return result.first } + + public func getAttachmentDownloadJobs(for tsMessageID: String) -> [AttachmentDownloadJob] { + var result: [AttachmentDownloadJob] = [] + Storage.read { transaction in + transaction.enumerateRows(inCollection: AttachmentDownloadJob.collection) { _, object, _, _ in + guard let job = object as? AttachmentDownloadJob, job.tsMessageID == tsMessageID else { return } + result.append(job) + } + } + return result + } + + public func resumeAttachmentDownloadJobsIfNeeded(for tsMessageID: String) { + let jobs = getAttachmentDownloadJobs(for: tsMessageID) + jobs.forEach { job in + job.delegate = JobQueue.shared + job.execute() + } + } public func getMessageSendJob(for messageSendJobID: String) -> MessageSendJob? { var result: MessageSendJob? diff --git a/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift b/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift index f396085e4..4e4fa5363 100644 --- a/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift +++ b/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift @@ -8,6 +8,7 @@ public final class AttachmentDownloadJob : NSObject, Job, NSCoding { // NSObject public var delegate: JobDelegate? public var id: String? public var failureCount: UInt = 0 + public var isDeferred = false public enum Error : LocalizedError { case noAttachment @@ -33,11 +34,13 @@ public final class AttachmentDownloadJob : NSObject, Job, NSCoding { // NSObject public init?(coder: NSCoder) { guard let attachmentID = coder.decodeObject(forKey: "attachmentID") as! String?, let tsMessageID = coder.decodeObject(forKey: "tsIncomingMessageID") as! String?, - let id = coder.decodeObject(forKey: "id") as! String? else { return nil } + let id = coder.decodeObject(forKey: "id") as! String?, + let isDeferred = coder.decodeObject(forKey: "isDeferred") as! Bool? else { return nil } self.attachmentID = attachmentID self.tsMessageID = tsMessageID self.id = id self.failureCount = coder.decodeObject(forKey: "failureCount") as! UInt? ?? 0 + self.isDeferred = isDeferred } public func encode(with coder: NSCoder) { @@ -45,10 +48,12 @@ public final class AttachmentDownloadJob : NSObject, Job, NSCoding { // NSObject coder.encode(tsMessageID, forKey: "tsIncomingMessageID") coder.encode(id, forKey: "id") coder.encode(failureCount, forKey: "failureCount") + coder.encode(isDeferred, forKey: "isDeferred") } // MARK: Running public func execute() { + guard !isDeferred else { return } if TSAttachment.fetch(uniqueId: attachmentID) is TSAttachmentStream { // FIXME: It's not clear * how * this happens, but apparently we can get to this point // from time to time with an already downloaded attachment. diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift index ee30b81b5..3eadcf1a4 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift @@ -276,8 +276,11 @@ extension MessageReceiver { groupPublicKey: message.groupPublicKey, openGroupID: openGroupID, using: transaction) else { throw Error.noThread } message.threadID = threadID // Start attachment downloads if needed + let isContactTrusted = Storage.shared.getContact(with: message.sender!)?.isTrusted ?? false + let isGroup = message.groupPublicKey != nil || openGroupID != nil attachmentsToDownload.forEach { attachmentID in let downloadJob = AttachmentDownloadJob(attachmentID: attachmentID, tsMessageID: tsMessageID) + downloadJob.isDeferred = !isContactTrusted && !isGroup if isMainAppAndActive { JobQueue.shared.add(downloadJob, using: transaction) } else {