signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Clean up ahead of PR.

Browse Source
This commit is contained in:
Matthew Chen 2018-01-11 13:49:50 -05:00
parent 3f74c488b2
commit fc4b0a359a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SignalShareExtension/ShareViewController.swift
View File

@ -440,16 +440,24 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE
owsFail("\(self.logTag) building attachment failed with error: \(error)")
}.retainUntilComplete()
}
private func isUrlItem(itemProvider: NSItemProvider) -> Bool {
// Special case URLs. Many shares (e.g. pdfs) will register kUTTypeURL, but
// URLs will have kUTTypeURL as their only registered UTI type.
guard itemProvider.registeredTypeIdentifiers.count == 1 else {
return false
}
guard let firstUtiType = itemProvider.registeredTypeIdentifiers.first else {
return false
}
return firstUtiType == kUTTypeURL as String
}
private func utiTypeForItem(itemProvider: NSItemProvider) -> String? {
// Special case URLs. Many shares (e.g. pdfs) will register kUTTypeURL, but
// URLs will have kUTTypeURL as their only registered UTI type.
if itemProvider.registeredTypeIdentifiers.count == 1 {
if let firstUtiType = itemProvider.registeredTypeIdentifiers.first {
if firstUtiType == kUTTypeURL as String {
return kUTTypeURL as String
}
}
if isUrlItem(itemProvider:itemProvider) {
return kUTTypeURL as String
}
// Order matters if we want to take advantage of share conversion in loadItem,
@ -598,7 +606,7 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE
// Perhaps the AVFoundation APIs require some extra file system permssion we don't have in the
// passed through URL.
private func isVideoNeedingRelocation(itemProvider: NSItemProvider, itemUrl: URL) -> Bool {
if itemProvider.hasItemConformingToTypeIdentifier(kUTTypeURL as String) {
if isUrlItem(itemProvider:itemProvider) {
return false
}