Revert "Avoid NSItemProvider.loadItem for images in share extension (#…

…2588)" This reverts commit 5ad14b1.
deltachat · Feb 9, 2025 · 59f9fa7 · 59f9fa7
1 parent 9f82c1f
commit 59f9fa7
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 40 deletions.
diff --git a/DcShare/Helper/ShareAttachment.swift b/DcShare/Helper/ShareAttachment.swift
@@ -101,16 +101,31 @@ class ShareAttachment {
     }
 
     private func createImageMsg(_ item: NSItemProvider) {
-        item.loadImage { image, error in
-            if let image, let path = ImageFormat.saveImage(image: image, directory: .cachesDirectory) {
+        item.loadItem(forTypeIdentifier: kUTTypeImage as String, options: nil) { data, error in
+            var result: UIImage?
+            switch data {
+            case let image as UIImage:
+                result = image
+            case let data as Data:
+                result = ImageFormat.loadImageFrom(data: data)
+            case let url as URL:
+                if let nsurl = NSURL(string: url.absoluteString) {
+                    // scaleDownImage() uses less memory than core and avoids exhausing the 120 mb memory restriction of extensions (see #1330)
+                    result = ImageFormat.scaleDownImage(nsurl, toMax: 1280)
+                }
+            default:
+                self.error = "Unexpected data: \(type(of: data))"
+            }
+            if let result = result,
+               let path = ImageFormat.saveImage(image: result, directory: .cachesDirectory) {
                 _ = self.addDcMsg(path: path, viewType: DC_MSG_IMAGE)
                 self.delegate?.onAttachmentChanged()
                 if self.imageThumbnail == nil {
                     self.imageThumbnail = ImageFormat.scaleDownImage(NSURL(fileURLWithPath: path), toMax: self.thumbnailSize)
                     self.delegate?.onThumbnailChanged()
                 }
             }
-            if let error {
+            if let error = error {
                 self.error = error.localizedDescription
             }
         }

diff --git a/deltachat-ios.xcodeproj/project.pbxproj b/deltachat-ios.xcodeproj/project.pbxproj
@@ -131,8 +131,6 @@
 		5F153E9A2CC38BAA00871ABE /* GiveBackMyFirstResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F153E992CC38BAA00871ABE /* GiveBackMyFirstResponder.swift */; };
 		5F4945AB2D315E7000DCD50A /* UIPasteboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F4945AA2D315E7000DCD50A /* UIPasteboard.swift */; };
 		5F785F6E2CB9344F003FFFB9 /* ReusableCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F785F6D2CB9344F003FFFB9 /* ReusableCellProtocol.swift */; };
-		5FFAA5442D56673A00B1D54F /* NSItemProvider+loadImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FFAA5432D56673A00B1D54F /* NSItemProvider+loadImage.swift */; };
-		5FFAA5452D56679C00B1D54F /* NSItemProvider+loadImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FFAA5432D56673A00B1D54F /* NSItemProvider+loadImage.swift */; };
 		7070FB9B2101ECBB000DC258 /* NewGroupController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7070FB9A2101ECBB000DC258 /* NewGroupController.swift */; };
 		7092474120B3869500AF8799 /* ContactDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7092474020B3869500AF8799 /* ContactDetailViewController.swift */; };
 		70B8882E2091B8550074812E /* ContactCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B8882D2091B8550074812E /* ContactCell.swift */; };
@@ -466,7 +464,6 @@
 		5F153E992CC38BAA00871ABE /* GiveBackMyFirstResponder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiveBackMyFirstResponder.swift; sourceTree = "<group>"; };
 		5F4945AA2D315E7000DCD50A /* UIPasteboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIPasteboard.swift; sourceTree = "<group>"; };
 		5F785F6D2CB9344F003FFFB9 /* ReusableCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReusableCellProtocol.swift; sourceTree = "<group>"; };
-		5FFAA5432D56673A00B1D54F /* NSItemProvider+loadImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSItemProvider+loadImage.swift"; sourceTree = "<group>"; };
 		7070FB9A2101ECBB000DC258 /* NewGroupController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewGroupController.swift; sourceTree = "<group>"; };
 		7092474020B3869500AF8799 /* ContactDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactDetailViewController.swift; sourceTree = "<group>"; };
 		70B8882D2091B8550074812E /* ContactCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactCell.swift; sourceTree = "<group>"; };
@@ -765,7 +762,6 @@
 				AEE56D7F225504DB007DC082 /* Extensions.swift */,
 				D84738D12BBC1C2C00ECD52B /* UIAction+Extension.swift */,
 				78E45E4321D3F14A00D4B15E /* UIImage+Extension.swift */,
-				5FFAA5432D56673A00B1D54F /* NSItemProvider+loadImage.swift */,
 				305961832346125000C80F33 /* UIEdgeInsets+Extensions.swift */,
 				305961862346125000C80F33 /* NSAttributedString+Extensions.swift */,
 				305961882346125000C80F33 /* CGRect+Extensions.swift */,
