From 37738c24c50a403e9337d02d48316b1c65f5db8c Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 22 Aug 2018 13:05:03 -0600
Subject: [PATCH 1/2] Allow menuActions + callBanner

// FREEBIE
---
 SignalMessaging/utils/OWSWindowManager.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m
index f1a9fd6f8..74cf531f5 100644
--- a/SignalMessaging/utils/OWSWindowManager.m
+++ b/SignalMessaging/utils/OWSWindowManager.m
@@ -412,8 +412,12 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
         [self ensureRootWindowShown];
         [self ensureReturnToCallWindowShown];
         [self ensureCallViewWindowHidden];
-        [self ensureMessageActionsWindowHidden];
         [self ensureScreenBlockWindowHidden];
+        if (self.menuActionsViewController) {
+            [self ensureMessageActionsWindowShown];
+        } else {
+            [self ensureMessageActionsWindowHidden];
+        }
     } else if (self.menuActionsViewController) {
         // Show Message Actions
 

From bc2ba63c21444ab7cd4364fe728e07989f4f624d Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 22 Aug 2018 13:10:30 -0600
Subject: [PATCH 2/2] DRY refactor

---
 SignalMessaging/utils/OWSWindowManager.m | 38 ++++++++++--------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m
index 74cf531f5..24aa16563 100644
--- a/SignalMessaging/utils/OWSWindowManager.m
+++ b/SignalMessaging/utils/OWSWindowManager.m
@@ -406,37 +406,31 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
         [self ensureCallViewWindowShown];
         [self ensureMessageActionsWindowHidden];
         [self ensureScreenBlockWindowHidden];
-    } else if (self.callViewController) {
-        // Show Root Window + "Return to Call".
+    } else {
+        // Show Root Window
 
         [self ensureRootWindowShown];
-        [self ensureReturnToCallWindowShown];
         [self ensureCallViewWindowHidden];
         [self ensureScreenBlockWindowHidden];
-        if (self.menuActionsViewController) {
-            [self ensureMessageActionsWindowShown];
+
+        if (self.callViewController) {
+            // Add "Return to Call" banner
+
+            [self ensureReturnToCallWindowShown];
         } else {
-            [self ensureMessageActionsWindowHidden];
+            [self ensureReturnToCallWindowHidden];
         }
-    } else if (self.menuActionsViewController) {
-        // Show Message Actions
 
-        [self ensureRootWindowShown];
-        [self ensureReturnToCallWindowHidden];
-        [self ensureCallViewWindowHidden];
-        [self ensureMessageActionsWindowShown];
-        [self ensureScreenBlockWindowHidden];
+        if (self.menuActionsViewController) {
+            // Add "Message Actions" action sheet
 
-        // Don't hide rootWindow so as not to dismiss keyboard.
-        OWSAssert(!self.rootWindow.isHidden);
-    } else {
-        // Show Root Window
+            [self ensureMessageActionsWindowShown];
 
-        [self ensureRootWindowShown];
-        [self ensureReturnToCallWindowHidden];
-        [self ensureCallViewWindowHidden];
-        [self ensureMessageActionsWindowHidden];
-        [self ensureScreenBlockWindowHidden];
+            // Don't hide rootWindow so as not to dismiss keyboard.
+            OWSAssert(!self.rootWindow.isHidden);
+        } else {
+            [self ensureMessageActionsWindowHidden];
+        }
     }
 }