From 50f9a089bfe0f923bdb0b7642018684b70567333 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 16 Jan 2019 09:55:23 -0500
Subject: [PATCH] Fix navbar layout in share extension.

---
 SignalMessaging/Views/OWSNavigationBar.swift | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/SignalMessaging/Views/OWSNavigationBar.swift b/SignalMessaging/Views/OWSNavigationBar.swift
index d091cdf81..aae117725 100644
--- a/SignalMessaging/Views/OWSNavigationBar.swift
+++ b/SignalMessaging/Views/OWSNavigationBar.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -156,11 +156,13 @@ public class OWSNavigationBar: UINavigationBar {
     }
 
     public override func layoutSubviews() {
-        if CurrentAppContext().isMainApp {
-            guard OWSWindowManager.shared().hasCall() else {
-                super.layoutSubviews()
-                return
-            }
+        guard CurrentAppContext().isMainApp else {
+            super.layoutSubviews()
+            return
+        }
+        guard OWSWindowManager.shared().hasCall() else {
+            super.layoutSubviews()
+            return
         }
 
         guard #available(iOS 11, *) else {