Merge branch 'charlesmchen/gifVsUrl'

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,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
         }