Merge branch 'charlesmchen/gifVsUrl'

This commit is contained in:
Matthew Chen 2017-07-24 12:55:29 -04:00
commit 078a1312fa

View File

@ -314,10 +314,6 @@ class SignalAttachment: NSObject {
}
let pasteboardUTISet = Set<String>(pasteboardUTITypes[0])
if pasteboardUTISet.contains(kUTTypeURL as String) {
return true
}
// The pasteboard can be populated with multiple UTI types
// with different payloads. iMessage for example will copy
// an animated GIF to the pasteboard with the following UTI
@ -341,6 +337,10 @@ class SignalAttachment: NSObject {
hasNonTextUTIType = true
}
}
if pasteboardUTISet.contains(kUTTypeURL as String) {
// Treat URL as a textual UTI type.
hasTextUTIType = true
}
if hasNonTextUTIType {
return false
}