Merge branch 'mkirk/doc-picker-fixups'

Signal/src/ViewControllers/AttachmentApprovalViewController.swift

@@ -254,7 +254,7 @@ class AttachmentApprovalViewController: UIViewController, OWSAudioAttachmentPlay
         let fileExtensionLabel = UILabel()
         fileExtensionLabel.text = String(format:NSLocalizedString("ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT",
                                                                   comment: "Format string for file extension label in call interstitial view"),
-                                         fileExtension.capitalized)
+                                         fileExtension.uppercased())
 
         fileExtensionLabel.textColor = UIColor.white
         fileExtensionLabel.font = labelFont()

Signal/src/ViewControllers/MessagesViewController.m

@@ -2200,7 +2200,7 @@ typedef enum : NSUInteger {
     NSString *allItems = (__bridge NSString *)kUTTypeData;
     NSArray<NSString *> *documentTypes = @[ allItems ];
     // UIDocumentPickerModeImport copies to a temp file within our container.
-    // It uses more memory than "open" but let's us avoid working with security scoped URLs.
+    // It uses more memory than "open" but lets us avoid working with security scoped URLs.
     UIDocumentPickerMode pickerMode = UIDocumentPickerModeImport;
     UIDocumentMenuViewController *menuController =
         [[UIDocumentMenuViewController alloc] initWithDocumentTypes:documentTypes inMode:pickerMode];
@@ -2270,7 +2270,7 @@ typedef enum : NSUInteger {
     OWSAssert(filename);
     SignalAttachment *attachment =
         [[SignalAttachment alloc] initWithData:attachmentData dataUTI:type filename:filename];
-    [ThreadUtil sendMessageWithAttachment:attachment inThread:self.thread messageSender:self.messageSender];
+    [self tryToSendAttachmentIfApproved:attachment];
 }
 
 #pragma mark - UIImagePickerController