Fix handling of URLs in SAE.

SignalShareExtension/ShareViewController.swift

@@ -90,7 +90,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed
 
             Logger.debug("\(strongSelf.logTag) setup is slow - showing loading screen")
             strongSelf.showPrimaryViewController(loadViewController)
-        }.retainUntilComplete()
+            }.retainUntilComplete()
 
         // We shouldn't set up our environment until after we've consulted isReadyForAppExtensions.
         AppSetup.setupEnvironment({
@@ -493,19 +493,19 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed
             strongSelf.loadViewController = nil
             strongSelf.showPrimaryViewController(conversationPicker)
             Logger.info("showing picker with attachment: \(attachment)")
-        }.catch {[weak self]  error in
+            }.catch {[weak self]  error in
-            AssertIsOnMainThread()
+                AssertIsOnMainThread()
-            guard let strongSelf = self else { return }
+                guard let strongSelf = self else { return }
 
-            let alertTitle = NSLocalizedString("SHARE_EXTENSION_UNABLE_TO_BUILD_ATTACHMENT_ALERT_TITLE",
+                let alertTitle = NSLocalizedString("SHARE_EXTENSION_UNABLE_TO_BUILD_ATTACHMENT_ALERT_TITLE",
-                                               comment: "Shown when trying to share content to a Signal user for the share extension. Followed by failure details.")
+                                                   comment: "Shown when trying to share content to a Signal user for the share extension. Followed by failure details.")
-            OWSAlerts.showAlert(withTitle: alertTitle,
+                OWSAlerts.showAlert(withTitle: alertTitle,
-                                message: error.localizedDescription,
+                                    message: error.localizedDescription,
-                                buttonTitle: CommonStrings.cancelButton) { _ in
+                                    buttonTitle: CommonStrings.cancelButton) { _ in
-                                    strongSelf.shareViewWasCancelled()
+                                        strongSelf.shareViewWasCancelled()
-            }
+                }
-            owsFail("\(strongSelf.logTag) building attachment failed with error: \(error)")
+                owsFail("\(strongSelf.logTag) building attachment failed with error: \(error)")
-        }.retainUntilComplete()
+            }.retainUntilComplete()
     }
 
     private class func itemMatchesSpecificUtiType(itemProvider: NSItemProvider, utiType: String) -> Bool {
@@ -612,7 +612,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed
         let loadCompletion: NSItemProvider.CompletionHandler = { [weak self]
             (value, error) in
 
-                guard let strongSelf = self else { return }
+            guard let strongSelf = self else { return }
 
             guard error == nil else {
                 reject(error!)
@@ -698,7 +698,11 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed
         }
 
         // See comments on NSItemProvider+OWS.h.
-        itemProvider.loadData(forTypeIdentifier: srcUtiType, options: nil, completionHandler: loadCompletion)
+        if srcUtiType == kUTTypeURL as String {
+            itemProvider.loadItem(forTypeIdentifier: srcUtiType, options: nil, completionHandler: loadCompletion)
+        } else {
+            itemProvider.loadData(forTypeIdentifier: srcUtiType, options: nil, completionHandler: loadCompletion)
+        }
 
         return promise.then { [weak self] (itemUrl: URL, utiType: String) -> Promise<SignalAttachment> in
             guard let strongSelf = self else {
@@ -712,7 +716,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed
                 } else {
                     return itemUrl
                 }
-            }()
+                }()
 
             Logger.debug("\(strongSelf.logTag) building DataSource with url: \(url), utiType: \(utiType)")