Prefer URLs over images when the pasteboard contains both

irccloud · Mar 28, 2022 · 74a734c · 74a734c
1 parent 3ecf3ed
commit 74a734c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/IRCCloud/Classes/MainViewController.m b/IRCCloud/Classes/MainViewController.m
@@ -5340,15 +5340,15 @@ -(void)closeColorPicker {
 }
 
 -(void)paste:(id)sender {
-    if([UIPasteboard generalPasteboard].image) {
+    if([UIPasteboard generalPasteboard].hasImages && ![UIPasteboard generalPasteboard].hasURLs) {
         for(NSString *type in [UIPasteboard generalPasteboard].pasteboardTypes) {
             if([type isEqualToString:(__bridge NSString *)kUTTypeGIF]) {
                 [self _imagePickerController:[UIImagePickerController new] didFinishPickingMediaWithInfo:@{UIImagePickerControllerOriginalImage:[UIPasteboard generalPasteboard].image, @"gifData":[[UIPasteboard generalPasteboard] dataForPasteboardType:(__bridge NSString *)kUTTypeGIF]}];
                 return;
             }
         }
         [self _imagePickerController:[UIImagePickerController new] didFinishPickingMediaWithInfo:@{UIImagePickerControllerOriginalImage:[UIPasteboard generalPasteboard].image}];
-    } else if([UIPasteboard generalPasteboard].strings) {
+    } else if([UIPasteboard generalPasteboard].hasStrings) {
         NSMutableString *text = @"".mutableCopy;
         for(NSString *s in [UIPasteboard generalPasteboard].strings) {
             if(text.length)
@@ -5412,7 +5412,7 @@ -(void)pasteRich:(id)sender {
         [self->_message setAttributedText:msg];
         if(shouldMoveCursor)
             self->_message.selectedRange = NSMakeRange(msg.length, 0);
-    } else if([UIPasteboard generalPasteboard].strings) {
+    } else if([UIPasteboard generalPasteboard].hasStrings) {
         [self paste:nil];
     }
 }

diff --git a/build-scripts/BUILD b/build-scripts/BUILD
@@ -1 +1 @@
-237
+239