oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix All Media button from conversation settings

This commit is contained in:
Michael Kirk 2018-11-14 18:53:58 -06:00
parent 542d5826de
commit f6e9fce0d3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
View File

@ -54,7 +54,7 @@ const CGFloat kIconViewLength = 24;
@property (nonatomic) NSArray<NSNumber *> *disappearingMessagesDurations; @property (nonatomic) NSArray<NSNumber *> *disappearingMessagesDurations;
@property (nonatomic) OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration; @property (nonatomic) OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration;
@property (nullable, nonatomic) MediaGalleryNavigationController *mediaGalleryViewController; @property (nullable, nonatomic) MediaGallery *mediaGallery;
@property (nonatomic, readonly) TSAccountManager *accountManager; @property (nonatomic, readonly) TSAccountManager *accountManager;
@property (nonatomic, readonly) OWSContactsManager *contactsManager; @property (nonatomic, readonly) OWSContactsManager *contactsManager;
@property (nonatomic, readonly) OWSMessageSender *messageSender; @property (nonatomic, readonly) OWSMessageSender *messageSender;
@ -1294,13 +1294,12 @@ const CGFloat kIconViewLength = 24;
uiDatabaseConnection:self.uiDatabaseConnection uiDatabaseConnection:self.uiDatabaseConnection
options:MediaGalleryOptionSliderEnabled]; options:MediaGalleryOptionSliderEnabled];
// although we don't present the mediaGalleryViewController directly, we need to maintain a strong self.mediaGallery = mediaGallery;
// reference to it until we're dismissed.
self.mediaGalleryViewController = mediaGallery.navigationController;
OWSAssertDebug([self.navigationController isKindOfClass:[OWSNavigationController class]]); OWSAssertDebug([self.navigationController isKindOfClass:[OWSNavigationController class]]);
[mediaGallery pushTileViewFromNavController:(OWSNavigationController *)self.navigationController]; [mediaGallery pushTileViewFromNavController:(OWSNavigationController *)self.navigationController];
} }
#pragma mark - Notifications #pragma mark - Notifications
- (void)identityStateDidChange:(NSNotification *)notification - (void)identityStateDidChange:(NSNotification *)notification