From 770ce1440e9b37fb7505246334551408804c28d6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 19 Mar 2018 15:20:33 -0400 Subject: [PATCH] ConversationSettings must retain the gallery view // FREEBIE --- .../ThreadSettings/OWSConversationSettingsViewController.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index db5e3e5c3..3c25918a0 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic) NSArray *disappearingMessagesDurations; @property (nonatomic) OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration; - +@property (nullable, nonatomic) MediaGalleryViewController *mediaGalleryViewController; @property (nonatomic, readonly) TSAccountManager *accountManager; @property (nonatomic, readonly) OWSContactsManager *contactsManager; @property (nonatomic, readonly) OWSMessageSender *messageSender; @@ -1168,6 +1168,10 @@ NS_ASSUME_NONNULL_BEGIN MediaGalleryViewController *vc = [[MediaGalleryViewController alloc] initWithThread:self.thread uiDatabaseConnection:self.uiDatabaseConnection]; + // although we don't present the mediaGalleryViewController directly, we need to maintain a strong + // reference to it until we're dismissed. + self.mediaGalleryViewController = vc; + [vc pushTileViewFromNavController:self.navigationController]; } #pragma mark - Notifications