Tusker.xcodeproj/project.pbxproj

@@ -2968,7 +2968,7 @@
 			repositoryURL = "https://git.shadowfacts.net/shadowfacts/HTMLStreamer.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.2.3;
+				version = 0.2.1;
 			};
 		};
 		D63CC700290EC0B8000E19DE /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {

Tusker/Screens/Large Image/LargeImageContentView.swift

@@ -197,7 +197,7 @@ class LargeImageGifvContentView: GifvAttachmentView, LargeImageContentView {
     
 }
 
-class ImageActivityItemSource: NSObject, UIActivityItemSource {
+fileprivate class ImageActivityItemSource: NSObject, UIActivityItemSource {
     let data: Data
     let url: URL
     let image: UIImage?
@@ -231,7 +231,7 @@ class ImageActivityItemSource: NSObject, UIActivityItemSource {
     }
 }
 
-class GifvActivityItemSource: NSObject, UIActivityItemSource {
+fileprivate class GifvActivityItemSource: NSObject, UIActivityItemSource {
     let asset: AVAsset
     let attachment: Attachment
     

Tusker/Screens/Utilities/Previewing.swift

@@ -48,7 +48,7 @@ extension MenuActionProvider {
         
         var shareSection = [
             openInSafariAction(url: account.url),
-            createAction(identifier: "share", title: "Share…", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
+            createAction(identifier: "share", title: "Share", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
                 guard let self = self else { return }
                 self.navigationDelegate?.showMoreOptions(forAccount: accountID, source: source)
             })
@@ -121,7 +121,7 @@ extension MenuActionProvider {
     func actionsForURL(_ url: URL, source: PopoverSource) -> [UIAction] {
         return [
             openInSafariAction(url: url),
-            createAction(identifier: "share", title: "Share…", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
+            createAction(identifier: "share", title: "Share", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
                 guard let self = self else { return }
                 self.navigationDelegate?.showMoreOptions(forURL: url, source: source)
             })
@@ -182,7 +182,7 @@ extension MenuActionProvider {
             if let url = status.url {
                 return [
                     openInSafariAction(url: url),
-                    createAction(identifier: "share", title: "Share…", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
+                    createAction(identifier: "share", title: "Share", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
                         guard let self = self else { return }
                         self.navigationDelegate?.showMoreOptions(forStatus: status.id, source: source)
                     }),
@@ -366,7 +366,7 @@ extension MenuActionProvider {
         } else {
             Logging.general.fault("Status missing URL: id=\(status.id, privacy: .public), reblog=\((status.reblog?.id).debugDescription, privacy: .public)")
         }
-        shareSection.append(createAction(identifier: "share", title: "Share…", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
+        shareSection.append(createAction(identifier: "share", title: "Share", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
             guard let self = self else { return }
             self.navigationDelegate?.showMoreOptions(forStatus: status.id, source: source)
         }))
@@ -394,7 +394,7 @@ extension MenuActionProvider {
         }
         return [
             openInSafariAction(url: url),
-            createAction(identifier: "share", title: "Share…", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
+            createAction(identifier: "share", title: "Share", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
                 guard let self else { return }
                 self.navigationDelegate?.showMoreOptions(forURL: url, source: source)
             }),

Tusker/Views/Attachments/AttachmentView.swift

@@ -203,7 +203,7 @@ class AttachmentView: GIFImageView {
                 await displayImage()
             }
         } else if let image {
-            source = .image(attachment.url, data, image)
+            source = .image(attachment.url, image)
             await displayImage()
         }
     }
@@ -225,7 +225,7 @@ class AttachmentView: GIFImageView {
                 return
             }
             
-            source = .image(previewURL, nil, image)
+            source = .image(previewURL, image)
             await displayImage()
         } else {
             let asset = AVURLAsset(url: attachment.url)
@@ -246,7 +246,7 @@ class AttachmentView: GIFImageView {
                   !Task.isCancelled else {
                 return
             }
-            source = .image(attachment.url, nil, prepared)
+            source = .image(attachment.url, prepared)
             await displayImage()
         }
     }
@@ -315,7 +315,7 @@ class AttachmentView: GIFImageView {
         case nil:
             self.image = nil
             
-        case let .image(url, _, sourceImage):
+        case let .image(url, sourceImage):
             if isGrayscale {
                 self.image = await ImageGrayscalifier.convert(url: url, image: sourceImage)
             } else {
@@ -329,6 +329,13 @@ class AttachmentView: GIFImageView {
             } else {
                 self.image = sourceImage
             }
+            
+        case let .cgImage(url, cgImage):
+            if isGrayscale {
+                self.image = await ImageGrayscalifier.convert(url: url, cgImage: cgImage)
+            } else {
+                self.image = UIImage(cgImage: cgImage)
+            }
         }
     }
     
@@ -417,9 +424,9 @@ class AttachmentView: GIFImageView {
 
 fileprivate extension AttachmentView {
     enum Source {
-        case image(URL, Data?, UIImage)
+        case image(URL, UIImage)
         case gifData(URL, Data, UIImage?)
-//        case cgImage(URL, CGImage)
+        case cgImage(URL, CGImage)
     }
     
     struct Badges: OptionSet {
@@ -432,7 +439,7 @@ fileprivate extension AttachmentView {
 
 extension AttachmentView: UIContextMenuInteractionDelegate {
     func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
-        return UIContextMenuConfiguration { [unowned self] () -> UIViewController? in
+        return UIContextMenuConfiguration(identifier: nil, previewProvider: { () -> UIViewController? in
             if self.attachment.kind == .image {
                 return AttachmentPreviewViewController(sourceView: self)
             } else if self.attachment.kind == .gifv {
@@ -442,60 +449,8 @@ extension AttachmentView: UIContextMenuInteractionDelegate {
             } else {
                 return self.delegate?.attachmentViewGallery(startingAt: self.index)
             }
-        } actionProvider: { [unowned self] _ in
-            let itemSource: UIActivityItemSource
-            let itemData: Task<Data?, Never>
-            if self.attachment.kind == .image,
-               let source {
-                switch source {
-                case .image(let url, let data, let image):
-                    let imageData: Data
-                    if let data {
-                        imageData = data
-                    } else if let data = image.pngData() {
-                        imageData = data
-                    } else {
-                        return nil
+        }, actionProvider: nil)
     }
-                    itemSource = ImageActivityItemSource(data: imageData, url: url, image: image)
-                    itemData = Task { imageData }
-                    
-                case .gifData(let url, let data, let image):
-                    itemSource = ImageActivityItemSource(data: data, url: url, image: image)
-                    itemData = Task { data }
-                }
-            } else if self.attachment.kind == .gifv {
-                itemSource = GifvActivityItemSource(asset: AVAsset(url: self.attachment.url), attachment: self.attachment)
-                itemData = Task {
-                    try? await URLSession.shared.data(from: self.attachment.url).0
-                }
-            } else {
-                return nil
-            }
-            var actions = [
-                UIAction(title: "Share…", image: UIImage(systemName: "square.and.arrow.up")) { [unowned self] _ in
-                    let vc = UIActivityViewController(activityItems: [itemSource], applicationActivities: [SaveToPhotosActivity()])
-                    self.delegate?.attachmentViewPresent(vc, animated: true)
-                }
-            ]
-            let activity = SaveToPhotosActivity()
-            if activity.canPerform(withActivityItems: [self.attachment.url]) {
-                actions.append(UIAction(title: "Save to Photos", image: UIImage(systemName: "square.and.arrow.down"), handler: { _ in
-                    Task {
-                        guard let itemData = await itemData.value else {
-                            return
-                        }
-                        let tempURL = FileManager.default.temporaryDirectory.appendingPathComponent(self.attachment.url.lastPathComponent)
-                        try itemData.write(to: tempURL)
-                        activity.prepare(withActivityItems: [tempURL])
-                        activity.perform()
-                    }
-                }))
-            }
-            return UIMenu(children: actions)
-        }
-    }
-    
     func contextMenuInteraction(_ interaction: UIContextMenuInteraction, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
         animator.addCompletion {
             animator.preferredCommitStyle = .pop