fix media-gallery doesn't respect call banner

pull/1/head
Michael Kirk 7 years ago
parent cdafeb8388
commit 1af750363a

@ -197,8 +197,7 @@ class MediaGalleryViewController: OWSNavigationController, MediaGalleryDataSourc
self.options = options self.options = options
self.mediaGalleryFinder = OWSMediaGalleryFinder(thread: thread) self.mediaGalleryFinder = OWSMediaGalleryFinder(thread: thread)
super.init(owsNavigationBar: ())
super.init(nibName: nil, bundle: nil)
} }
required init?(coder aDecoder: NSCoder) { required init?(coder aDecoder: NSCoder) {

@ -23,6 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
// unsaved changes. // unsaved changes.
@interface OWSNavigationController : UINavigationController @interface OWSNavigationController : UINavigationController
- (instancetype)initWithOWSNavigationBar;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

@ -24,15 +24,13 @@ NS_ASSUME_NONNULL_BEGIN
@implementation OWSNavigationController @implementation OWSNavigationController
- (instancetype)initWithRootViewController:(UIViewController *)rootViewController - (instancetype)initWithOWSNavigationBar
{ {
self = [self initWithNavigationBarClass:[OWSNavigationBar class] toolbarClass:nil]; self = [self initWithNavigationBarClass:[OWSNavigationBar class] toolbarClass:nil];
if (!self) { if (!self) {
return self; return self;
} }
[self pushViewController:rootViewController animated:NO];
if (![self.navigationBar isKindOfClass:[OWSNavigationBar class]]) { if (![self.navigationBar isKindOfClass:[OWSNavigationBar class]]) {
OWSFailDebug(@"navigationBar was unexpected class: %@", self.navigationBar); OWSFailDebug(@"navigationBar was unexpected class: %@", self.navigationBar);
return self; return self;
@ -50,6 +48,17 @@ NS_ASSUME_NONNULL_BEGIN
return self; return self;
} }
- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
{
self = [self initWithOWSNavigationBar];
if (!self) {
return self;
}
[self pushViewController:rootViewController animated:NO];
return self;
}
- (void)dealloc - (void)dealloc
{ {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];

Loading…
Cancel
Save