skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

statusbar/navbar visibility & news.html

Browse Source 
[FIXED]     Handle statusbar/navbar visibility only from viewWillAppear.
[FIXED]     URL to news.html.
This commit is contained in:
Maarten Billemont 2013-08-26 21:43:34 -04:00
parent 7589b3a048
commit e3d8d3c31c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MasterPassword/ObjC/iOS/MPMainViewController.m
View File

@ -121,6 +121,9 @@
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide];
[self.navigationController setNavigationBarHidden:NO animated:animated];
MPElementEntity *activeElement = [self activeElementForMainThread]; MPElementEntity *activeElement = [self activeElementForMainThread];
if (activeElement.user != [[MPiOSAppDelegate get] activeUserForMainThread]) if (activeElement.user != [[MPiOSAppDelegate get] activeUserForMainThread])
_activeElementOID = nil; _activeElementOID = nil;

7
MasterPassword/ObjC/iOS/MPUnlockViewController.m
View File

@ -188,7 +188,7 @@
self.uiContainer.alpha = 1; 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] ); [[PearlInfoPlist get] CFBundleVersion] );
[self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]]; [self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]];
}]; }];
@ -245,11 +245,6 @@
[self.marqueeTipTimer invalidate]; [self.marqueeTipTimer invalidate];
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide];
[[NSOperationQueue mainQueue] addOperationWithBlock:^{
[self.navigationController setNavigationBarHidden:NO animated:animated];
}];
[super viewWillDisappear:animated]; [super viewWillDisappear:animated];
} }