From cd291e19ffa6f66e2eb8e9c4bf2f6e3406ac9e7f Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Wed, 25 Oct 2017 11:37:04 -0700
Subject: [PATCH] We conceivably want to to initiate calls more than once
 without leaving the conversation view. e.g. from Contacts.app

// FREEBIE
---
 .../ConversationViewController.m               | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index bae229924..0cbc03645 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -972,17 +972,17 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     [self updateNavigationBarSubtitleLabel];
     [self updateBackButtonUnreadCount];
 
+    if (_composeOnOpen && !self.inputToolbar.hidden) {
+        [self popKeyBoard];
+        _composeOnOpen = NO;
+    }
+    if (_callOnOpen) {
+        [self callAction];
+        _callOnOpen = NO;
+    }
+
     if (!self.viewHasEverAppeared) {
         [self.inputToolbar endEditing:YES];
-
-        if (_composeOnOpen && !self.inputToolbar.hidden) {
-            [self popKeyBoard];
-            _composeOnOpen = NO;
-        }
-        if (_callOnOpen) {
-            [self callAction];
-            _callOnOpen = NO;
-        }
     }
     self.viewHasEverAppeared = YES;
 }