@@ -1620,7 +1616,6 @@
 				3057027F24C5B2F800D84EFC /* ChatListViewModel.swift in Sources */,
 				302589FF2452FA280086C1CD /* ShareAttachment.swift in Sources */,
 				3057029F24C6445000D84EFC /* EmptyStateLabel.swift in Sources */,
-				5FFAA5452D56679C00B1D54F /* NSItemProvider+loadImage.swift in Sources */,
 				305702A224C6455400D84EFC /* TypeAlias.swift in Sources */,
 				308850A0282A914F00204623 /* DcMsg+Extension.swift in Sources */,
 				30238D0028A557E800EF14AC /* FileHelper.swift in Sources */,
@@ -1674,7 +1669,6 @@
 				3080A022277DE09900E74565 /* InputTextView.swift in Sources */,
 				30734326249A280B00BF9AD1 /* MediaQualityViewController.swift in Sources */,
 				3080A01C277DDB8A00E74565 /* InputBarAccessoryViewDelegate.swift in Sources */,
-				5FFAA5442D56673A00B1D54F /* NSItemProvider+loadImage.swift in Sources */,
 				D89C456D2D0AF6A8005B1491 /* WidgetEntry.swift in Sources */,
 				30FDB70524D1C1000066C48D /* ChatViewController.swift in Sources */,
 				3080A013277DDABA00E74565 /* KeyboardNotification.swift in Sources */,

diff --git a/deltachat-ios/Controller/NewContactController.swift b/deltachat-ios/Controller/NewContactController.swift
@@ -5,7 +5,7 @@ class NewContactController: UITableViewController {
 
     let dcContext: DcContext
     var createChatOnSave = true
-    var prefilledSearchResult: String?
+    var prefilledSeachResult: String?
 
     let emailCell = TextFieldCell.makeEmailCell()
     let nameCell = TextFieldCell.makeNameCell()
@@ -34,7 +34,7 @@ class NewContactController: UITableViewController {
     init(dcContext: DcContext, searchResult: String? = nil) {
         self.dcContext = dcContext
         cells = [emailCell, nameCell]
-        prefilledSearchResult = searchResult
+        prefilledSeachResult = searchResult
         super.init(style: .insetGrouped)
         emailCell.textFieldDelegate = self
         nameCell.textFieldDelegate = self
@@ -59,7 +59,7 @@ class NewContactController: UITableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        if let searchResult = prefilledSearchResult, searchResult.contains("@") {
+        if let searchResult = prefilledSeachResult, searchResult.contains("@") {
             emailCell.textField.insertText(searchResult)
         }
     }

diff --git a/deltachat-ios/Extensions/NSItemProvider+loadImage.swift b/deltachat-ios/Extensions/NSItemProvider+loadImage.swift
diff --git a/deltachat-ios/Helper/ChatDropInteraction.swift b/deltachat-ios/Helper/ChatDropInteraction.swift
@@ -51,9 +51,26 @@ public class ChatDropInteraction {
 
     private func loadImageObjects(session: UIDropSession) {
         guard let droppedItem = session.items.first else { return }
-        droppedItem.itemProvider.loadImage { [weak self] image, _ in
-            guard let self, let image else { return }
-            self.delegate?.onImageDragAndDropped(image: image)
+
+        // If webP is provided and eg JPEG (or another type that is supported by loadObject),
+        // always pick webP because it might have transparancy unlike JPEG.
+        if #available(iOS 14, *), droppedItem.itemProvider.hasItemConformingToTypeIdentifier(UTType.webP.identifier) {
+            droppedItem.itemProvider.loadDataRepresentation(forTypeIdentifier: UTType.webP.identifier) { [weak self] webPData, _ in
+                guard let self, let image = UIImage.sd_image(withWebPData: webPData) else { return }
+                self.delegate?.onImageDragAndDropped(image: image)
+            }
+        } else if droppedItem.itemProvider.canLoadObject(ofClass: UIImage.self) {
+            droppedItem.itemProvider.loadObject(ofClass: UIImage.self) { [weak self] imageItem, _ in
+                guard let image = imageItem as? UIImage else { return }
+                self?.delegate?.onImageDragAndDropped(image: image)
+            }
+        } else {
+            // Some images (like webP) can't be loaded into UIImage by UIDropSession so we fall back on SD.
+            // See `UIImage.readableTypeIdentifiersForItemProvider` for ones that can.
+            droppedItem.itemProvider.loadDataRepresentation(forTypeIdentifier: kUTTypeImage as String) { [weak self] data, _ in
+                guard let self, let image = UIImage.sd_image(with: data) else { return }
+                self.delegate?.onImageDragAndDropped(image: image)
+            }
         }
     }