Don't show the "All Media" button when viewing the slider from the

gallery via settings.

In this context it makes more sense for the user to hit the "dismiss"
button to get "back" to "All Media"

// FREEBIE

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -2033,8 +2033,10 @@ typedef enum : NSUInteger {
     }
     TSMessage *mediaMessage = (TSMessage *)viewItem.interaction;
 
-    MediaGalleryViewController *vc = [[MediaGalleryViewController alloc] initWithThread:self.thread
+    MediaGalleryViewController *vc = [[MediaGalleryViewController alloc]
-                                                                   uiDatabaseConnection:self.uiDatabaseConnection];
+              initWithThread:self.thread
+        uiDatabaseConnection:self.uiDatabaseConnection
+                     options:MediaGalleryOptionSliderEnabled | MediaGalleryOptionShowAllMediaButton];
 
     [vc presentDetailViewFromViewController:self mediaMessage:mediaMessage replacingView:imageView];
 }
@@ -2055,8 +2057,10 @@ typedef enum : NSUInteger {
     }
     TSMessage *mediaMessage = (TSMessage *)viewItem.interaction;
 
-    MediaGalleryViewController *vc = [[MediaGalleryViewController alloc] initWithThread:self.thread
+    MediaGalleryViewController *vc = [[MediaGalleryViewController alloc]
-                                                                   uiDatabaseConnection:self.uiDatabaseConnection];
+              initWithThread:self.thread
+        uiDatabaseConnection:self.uiDatabaseConnection
+                     options:MediaGalleryOptionSliderEnabled | MediaGalleryOptionShowAllMediaButton];
 
     [vc presentDetailViewFromViewController:self mediaMessage:mediaMessage replacingView:imageView];
 }

Signal/src/ViewControllers/MediaDetailViewController.h

@@ -10,6 +10,11 @@ NS_ASSUME_NONNULL_BEGIN
 @class GalleryItemBox;
 @class MediaDetailViewController;
 
+typedef NS_OPTIONS(NSInteger, MediaGalleryOption) {
+    MediaGalleryOptionSliderEnabled = 1 << 0,
+    MediaGalleryOptionShowAllMediaButton = 1 << 1
+};
+
 @protocol MediaDetailViewControllerDelegate <NSObject>
 
 - (void)dismissSelfAnimated:(BOOL)isAnimated completion:(void (^_Nullable)(void))completionBlock;

Signal/src/ViewControllers/MediaGalleryViewController.swift

@@ -178,7 +178,7 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
 
     private var initialDetailItem: MediaGalleryItem?
     private let thread: TSThread
-    private let includeGallery: Bool
+    private let options: MediaGalleryOption
 
     // we start with a small range size for quick loading.
     private let fetchRangeSize: UInt = 10
@@ -187,15 +187,11 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
         Logger.debug("\(logTag) deinit")
     }
 
