From 67d56af15d907750be6165cd6055f9ab189e4000 Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Thu, 12 Sep 2013 11:26:19 +0200 Subject: [PATCH] Fix warnings when building with iOS 7 as deployment target --- Classes/BITAuthenticationViewController.m | 6 +++++- Classes/BITAuthenticator.m | 12 +++++++----- Classes/BITCrashManager.m | 4 ++-- Classes/BITFeedbackComposeViewController.m | 4 ++++ Classes/BITFeedbackListViewCell.m | 13 +++++++++++-- Classes/BITFeedbackManager.m | 2 +- Classes/BITFeedbackUserDataViewController.m | 6 +++++- Classes/BITHockeyBaseViewController.m | 4 ++++ Classes/BITHockeyHelper.m | 4 ++-- Classes/BITStoreButton.m | 14 +++++++++++++- Classes/BITUpdateManager.m | 4 ++-- Classes/HockeySDKPrivate.m | 2 +- 12 files changed, 57 insertions(+), 18 deletions(-) diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m index 6b90f55819..2e5c6727c7 100644 --- a/Classes/BITAuthenticationViewController.m +++ b/Classes/BITAuthenticationViewController.m @@ -67,8 +67,12 @@ [super viewWillAppear:animated]; _statusBarStyle = [[UIApplication sharedApplication] statusBarStyle]; +#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 + [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent]; +#else [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleBlackOpaque]; - +#endif + [self updateBarButtons]; self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered]; diff --git a/Classes/BITAuthenticator.m b/Classes/BITAuthenticator.m index 1c173d6eb8..651c77ab95 100644 --- a/Classes/BITAuthenticator.m +++ b/Classes/BITAuthenticator.m @@ -261,12 +261,14 @@ static NSString* const kBITAuthenticatorDidSkipOptionalLogin = @"BITAuthenticato _authenticationCompletionBlock = completion; UIViewController *rootViewController = [self.findVisibleWindow rootViewController]; UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController]; - [rootViewController presentModalViewController:navController - animated:YES]; + rootViewController.modalPresentationStyle = UIModalPresentationFullScreen; + [rootViewController presentViewController:navController + animated:YES + completion:nil]; } - (void) didAuthenticateWithToken:(NSString*) token { - [_authenticationController dismissModalViewControllerAnimated:YES]; + [_authenticationController dismissViewControllerAnimated:YES completion:nil]; _authenticationController = nil; [self setAuthenticationToken:token withType:[self.class stringForAuthenticationType:self.authenticationType]]; self.installationIdentificationValidated = YES; @@ -290,7 +292,7 @@ static NSString* const kBITAuthenticatorDidSkipOptionalLogin = @"BITAuthenticato } #pragma mark - AuthenticationViewControllerDelegate - (void) authenticationViewControllerDidSkip:(UIViewController *)viewController { - [viewController dismissModalViewControllerAnimated:YES]; + [viewController dismissViewControllerAnimated:YES completion:nil]; _authenticationController = nil; [self setAuthenticationToken:nil withType:nil]; @@ -467,7 +469,7 @@ static NSString* const kBITAuthenticatorDidSkipOptionalLogin = @"BITAuthenticato if(self.validationType == BITAuthenticatorValidationTypeOptional) { //dismiss view-controller if login was optional - [_authenticationController dismissModalViewControllerAnimated:YES]; + [_authenticationController dismissViewControllerAnimated:YES completion:nil]; _authenticationController = nil; } else { //keep the viewcontroller and thus block the app diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m index 0a6fbf8835..4bc3b24f39 100644 --- a/Classes/BITCrashManager.m +++ b/Classes/BITCrashManager.m @@ -483,7 +483,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus"; } if ([_crashFiles count] > 0) { - BITHockeyLog(@"INFO: %i pending crash reports found.", [_crashFiles count]); + BITHockeyLog(@"INFO: %lu pending crash reports found.", (unsigned long)[_crashFiles count]); return YES; } else { if (_didCrashInLastSession) { @@ -911,7 +911,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus"; } else { error = [NSError errorWithDomain:kBITCrashErrorDomain code:BITCrashAPIErrorWithStatusCode - userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Sending failed with status code: %i", _statusCode], NSLocalizedDescriptionKey, nil]]; + userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Sending failed with status code: %li", (long)_statusCode], NSLocalizedDescriptionKey, nil]]; } if (self.delegate != nil && [self.delegate respondsToSelector:@selector(crashManager:didFailWithError:)]) { diff --git a/Classes/BITFeedbackComposeViewController.m b/Classes/BITFeedbackComposeViewController.m index 322f1e6838..3f30c9559a 100644 --- a/Classes/BITFeedbackComposeViewController.m +++ b/Classes/BITFeedbackComposeViewController.m @@ -172,7 +172,11 @@ [super viewWillAppear:animated]; _statusBarStyle = [[UIApplication sharedApplication] statusBarStyle]; +#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 + [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent]; +#else [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleBlackOpaque]; +#endif [self.textView setFrame:self.view.frame]; diff --git a/Classes/BITFeedbackListViewCell.m b/Classes/BITFeedbackListViewCell.m index 701b2feb6b..f3cbe6da6f 100644 --- a/Classes/BITFeedbackListViewCell.m +++ b/Classes/BITFeedbackListViewCell.m @@ -135,9 +135,18 @@ #pragma mark - Layout + (CGFloat) heightForRowWithMessage:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width { +#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 + CGRect calculatedRect = [message.text boundingRectWithSize:CGSizeMake(width - (2 * FRAME_SIDE_BORDER), CGFLOAT_MAX) + options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading + attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:TEXT_FONTSIZE]} + context:nil]; + CGFloat calculatedHeight = calculatedRect.size.height + FRAME_TOP_BORDER + LABEL_TEXT_Y + FRAME_BOTTOM_BORDER; +#else CGFloat calculatedHeight = [message.text sizeWithFont:[UIFont systemFontOfSize:TEXT_FONTSIZE] - constrainedToSize:CGSizeMake(width - (2 * FRAME_SIDE_BORDER), CGFLOAT_MAX)].height + FRAME_TOP_BORDER + LABEL_TEXT_Y + FRAME_BOTTOM_BORDER; - return round(calculatedHeight); + constrainedToSize:CGSizeMake(width - (2 * FRAME_SIDE_BORDER), CGFLOAT_MAX) + ].height + FRAME_TOP_BORDER + LABEL_TEXT_Y + FRAME_BOTTOM_BORDER; +#endif + return ceil(calculatedHeight); } - (void)layoutSubviews { diff --git a/Classes/BITFeedbackManager.m b/Classes/BITFeedbackManager.m index 631612acd0..c774cb8b7f 100644 --- a/Classes/BITFeedbackManager.m +++ b/Classes/BITFeedbackManager.m @@ -731,7 +731,7 @@ [self updateLastMessageID]; } if (self.lastMessageID) { - lastMessageID = [NSString stringWithFormat:@"&last_message_id=%i", [self.lastMessageID integerValue]]; + lastMessageID = [NSString stringWithFormat:@"&last_message_id=%li", (long)[self.lastMessageID integerValue]]; } [parameter appendFormat:@"?format=json&bundle_version=%@&sdk=%@&sdk_version=%@%@", diff --git a/Classes/BITFeedbackUserDataViewController.m b/Classes/BITFeedbackUserDataViewController.m index ddfb6d1a05..561e3b918d 100644 --- a/Classes/BITFeedbackUserDataViewController.m +++ b/Classes/BITFeedbackUserDataViewController.m @@ -74,8 +74,12 @@ [super viewWillAppear:animated]; _statusBarStyle = [[UIApplication sharedApplication] statusBarStyle]; +#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 + [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent]; +#else [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleBlackOpaque]; - +#endif + // Do any additional setup after loading the view. self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self diff --git a/Classes/BITHockeyBaseViewController.m b/Classes/BITHockeyBaseViewController.m index 3dec8a998f..8f6c9220e0 100644 --- a/Classes/BITHockeyBaseViewController.m +++ b/Classes/BITHockeyBaseViewController.m @@ -72,7 +72,11 @@ _statusBarStyle = [[UIApplication sharedApplication] statusBarStyle]; if ([self.navigationController.navigationBar.tintColor isEqual:BIT_RGBCOLOR(25, 25, 25)]) { +#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 + [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent]; +#else [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleBlackOpaque]; +#endif } } diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m index 19f064f2e9..03dcf446b9 100644 --- a/Classes/BITHockeyHelper.m +++ b/Classes/BITHockeyHelper.m @@ -371,12 +371,12 @@ UIImage *bit_reflectedImageWithHeight(UIImage *inputImage, NSUInteger height, fl return nil; // create a bitmap graphics context the size of the image - CGContextRef mainViewContentContext = bit_MyOpenBitmapContext(inputImage.size.width, height); + CGContextRef mainViewContentContext = bit_MyOpenBitmapContext(inputImage.size.width, (int)height); // create a 2 bit CGImage containing a gradient that will be used for masking the // main view content to create the 'fade' of the reflection. The CGImageCreateWithMask // function will stretch the bitmap image as required, so we can create a 1 pixel wide gradient - CGImageRef gradientMaskImage = bit_CreateGradientImage(1, height, fromAlpha, toAlpha); + CGImageRef gradientMaskImage = bit_CreateGradientImage(1, (int)height, fromAlpha, toAlpha); // create an image by masking the bitmap of the mainView content with the gradient view // then release the pre-masked content bitmap and the gradient bitmap diff --git a/Classes/BITStoreButton.m b/Classes/BITStoreButton.m index da46989e24..47da5051a8 100644 --- a/Classes/BITStoreButton.m +++ b/Classes/BITStoreButton.m @@ -219,7 +219,19 @@ - (CGSize)sizeThatFits:(CGSize)size { CGSize constr = (CGSize){.height = self.frame.size.height, .width = BIT_MAX_WIDTH}; - CGSize newSize = [self.buttonData.label sizeWithFont:self.titleLabel.font constrainedToSize:constr lineBreakMode:kBITLineBreakModeMiddleTruncation]; + +#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 + CGRect calculatedRect = [self.buttonData.label boundingRectWithSize:constr + options:NSStringDrawingUsesFontLeading + attributes:@{NSFontAttributeName:self.titleLabel.font} + context:nil]; + CGSize newSize = calculatedRect.size; +#else + CGSize newSize = [self.buttonData.label sizeWithFont:self.titleLabel.font + constrainedToSize:constr + lineBreakMode:kBITLineBreakModeMiddleTruncation]; +#endif + CGFloat newWidth = newSize.width + (BIT_PADDING * 2); CGFloat newHeight = BIT_MIN_HEIGHT > newSize.height ? BIT_MIN_HEIGHT : newSize.height; diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m index 135b5ffaeb..9aebe429c9 100644 --- a/Classes/BITUpdateManager.m +++ b/Classes/BITUpdateManager.m @@ -672,10 +672,10 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) { - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { if ([response respondsToSelector:@selector(statusCode)]) { - int statusCode = [((NSHTTPURLResponse *)response) statusCode]; + NSInteger statusCode = [((NSHTTPURLResponse *)response) statusCode]; if (statusCode == 404) { [connection cancel]; // stop connecting; no more delegate messages - NSString *errorStr = [NSString stringWithFormat:@"Hockey API received HTTP Status Code %d", statusCode]; + NSString *errorStr = [NSString stringWithFormat:@"Hockey API received HTTP Status Code %ld", (long)statusCode]; [self reportError:[NSError errorWithDomain:kBITUpdateErrorDomain code:BITUpdateAPIServerReturnedInvalidStatus userInfo:[NSDictionary dictionaryWithObjectsAndKeys:errorStr, NSLocalizedDescriptionKey, nil]]]; diff --git a/Classes/HockeySDKPrivate.m b/Classes/HockeySDKPrivate.m index e33c940531..932daa6717 100644 --- a/Classes/HockeySDKPrivate.m +++ b/Classes/HockeySDKPrivate.m @@ -60,7 +60,7 @@ NSString *BITHockeyLocalizedString(NSString *stringToken) { NSString *BITHockeyMD5(NSString *str) { const char *cStr = [str UTF8String]; unsigned char result[CC_MD5_DIGEST_LENGTH]; - CC_MD5( cStr, strlen(cStr), result ); + CC_MD5( cStr, (CC_LONG)strlen(cStr), result ); return [NSString stringWithFormat: @"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", result[0], result[1],