Respond to CR.

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -2492,7 +2492,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
 /*
  *  Presenting UIImagePickerController
  */
-
 - (void)takePictureOrVideo
 {
     [self ows_askForCameraPermissions:^(BOOL granted) {
@@ -2752,8 +2751,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
                                   [dataSource setShouldDeleteOnDeallocation];
                                   SignalAttachment *attachment =
                                       [SignalAttachment attachmentWithDataSource:dataSource
-                                                                         dataUTI:(NSString *)kUTTypeMPEG4
-                                                                    imageQuality:TSImageQualityOriginal];
+                                                                         dataUTI:(NSString *)kUTTypeMPEG4];
                                   if (!attachment || [attachment hasError]) {
                                       DDLogError(@"%@ %s Invalid attachment: %@.",
                                           self.logTag,
@@ -3855,9 +3853,8 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     TSOutgoingMessage *message;
     if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) {
         DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text];
-        SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource
-                                                                          dataUTI:kOversizeTextAttachmentUTI
-                                                                     imageQuality:TSImageQualityOriginal];
+        SignalAttachment *attachment =
+            [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI];
         message =
             [ThreadUtil sendMessageWithAttachment:attachment inThread:self.thread messageSender:self.messageSender];
     } else {

Signal/src/ViewControllers/DebugUI/DebugUIMessages.m

@@ -378,8 +378,7 @@ NS_ASSUME_NONNULL_BEGIN
     NSString *utiType = [MIMETypeUtil utiTypeForFileExtension:filename.pathExtension];
     DataSource *_Nullable dataSource = [DataSourcePath dataSourceWithFilePath:filePath];
     [dataSource setSourceFilename:filename];
-    SignalAttachment *attachment =
-        [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType imageQuality:TSImageQualityOriginal];
+    SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType];
     OWSAssert(attachment);
     if ([attachment hasError]) {
         DDLogError(@"attachment[%@]: %@", [attachment sourceFilename], [attachment errorName]);
@@ -642,9 +641,8 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:message];
-    SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource
-                                                                      dataUTI:kOversizeTextAttachmentUTI
-                                                                 imageQuality:TSImageQualityOriginal];
+    SignalAttachment *attachment =
+        [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI];
     [ThreadUtil sendMessageWithAttachment:attachment inThread:thread messageSender:messageSender];
 }
 
@@ -670,8 +668,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSMessageSender *messageSender = [Environment current].messageSender;
     DataSource *_Nullable dataSource =
         [DataSourceValue dataSourceWithData:[self createRandomNSDataOfSize:length] utiType:uti];
-    SignalAttachment *attachment =
-        [SignalAttachment attachmentWithDataSource:dataSource dataUTI:uti imageQuality:TSImageQualityOriginal];
+    SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource dataUTI:uti];
     [ThreadUtil sendMessageWithAttachment:attachment inThread:thread messageSender:messageSender ignoreErrors:YES];
 }
 + (OWSSignalServiceProtosEnvelope *)createEnvelopeForThread:(TSThread *)thread

Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift

@@ -372,7 +372,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
                 owsFail("\(strongSelf.TAG) couldn't load asset.")
                 return
             }
-            let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: asset.rendition.utiType, imageQuality: .original)
+            let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: asset.rendition.utiType)
 
             strongSelf.delegate?.gifPickerDidSelect(attachment: attachment)
 

Signal/src/ViewControllers/MessageDetailViewController.swift

@@ -434,7 +434,7 @@ class MessageDetailViewController: OWSViewController, UIScrollViewDelegate {
 
         let contentType = attachment.contentType
         if let dataUTI = MIMETypeUtil.utiType(forMIMEType: contentType) {
-            let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .original)
+            let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI)
             let mediaMessageView = MediaMessageView(attachment: attachment, mode: .small)
             mediaMessageView.backgroundColor = UIColor.white
             self.mediaMessageView = mediaMessageView

SignalMessaging/attachments/SignalAttachment.swift

@@ -816,6 +816,15 @@ public class SignalAttachment: NSObject {
 
     // MARK: Attachments
 
+    // Factory method for attachments of any kind.
+    //
+    // NOTE: The attachment returned by this method may not be valid.
+    //       Check the attachment's error property.
+    @objc
+    public class func attachment(dataSource: DataSource?, dataUTI: String) -> SignalAttachment {
+        return attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .original)
+    }
+
     // Factory method for attachments of any kind.
     //
     // NOTE: The attachment returned by this method may not be valid.