Merge branch 'mkirk/show-message-actions-on-call'

SignalMessaging/utils/OWSWindowManager.m

@@ -406,33 +406,31 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
         [self ensureCallViewWindowShown];
         [self ensureMessageActionsWindowHidden];
         [self ensureScreenBlockWindowHidden];
-    } else if (self.callViewController) {
+    } else {
-        // Show Root Window + "Return to Call".
+        // Show Root Window
 
         [self ensureRootWindowShown];
-        [self ensureReturnToCallWindowShown];
         [self ensureCallViewWindowHidden];
-        [self ensureMessageActionsWindowHidden];
         [self ensureScreenBlockWindowHidden];
-    } else if (self.menuActionsViewController) {
-        // Show Message Actions
 
-        [self ensureRootWindowShown];
+        if (self.callViewController) {
-        [self ensureReturnToCallWindowHidden];
+            // Add "Return to Call" banner
-        [self ensureCallViewWindowHidden];
-        [self ensureMessageActionsWindowShown];
-        [self ensureScreenBlockWindowHidden];
 
-        // Don't hide rootWindow so as not to dismiss keyboard.
+            [self ensureReturnToCallWindowShown];
-        OWSAssert(!self.rootWindow.isHidden);
+        } else {
-    } else {
+            [self ensureReturnToCallWindowHidden];
-        // Show Root Window
+        }
 
-        [self ensureRootWindowShown];
+        if (self.menuActionsViewController) {
-        [self ensureReturnToCallWindowHidden];
+            // Add "Message Actions" action sheet
-        [self ensureCallViewWindowHidden];
+
-        [self ensureMessageActionsWindowHidden];
+            [self ensureMessageActionsWindowShown];
-        [self ensureScreenBlockWindowHidden];
+
+            // Don't hide rootWindow so as not to dismiss keyboard.
+            OWSAssert(!self.rootWindow.isHidden);
+        } else {
+            [self ensureMessageActionsWindowHidden];
+        }
     }
 }