From c3edbd9aa4e1e2eefaee75b3527b261bd09a4ec3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 7 Jun 2017 17:08:10 -0400 Subject: [PATCH] Fix paste of text fragments. // FREEBIE --- Signal/src/ViewControllers/SignalAttachment.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/SignalAttachment.swift b/Signal/src/ViewControllers/SignalAttachment.swift index 92043a657..88b7d7734 100644 --- a/Signal/src/ViewControllers/SignalAttachment.swift +++ b/Signal/src/ViewControllers/SignalAttachment.swift @@ -279,6 +279,12 @@ class SignalAttachment: NSObject { 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 { + return audioUTISet.union(videoUTISet).union(animatedImageUTISet).union(inputImageUTISet) + } + public var isImage: Bool { return SignalAttachment.outputImageUTISet.contains(dataUTI) } @@ -308,7 +314,7 @@ class SignalAttachment: NSObject { return false } let pasteboardUTISet = Set(pasteboardUTITypes[0]) - + if pasteboardUTISet.contains(kUTTypeURL as String) { return true } @@ -332,7 +338,7 @@ class SignalAttachment: NSObject { for utiType in pasteboardUTISet { if UTTypeConformsTo(utiType as CFString, kUTTypeText) { hasTextUTIType = true - } else { + } else if mediaUTISet.contains(utiType) { hasNonTextUTIType = true } }