From 9eaeba9af332f5a23d73a8a4812464484853fa09 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 24 Jul 2017 10:06:30 -0400
Subject: [PATCH 1/2] Address yet another edge cases around pasteboards that
 contain both textual and non-textual content, e.g. a gif and the URL of that
 gif.

// FREEBIE
---
 Signal/src/ViewControllers/SignalAttachment.swift | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/SignalAttachment.swift b/Signal/src/ViewControllers/SignalAttachment.swift
index 787b04944..19e0b6c21 100644
--- a/Signal/src/ViewControllers/SignalAttachment.swift
+++ b/Signal/src/ViewControllers/SignalAttachment.swift
@@ -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,9 @@ class SignalAttachment: NSObject {
                 hasNonTextUTIType = true
             }
         }
+        if pasteboardUTISet.contains(kUTTypeURL as String) {
+            hasTextUTIType = true
+        }
         if hasNonTextUTIType {
             return false
         }

From 97772a32ff7cd5fbdc2b6c17ff3c2fc5432b4cd1 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 24 Jul 2017 12:55:05 -0400
Subject: [PATCH 2/2] Respond to CR.

// FREEBIE
---
 Signal/src/ViewControllers/SignalAttachment.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Signal/src/ViewControllers/SignalAttachment.swift b/Signal/src/ViewControllers/SignalAttachment.swift
index 19e0b6c21..d56593292 100644
--- a/Signal/src/ViewControllers/SignalAttachment.swift
+++ b/Signal/src/ViewControllers/SignalAttachment.swift
@@ -338,6 +338,7 @@ class SignalAttachment: NSObject {
             }
         }
         if pasteboardUTISet.contains(kUTTypeURL as String) {
+            // Treat URL as a textual UTI type.
             hasTextUTIType = true
         }
         if hasNonTextUTIType {