From 90e3cb0ed429e4070bcf478356f9cf98a029c86a Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Fri, 13 Jul 2018 18:15:52 -0600
Subject: [PATCH 1/2] update status bar after screenprotection shows

---
 Signal/src/ViewControllers/CallViewController.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift
index b64b9786f9..c49ceb1831 100644
--- a/Signal/src/ViewControllers/CallViewController.swift
+++ b/Signal/src/ViewControllers/CallViewController.swift
@@ -156,6 +156,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
 
     @objc func didBecomeActive() {
         if (self.isViewLoaded) {
+            self.setNeedsStatusBarAppearanceUpdate()
             shouldRemoteVideoControlsBeHidden = false
         }
     }

From 06b4584e02f1d1a930899fa244a1770aeacced5e Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 16 Jul 2018 10:53:10 -0600
Subject: [PATCH 2/2] move fix to OWSViewController

---
 .../ViewControllers/CallViewController.swift  |  1 -
 .../ViewControllers/OWSViewController.m       | 37 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift
index c49ceb1831..b64b9786f9 100644
--- a/Signal/src/ViewControllers/CallViewController.swift
+++ b/Signal/src/ViewControllers/CallViewController.swift
@@ -156,7 +156,6 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
 
     @objc func didBecomeActive() {
         if (self.isViewLoaded) {
-            self.setNeedsStatusBarAppearanceUpdate()
             shouldRemoteVideoControlsBeHidden = false
         }
     }
diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m
index 04551f6542..b4d3eaa4c1 100644
--- a/SignalMessaging/ViewControllers/OWSViewController.m
+++ b/SignalMessaging/ViewControllers/OWSViewController.m
@@ -26,6 +26,30 @@ NS_ASSUME_NONNULL_BEGIN
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (!self) {
+        return self;
+    }
+
+    [self observeActivation];
+
+    return self;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (!self) {
+        return self;
+    }
+
+    [self observeActivation];
+
+    return self;
+}
+
 - (void)autoPinViewToBottomOfViewControllerOrKeyboard:(UIView *)view
 {
     OWSAssert(view);
@@ -60,6 +84,19 @@ NS_ASSUME_NONNULL_BEGIN
     self.bottomLayoutConstraint = [view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view];
 }
 
+- (void)observeActivation
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(owsViewControllerApplicationDidBecomeActive:)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
+}
+
+- (void)owsViewControllerApplicationDidBecomeActive:(NSNotification *)notification
+{
+    [self setNeedsStatusBarAppearanceUpdate];
+}
+
 - (void)keyboardWillShow:(NSNotification *)notification
 {
     [self handleKeyboardNotification:notification];