diff --git a/Classes/BWHockeyManager.m b/Classes/BWHockeyManager.m index 4802c89d7e..eca8f6d455 100644 --- a/Classes/BWHockeyManager.m +++ b/Classes/BWHockeyManager.m @@ -398,11 +398,11 @@ static NSString *kHockeyErrorDomain = @"HockeyErrorDomain"; // we did write something else in the past, so for compatibility reasons do this id tempLastCheck = [[NSUserDefaults standardUserDefaults] objectForKey:kDateOfLastHockeyCheck]; if ([tempLastCheck isKindOfClass:[NSDate class]]) { - lastCheck_ = tempLastCheck; + self.lastCheck = tempLastCheck; } } if (!lastCheck_) { - lastCheck_ = [NSDate distantPast]; + self.lastCheck = [NSDate distantPast]; } if ([[NSUserDefaults standardUserDefaults] objectForKey:kHockeyAllowUserSetting]) { @@ -522,11 +522,14 @@ static NSString *kHockeyErrorDomain = @"HockeyErrorDomain"; navController_.modalPresentationStyle = UIModalPresentationFormSheet; } + hockeyViewController.modalAnimated = YES; + [parentViewController presentModalViewController:navController_ animated:YES]; } else { // 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 ;) BWHockeyLog(@"No rootViewController found, using UIWindow-approach: %@", visibleWindow); + hockeyViewController.modalAnimated = NO; [visibleWindow addSubview:navController_.view]; } } diff --git a/Classes/BWHockeyViewController.h b/Classes/BWHockeyViewController.h index b0efe70756..5a596ec2ac 100644 --- a/Classes/BWHockeyViewController.h +++ b/Classes/BWHockeyViewController.h @@ -44,6 +44,7 @@ typedef enum { NSDictionary *cellLayout; BOOL modal_; + BOOL modalAnimated_; BOOL kvoRegistered_; BOOL showAllVersions_; UIStatusBarStyle statusBarStyle_; @@ -59,6 +60,7 @@ typedef enum { @property (nonatomic, retain) BWHockeyManager *hockeyManager; @property (nonatomic, readwrite) BOOL modal; +@property (nonatomic, readwrite) BOOL modalAnimated; - (id)init:(BWHockeyManager *)newHockeyManager modal:(BOOL)newModal; - (id)init; diff --git a/Classes/BWHockeyViewController.m b/Classes/BWHockeyViewController.m index 92ad3dafd3..733be44fc9 100644 --- a/Classes/BWHockeyViewController.m +++ b/Classes/BWHockeyViewController.m @@ -50,6 +50,7 @@ @synthesize appStoreButtonState = appStoreButtonState_; @synthesize hockeyManager = hockeyManager_; @synthesize modal = modal_; +@synthesize modalAnimated = modalAnimated_; /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma mark - @@ -234,6 +235,7 @@ if ((self = [super initWithStyle:UITableViewStylePlain])) { self.hockeyManager = newHockeyManager; self.modal = newModal; + self.modalAnimated = YES; self.title = BWHockeyLocalize(@"HockeyUpdateScreenTitle"); if ([self.hockeyManager shouldShowUserSettings]) { @@ -280,7 +282,7 @@ } // If there is no presenting view controller just remove view - if (presentingViewController) { + if (presentingViewController && self.modalAnimated) { [presentingViewController dismissModalViewControllerAnimated:YES]; } else { diff --git a/Classes/BWQuincyManager.m b/Classes/BWQuincyManager.m index fada70820d..67e94dda84 100644 --- a/Classes/BWQuincyManager.m +++ b/Classes/BWQuincyManager.m @@ -730,6 +730,9 @@ NSString *BWQuincyLocalize(NSString *stringToken) { [self showCrashStatusMessage]; } } + } else if (_statusCode == 400 && self.appIdentifier) { + [self _cleanCrashReports]; + BWQuincyLog(@"ERROR: The server rejected receiving crash reports for this app version!"); } else { if (_responseData == nil || [_responseData length] == 0) { BWQuincyLog(@"ERROR: Sending failed with an empty response!"); diff --git a/LICENSE.txt b/LICENSE.txt index 88a6782d6a..476cd4502a 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -14,7 +14,7 @@ Thomas Dohmke The Hockey SDK is provided under the following license: The MIT License - Copyright (c) 2011 Codenauts UG (haftungsbeschränkt). All rights reserved. + Copyright (c) 2011-2012 Codenauts UG (haftungsbeschränkt). All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -40,7 +40,7 @@ The Hockey SDK is provided under the following license: Except as noted below, PLCrashReporter is provided under the following license: - Copyright (c) 2008 - 2009 Plausible Labs Cooperative, Inc. + Copyright (c) 2008 - 2012 Plausible Labs Cooperative, Inc. All rights reserved. Permission is hereby granted, free of charge, to any person diff --git a/Vendor/CrashReporter.framework/Versions/A/CrashReporter b/Vendor/CrashReporter.framework/Versions/A/CrashReporter index 4626ad53e0..31b0171b3e 100644 Binary files a/Vendor/CrashReporter.framework/Versions/A/CrashReporter and b/Vendor/CrashReporter.framework/Versions/A/CrashReporter differ diff --git a/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist b/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist index 089553fa93..02c411c14f 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist +++ b/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 10K549 + 11D50 CFBundleDevelopmentRegion English CFBundleExecutable @@ -21,18 +21,18 @@ CFBundleVersion 1.0 DTCompiler - + com.apple.compilers.llvmgcc42 DTPlatformBuild - 4A2002a + 4D502 DTPlatformVersion GM DTSDKBuild - 4A2002a + 11C63 DTSDKName - macosx10.6 + macosx10.7 DTXcode - 0402 + 0421 DTXcodeBuild - 4A2002a + 4D502