ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-31 15:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:bitstadium/HockeySDK-iOS into develop

Browse Source
This commit is contained in:
Andreas Linde 2013-04-23 18:13:00 +02:00
commit 4c7ab219d3
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/BITCrashManager.m
View File

@ -108,7 +108,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
NSString *testValue = [[NSUserDefaults standardUserDefaults] stringForKey:kBITCrashManagerStatus]; NSString *testValue = [[NSUserDefaults standardUserDefaults] stringForKey:kBITCrashManagerStatus];
if (testValue) { if (testValue) {
_crashManagerStatus = [[NSUserDefaults standardUserDefaults] integerForKey:kBITCrashManagerStatus]; _crashManagerStatus = (BITCrashManagerStatus) [[NSUserDefaults standardUserDefaults] integerForKey:kBITCrashManagerStatus];
} else { } else {
// migrate previous setting if available // migrate previous setting if available
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BITCrashAutomaticallySendReports"]) { if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BITCrashAutomaticallySendReports"]) {
@ -198,7 +198,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
if ([rootObj objectForKey:kBITCrashApprovedReports]) if ([rootObj objectForKey:kBITCrashApprovedReports])
[_approvedCrashReports setDictionary:[rootObj objectForKey:kBITCrashApprovedReports]]; [_approvedCrashReports setDictionary:[rootObj objectForKey:kBITCrashApprovedReports]];
} else { } else {
BITHockeyLog(@"ERROR: Reading settings. %@", errorString); BITHockeyLog(@"ERROR: Reading crash manager settings.");
} }
} }

2
Classes/BITCrashReportTextFormatter.m
View File

@ -602,7 +602,7 @@ static NSInteger binaryImageSort(id binary1, id binary2, void *context) {
index += range.length - 1; index += range.length - 1;
} }
if (index > 32) { if (index > 32) {
imageName = [NSString stringWithFormat:@"%@...", [imageName substringToIndex:index - 1]]; imageName = [NSString stringWithFormat:@"%@... ", [imageName substringToIndex:index - 1]];
index += 3; index += 3;
break; break;
} }

2
Classes/BITFeedbackMessage.m
View File

@ -72,7 +72,7 @@
self.email = [decoder decodeObjectForKey:@"email"]; self.email = [decoder decodeObjectForKey:@"email"];
self.date = [decoder decodeObjectForKey:@"date"]; self.date = [decoder decodeObjectForKey:@"date"];
self.id = [decoder decodeObjectForKey:@"id"]; self.id = [decoder decodeObjectForKey:@"id"];
self.status = [decoder decodeIntegerForKey:@"status"]; self.status = (BITFeedbackMessageStatus)[decoder decodeIntegerForKey:@"status"];
self.userMessage = [decoder decodeBoolForKey:@"userMessage"]; self.userMessage = [decoder decodeBoolForKey:@"userMessage"];
self.token = [decoder decodeObjectForKey:@"token"]; self.token = [decoder decodeObjectForKey:@"token"];
} }

16
Classes/BITHockeyHelper.m
View File

@ -306,7 +306,7 @@ UIImage *bit_imageToFitSize(UIImage *inputImage, CGSize fitSize, BOOL honorScale
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
CGContextRef context = CGBitmapContextCreate(NULL, scaledWidth, scaledHeight, 8, (fitSize.width * 4), CGContextRef context = CGBitmapContextCreate(NULL, scaledWidth, scaledHeight, 8, (fitSize.width * 4),
colorSpace, kCGImageAlphaPremultipliedLast); colorSpace, kCGImageAlphaPremultipliedLast);
CGImageRef sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], sourceRect); sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], sourceRect);
CGContextDrawImage(context, destRect, sourceImg); CGContextDrawImage(context, destRect, sourceImg);
CGImageRelease(sourceImg); CGImageRelease(sourceImg);
CGImageRef finalImage = CGBitmapContextCreateImage(context); CGImageRef finalImage = CGBitmapContextCreateImage(context);
@ -409,13 +409,13 @@ UIImage *bit_roundedCornerImage(UIImage *inputImage, NSInteger cornerSize, NSInt
UIImage *image = bit_imageWithAlpha(inputImage); UIImage *image = bit_imageWithAlpha(inputImage);
// Build a context that's the same dimensions as the new size // Build a context that's the same dimensions as the new size
CGContextRef context = CGBitmapContextCreate(NULL, context = CGBitmapContextCreate(NULL,
image.size.width, image.size.width,
image.size.height, image.size.height,
CGImageGetBitsPerComponent(image.CGImage), CGImageGetBitsPerComponent(image.CGImage),
0, 0,
CGImageGetColorSpace(image.CGImage), CGImageGetColorSpace(image.CGImage),
CGImageGetBitmapInfo(image.CGImage)); CGImageGetBitmapInfo(image.CGImage));
// Create a clipping path with rounded corners // Create a clipping path with rounded corners
CGContextBeginPath(context); CGContextBeginPath(context);