Clean up ahead of PR.

pull/1/head
Matthew Chen 7 years ago
parent b61c716ea7
commit 0c16f0ad50

@ -79,7 +79,7 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE
self.loadViewController = loadViewController self.loadViewController = loadViewController
// Don't display load screen immediately, in hopes that we can avoid it altogether. // Don't display load screen immediately, in hopes that we can avoid it altogether.
after(seconds: 0.25).then { () -> Void in after(seconds: 0.5).then { () -> Void in
guard self.presentedViewController == nil else { guard self.presentedViewController == nil else {
Logger.debug("\(self.logTag) setup completed quickly, no need to present load view controller.") Logger.debug("\(self.logTag) setup completed quickly, no need to present load view controller.")
return return
@ -463,16 +463,6 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE
utiType:kUTTypeContact as String) utiType:kUTTypeContact as String)
} }
private class func isSpecialItem(itemProvider: NSItemProvider) -> Bool {
if isUrlItem(itemProvider:itemProvider) {
return true
} else if isContactItem(itemProvider:itemProvider) {
return true
} else {
return false
}
}
private class func utiTypeForItem(itemProvider: NSItemProvider) -> String? { private class func utiTypeForItem(itemProvider: NSItemProvider) -> String? {
Logger.info("\(self.logTag) utiTypeForItem: \(itemProvider.registeredTypeIdentifiers)") Logger.info("\(self.logTag) utiTypeForItem: \(itemProvider.registeredTypeIdentifiers)")
@ -718,9 +708,7 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE
// Perhaps the AVFoundation APIs require some extra file system permssion we don't have in the // Perhaps the AVFoundation APIs require some extra file system permssion we don't have in the
// passed through URL. // passed through URL.
private func isVideoNeedingRelocation(itemProvider: NSItemProvider, itemUrl: URL) -> Bool { private func isVideoNeedingRelocation(itemProvider: NSItemProvider, itemUrl: URL) -> Bool {
if ShareViewController.isSpecialItem(itemProvider:itemProvider) { Logger.info("\(self.logTag) isVideoNeedingRelocation: \(itemProvider.registeredTypeIdentifiers), itemUrl: \(itemUrl)")
return false
}
let pathExtension = itemUrl.pathExtension let pathExtension = itemUrl.pathExtension
guard pathExtension.count > 0 else { guard pathExtension.count > 0 else {
@ -731,6 +719,7 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE
Logger.verbose("\(self.logTag) in \(#function): item has unknown UTI type: \(itemUrl).") Logger.verbose("\(self.logTag) in \(#function): item has unknown UTI type: \(itemUrl).")
return false return false
} }
Logger.verbose("\(self.logTag) utiTypeForURL: \(utiTypeForURL)")
guard utiTypeForURL == kUTTypeMPEG4 as String else { guard utiTypeForURL == kUTTypeMPEG4 as String else {
// Either it's not a video or it was a video which was not auto-converted to mp4. // Either it's not a video or it was a video which was not auto-converted to mp4.
// Not affected by the issue. // Not affected by the issue.

Loading…
Cancel
Save