Fix paste of text fragments.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 640b210f1e
commit c3edbd9aa4

@ -279,6 +279,12 @@ class SignalAttachment: NSObject {
return MIMETypeUtil.supportedAudioUTITypes() return MIMETypeUtil.supportedAudioUTITypes()
} }
// Returns the set of UTIs that correspond to valid image, video and audio formats
// for Signal attachments.
private class var mediaUTISet: Set<String> {
return audioUTISet.union(videoUTISet).union(animatedImageUTISet).union(inputImageUTISet)
}
public var isImage: Bool { public var isImage: Bool {
return SignalAttachment.outputImageUTISet.contains(dataUTI) return SignalAttachment.outputImageUTISet.contains(dataUTI)
} }
@ -308,7 +314,7 @@ class SignalAttachment: NSObject {
return false return false
} }
let pasteboardUTISet = Set<String>(pasteboardUTITypes[0]) let pasteboardUTISet = Set<String>(pasteboardUTITypes[0])
if pasteboardUTISet.contains(kUTTypeURL as String) { if pasteboardUTISet.contains(kUTTypeURL as String) {
return true return true
} }
@ -332,7 +338,7 @@ class SignalAttachment: NSObject {
for utiType in pasteboardUTISet { for utiType in pasteboardUTISet {
if UTTypeConformsTo(utiType as CFString, kUTTypeText) { if UTTypeConformsTo(utiType as CFString, kUTTypeText) {
hasTextUTIType = true hasTextUTIType = true
} else { } else if mediaUTISet.contains(utiType) {
hasNonTextUTIType = true hasNonTextUTIType = true
} }
} }

Loading…
Cancel
Save