Merge branch 'charlesmchen/landscapeOrientation4'

Signal/src/AppDelegate.m

@@ -957,6 +957,15 @@ static NSTimeInterval launchStartedAt;
         return UIInterfaceOrientationMaskAllButUpsideDown;
     }
 
+    if (![self.windowManager isAppWindow:window]) {
+        // iOS uses various windows for animations, transitions, etc.
+        // e.g. _UIInteractiveHighlightEffectWindow,
+        //      UITextEffectsWindow.
+        //
+        // We should be permissive with these windows.
+        return UIInterfaceOrientationMaskAllButUpsideDown;
+    }
+
     if (window == self.windowManager.menuActionsWindow) {
         return UIInterfaceOrientationMaskAllButUpsideDown;
     }

Signal/src/ViewControllers/ExperienceUpgradesPageViewController.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
@@ -814,4 +814,10 @@ public class ExperienceUpgradesPageViewController: OWSViewController, UIPageView
         Logger.debug("")
         self.dismiss(animated: true)
     }
+
+    // MARK: Orientation
+
+    override public var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+        return .portrait
+    }
 }

Signal/src/ViewControllers/MediaDetailViewController.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 #import <SignalMessaging/OWSViewController.h>
@@ -39,8 +39,6 @@ typedef NS_OPTIONS(NSInteger, MediaGalleryOption) {
                               viewItem:(nullable id<ConversationViewItem>)viewItem;
 #pragma mark - Actions
 
-- (void)didPressShare:(id)sender;
-- (void)didPressDelete:(id)sender;
 - (void)didPressPlayBarButton:(id)sender;
 - (void)didPressPauseBarButton:(id)sender;
 - (void)playVideo;

SignalMessaging/ViewControllers/OWSViewController.m

@@ -115,35 +115,39 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)keyboardWillShow:(NSNotification *)notification
 {
-    [self handleKeyboardNotification:notification];
+    [self handleKeyboardNotificationBase:notification];
 }
 
 - (void)keyboardDidShow:(NSNotification *)notification
 {
-    [self handleKeyboardNotification:notification];
+    [self handleKeyboardNotificationBase:notification];
 }
 
 - (void)keyboardWillHide:(NSNotification *)notification
 {
-    [self handleKeyboardNotification:notification];
+    [self handleKeyboardNotificationBase:notification];
 }
 
 - (void)keyboardDidHide:(NSNotification *)notification
 {
-    [self handleKeyboardNotification:notification];
+    [self handleKeyboardNotificationBase:notification];
 }
 
 - (void)keyboardWillChangeFrame:(NSNotification *)notification
 {
-    [self handleKeyboardNotification:notification];
+    [self handleKeyboardNotificationBase:notification];
 }
 
 - (void)keyboardDidChangeFrame:(NSNotification *)notification
 {
-    [self handleKeyboardNotification:notification];
+    [self handleKeyboardNotificationBase:notification];
 }
 
-- (void)handleKeyboardNotification:(NSNotification *)notification
+// We use the name `handleKeyboardNotificationBase` instead of
+// `handleKeyboardNotification` to avoid accidentally
+// calling similarly methods with that name in subclasses,
+// e.g. ConversationViewController.
+- (void)handleKeyboardNotificationBase:(NSNotification *)notification
 {
     OWSAssertIsOnMainThread();
 

SignalMessaging/utils/OWSWindowManager.h

@@ -31,6 +31,8 @@ extern const UIWindowLevel UIWindowLevel_Background;
 
 - (void)setIsScreenBlockActive:(BOOL)isScreenBlockActive;
 
+- (BOOL)isAppWindow:(UIWindow *)window;
+
 #pragma mark - Message Actions
 
 @property (nonatomic, readonly) BOOL isPresentingMenuActions;

SignalMessaging/utils/OWSWindowManager.m

@@ -310,6 +310,14 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
     [self ensureWindowState];
 }
 
+- (BOOL)isAppWindow:(UIWindow *)window
+{
+    OWSAssertDebug(window);
+
+    return (window == self.rootWindow || window == self.returnToCallWindow || window == self.callViewWindow
+        || window == self.menuActionsWindow || window == self.screenBlockingWindow);
+}
+
 #pragma mark - Message Actions
 
 - (BOOL)isPresentingMenuActions