skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Merge branch 'master' into ios7

Browse Source
This commit is contained in:
Maarten Billemont 2013-08-26 23:20:28 -04:00
commit c7f04f8449
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MasterPassword/ObjC/iOS/MPAppsViewController.m
View File

@ -51,10 +51,9 @@
options:nil]; options:nil];
self.pageViewController.dataSource = self; self.pageViewController.dataSource = self;
self.pageViewController.delegate = self; self.pageViewController.delegate = self;
self.pageViewController.view.frame = CGRectFromOriginWithSize( CGPointZero, self.pagePositionView.bounds.size );
[self addChildViewController:self.pageViewController]; [self addChildViewController:self.pageViewController];
[self.view addSubview:self.pageViewController.view]; [self.pagePositionView addSubview:self.pageViewController.view];
self.pageViewController.view.frame = self.pagePositionView.frame;
[self.pagePositionView removeFromSuperview];
[self.pageViewController didMoveToParentViewController:self]; [self.pageViewController didMoveToParentViewController:self];
[super viewDidLoad]; [super viewDidLoad];

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];
} }

2
Site/2013-05/news.html
View File

@ -16,6 +16,6 @@
</style> </style>
</head> </head>
<body> <body>
<p><a href="mailto:masterpassword@lyndir.com">E-mail us</a> or open <a href="http://masterpasswordapp.com/support.html">support</a> if you have any issues.</p> <p></p>
</body> </body>
</html> </html>