ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a problem with dismissing the update view in some scenarios

Browse Source
This commit is contained in:
Andreas Linde 2012-02-05 22:03:24 +01:00
parent 78c45db55a
commit cc3af968f3
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Classes/BWHockeyManager.m
View File

@ -522,11 +522,14 @@ static NSString *kHockeyErrorDomain = @"HockeyErrorDomain";
navController_.modalPresentationStyle = UIModalPresentationFormSheet; navController_.modalPresentationStyle = UIModalPresentationFormSheet;
} }
hockeyViewController.modalAnimated = YES;
[parentViewController presentModalViewController:navController_ animated:YES]; [parentViewController presentModalViewController:navController_ animated:YES];
} else { } else {
// if not, we add a subview to the window. A bit hacky but should work in most circumstances. // if not, we add a subview to the window. A bit hacky but should work in most circumstances.
// Also, we don't get a nice animation for free, but hey, this is for beta not production users ;) // Also, we don't get a nice animation for free, but hey, this is for beta not production users ;)
BWHockeyLog(@"No rootViewController found, using UIWindow-approach: %@", visibleWindow); BWHockeyLog(@"No rootViewController found, using UIWindow-approach: %@", visibleWindow);
hockeyViewController.modalAnimated = NO;
[visibleWindow addSubview:navController_.view]; [visibleWindow addSubview:navController_.view];
} }
} }

2
Classes/BWHockeyViewController.h
View File

@ -44,6 +44,7 @@ typedef enum {
NSDictionary *cellLayout; NSDictionary *cellLayout;
BOOL modal_; BOOL modal_;
BOOL modalAnimated_;
BOOL kvoRegistered_; BOOL kvoRegistered_;
BOOL showAllVersions_; BOOL showAllVersions_;
UIStatusBarStyle statusBarStyle_; UIStatusBarStyle statusBarStyle_;
@ -59,6 +60,7 @@ typedef enum {
@property (nonatomic, retain) BWHockeyManager *hockeyManager; @property (nonatomic, retain) BWHockeyManager *hockeyManager;
@property (nonatomic, readwrite) BOOL modal; @property (nonatomic, readwrite) BOOL modal;
@property (nonatomic, readwrite) BOOL modalAnimated;
- (id)init:(BWHockeyManager *)newHockeyManager modal:(BOOL)newModal; - (id)init:(BWHockeyManager *)newHockeyManager modal:(BOOL)newModal;
- (id)init; - (id)init;

4
Classes/BWHockeyViewController.m
View File

@ -50,6 +50,7 @@
@synthesize appStoreButtonState = appStoreButtonState_; @synthesize appStoreButtonState = appStoreButtonState_;
@synthesize hockeyManager = hockeyManager_; @synthesize hockeyManager = hockeyManager_;
@synthesize modal = modal_; @synthesize modal = modal_;
@synthesize modalAnimated = modalAnimated_;
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#pragma mark - #pragma mark -
@ -234,6 +235,7 @@
if ((self = [super initWithStyle:UITableViewStylePlain])) { if ((self = [super initWithStyle:UITableViewStylePlain])) {
self.hockeyManager = newHockeyManager; self.hockeyManager = newHockeyManager;
self.modal = newModal; self.modal = newModal;
self.modalAnimated = YES;
self.title = BWHockeyLocalize(@"HockeyUpdateScreenTitle"); self.title = BWHockeyLocalize(@"HockeyUpdateScreenTitle");
if ([self.hockeyManager shouldShowUserSettings]) { if ([self.hockeyManager shouldShowUserSettings]) {
@ -280,7 +282,7 @@
} }
// If there is no presenting view controller just remove view // If there is no presenting view controller just remove view
if (presentingViewController) { if (presentingViewController && self.modalAnimated) {
[presentingViewController dismissModalViewControllerAnimated:YES]; [presentingViewController dismissModalViewControllerAnimated:YES];
} }
else { else {