From e3d8d3c31c0105ea864ddff1807d4c7864d91b41 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 26 Aug 2013 21:43:34 -0400 Subject: [PATCH] statusbar/navbar visibility & news.html [FIXED] Handle statusbar/navbar visibility only from viewWillAppear. [FIXED] URL to news.html. --- MasterPassword/ObjC/iOS/MPMainViewController.m | 3 +++ MasterPassword/ObjC/iOS/MPUnlockViewController.m | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MasterPassword/ObjC/iOS/MPMainViewController.m b/MasterPassword/ObjC/iOS/MPMainViewController.m index 791922cf..01f24ed0 100644 --- a/MasterPassword/ObjC/iOS/MPMainViewController.m +++ b/MasterPassword/ObjC/iOS/MPMainViewController.m @@ -120,6 +120,9 @@ } - (void)viewWillAppear:(BOOL)animated { + + [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide]; + [self.navigationController setNavigationBarHidden:NO animated:animated]; MPElementEntity *activeElement = [self activeElementForMainThread]; if (activeElement.user != [[MPiOSAppDelegate get] activeUserForMainThread]) diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.m b/MasterPassword/ObjC/iOS/MPUnlockViewController.m index 644d209d..d0bbe1a0 100644 --- a/MasterPassword/ObjC/iOS/MPUnlockViewController.m +++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.m @@ -188,7 +188,7 @@ self.uiContainer.alpha = 1; }]; - NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news-dev.html?version=%@", + NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news.html?version=%@", [[PearlInfoPlist get] CFBundleVersion] ); [self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]]; }]; @@ -245,11 +245,6 @@ [self.marqueeTipTimer invalidate]; - [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide]; - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - [self.navigationController setNavigationBarHidden:NO animated:animated]; - }]; - [super viewWillDisappear:animated]; }