From b8e2cb6267cdffa87fffcb8dba9858f135f189f1 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 15 Jan 2019 16:33:54 -0500
Subject: [PATCH] Respond to CR.

---
 .../ConversationView/ConversationInputToolbar.h           | 2 +-
 .../ConversationView/ConversationInputToolbar.m           | 8 ++------
 .../ConversationView/ConversationViewController.m         | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
index 8801a2633..eaed1c481 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
@@ -53,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)updateFontSizes;
 
-- (void)updateLayoutWithIsLandscape:(BOOL)isLandscape safeAreaInsets:(UIEdgeInsets)safeAreaInsets;
+- (void)updateLayoutWithSafeAreaInsets:(UIEdgeInsets)safeAreaInsets;
 
 #pragma mark - Voice Memo
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 4bdc4efc7..7420c9a67 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -54,7 +54,6 @@ const CGFloat kMaxTextViewHeight = 98;
 @property (nonatomic) BOOL isRecordingVoiceMemo;
 @property (nonatomic) CGPoint voiceMemoGestureStartLocation;
 @property (nonatomic, nullable) NSArray<NSLayoutConstraint *> *layoutContraints;
-@property (nonatomic) BOOL isLandscapeLayout;
 @property (nonatomic) UIEdgeInsets receivedSafeAreaInsets;
 
 @end
@@ -71,7 +70,6 @@ const CGFloat kMaxTextViewHeight = 98;
     self = [super initWithFrame:CGRectZero];
 
     _conversationStyle = conversationStyle;
-    _isLandscapeLayout = NO;
     _receivedSafeAreaInsets = UIEdgeInsetsZero;
 
     if (self) {
@@ -355,13 +353,11 @@ const CGFloat kMaxTextViewHeight = 98;
     ];
 }
 
-- (void)updateLayoutWithIsLandscape:(BOOL)isLandscape safeAreaInsets:(UIEdgeInsets)safeAreaInsets
+- (void)updateLayoutWithSafeAreaInsets:(UIEdgeInsets)safeAreaInsets
 {
-    BOOL didChange = (self.isLandscapeLayout != isLandscape
-        || !UIEdgeInsetsEqualToEdgeInsets(self.receivedSafeAreaInsets, safeAreaInsets));
+    BOOL didChange = !UIEdgeInsetsEqualToEdgeInsets(self.receivedSafeAreaInsets, safeAreaInsets);
     BOOL hasLayout = self.layoutContraints != nil;
 
-    self.isLandscapeLayout = isLandscape;
     self.receivedSafeAreaInsets = safeAreaInsets;
 
     if (didChange || !hasLayout) {
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index ac8ecfdb6..08e8c1488 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4893,12 +4893,11 @@ typedef enum : NSUInteger {
 
 - (void)updateInputToolbarLayout
 {
-    BOOL isLandscape = self.view.width > self.view.height;
     UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero;
     if (@available(iOS 11, *)) {
         safeAreaInsets = self.view.safeAreaInsets;
     }
-    [self.inputToolbar updateLayoutWithIsLandscape:isLandscape safeAreaInsets:safeAreaInsets];
+    [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets];
 }
 
 @end