-    convenience init(thread: TSThread, uiDatabaseConnection: YapDatabaseConnection) {
+    init(thread: TSThread, uiDatabaseConnection: YapDatabaseConnection, options: MediaGalleryOption = []) {
-        self.init(thread: thread, uiDatabaseConnection: uiDatabaseConnection, includeGallery: true)
-    }
-
-    init(thread: TSThread, uiDatabaseConnection: YapDatabaseConnection, includeGallery: Bool) {
         self.thread = thread
         assert(uiDatabaseConnection.isInLongLivedReadTransaction())
         self.uiDatabaseConnection = uiDatabaseConnection
-        self.includeGallery = includeGallery
+        self.options = options
         self.mediaGalleryFinder = OWSMediaGalleryFinder(thread: thread)
 
         super.init(nibName: nil, bundle: nil)
@@ -264,7 +260,7 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
         ensureGalleryItemsLoaded(.around, item: initialDetailItem, amount: 10)
         self.initialDetailItem = initialDetailItem
 
-        let pageViewController = MediaPageViewController(initialItem: initialDetailItem, mediaGalleryDataSource: self, uiDatabaseConnection: self.uiDatabaseConnection, includeGallery: self.includeGallery)
+        let pageViewController = MediaPageViewController(initialItem: initialDetailItem, mediaGalleryDataSource: self, uiDatabaseConnection: self.uiDatabaseConnection, options: self.options)
 
         self.pageViewController = pageViewController
         self.setViewControllers([pageViewController], animated: false)

Signal/src/ViewControllers/MediaPageViewController.swift

@@ -58,16 +58,14 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
     private let uiDatabaseConnection: YapDatabaseConnection
 
-    private let includeGallery: Bool
+    private let showAllMediaButton: Bool
+    private let sliderEnabled: Bool
 
-    convenience init(initialItem: MediaGalleryItem, mediaGalleryDataSource: MediaGalleryDataSource, uiDatabaseConnection: YapDatabaseConnection) {
+    init(initialItem: MediaGalleryItem, mediaGalleryDataSource: MediaGalleryDataSource, uiDatabaseConnection: YapDatabaseConnection, options: MediaGalleryOption) {
-        self.init(initialItem: initialItem, mediaGalleryDataSource: mediaGalleryDataSource, uiDatabaseConnection: uiDatabaseConnection, includeGallery: true)
-    }
-
-    init(initialItem: MediaGalleryItem, mediaGalleryDataSource: MediaGalleryDataSource, uiDatabaseConnection: YapDatabaseConnection, includeGallery: Bool) {
         assert(uiDatabaseConnection.isInLongLivedReadTransaction())
         self.uiDatabaseConnection = uiDatabaseConnection
-        self.includeGallery = includeGallery
+        self.showAllMediaButton = options.contains(.showAllMediaButton)
+        self.sliderEnabled = options.contains(.sliderEnabled)
         self.mediaGalleryDataSource = mediaGalleryDataSource
 
         let kSpacingBetweenItems: CGFloat = 20
@@ -108,7 +106,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
         self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(didPressDismissButton))
 
-        if includeGallery {
+        if showAllMediaButton {
             self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: MediaStrings.allMedia, style: .plain, target: self, action: #selector(didPressAllMediaButton))
         }
 
@@ -129,9 +127,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
         // Hack to avoid "page" bouncing when not in gallery view.
         // e.g. when getting to media details via message details screen, there's only
         // one "Page" so the bounce doesn't make sense.
-        if !self.includeGallery {
+        pagerScrollView.isScrollEnabled = sliderEnabled
-            pagerScrollView.isScrollEnabled = false
-        }
 
         // FIXME dynamic title with sender/date
         self.title = "Attachment"

Signal/src/ViewControllers/MessageDetailViewController.swift

@@ -762,7 +762,7 @@ class MessageDetailViewController: OWSViewController, UIScrollViewDelegate, Medi
             return
         }
 
-        let mediaGalleryViewController = MediaGalleryViewController(thread: self.thread, uiDatabaseConnection: self.uiDatabaseConnection, includeGallery: false)
+        let mediaGalleryViewController = MediaGalleryViewController(thread: self.thread, uiDatabaseConnection: self.uiDatabaseConnection)
         mediaGalleryViewController.presentDetailView(fromViewController: self, mediaMessage: self.message, replacingView: fromView)
     }
 }

Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m

@@ -1166,7 +1166,9 @@ NS_ASSUME_NONNULL_BEGIN
     DDLogDebug(@"%@ in showMediaGallery", self.logTag);
 
     MediaGalleryViewController *vc =
-        [[MediaGalleryViewController alloc] initWithThread:self.thread uiDatabaseConnection:self.uiDatabaseConnection];
+        [[MediaGalleryViewController alloc] initWithThread:self.thread
+                                      uiDatabaseConnection:self.uiDatabaseConnection
+                                                   options:MediaGalleryOptionSliderEnabled];
 
     // although we don't present the mediaGalleryViewController directly, we need to maintain a strong
     // reference to it until we're dismissed.