Merge branch 'charlesmchen/dontSendWithReturn'

Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h

@@ -20,8 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)textViewDidChange;
 
-- (void)textViewReturnPressed;
-
 @end
 
 #pragma mark -

Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m

@@ -46,9 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 
         self.contentMode = UIViewContentModeRedraw;
         self.dataDetectorTypes = UIDataDetectorTypeNone;
-        self.keyboardAppearance = UIKeyboardAppearanceDefault;
-        self.keyboardType = UIKeyboardTypeDefault;
-        self.returnKeyType = UIReturnKeySend;
 
         self.text = nil;
 
@@ -201,20 +198,6 @@ NS_ASSUME_NONNULL_BEGIN
     [textView resignFirstResponder];
 }
 
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
-{
-    OWSAssert(self.textViewToolbarDelegate);
-
-    if (range.length > 0) {
-        return YES;
-    }
-    if ([text isEqualToString:@"\n"]) {
-        [self.textViewToolbarDelegate textViewReturnPressed];
-        return NO;
-    }
-    return YES;
-}
-
 @end
 
 NS_ASSUME_NONNULL_END

Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m

@@ -660,11 +660,6 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
     [self ensureShouldShowVoiceMemoButton];
 }
 
-- (void)textViewReturnPressed
-{
-    [self sendButtonPressed];
-}
-
 #pragma mark - Text Input Sizing
 
 - (void)addKVOObservers