From 75263f64fcd50719b3113951698797d9efdfeedc Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Tue, 29 Apr 2014 13:46:01 +0200 Subject: [PATCH 1/3] Change attachmentData property of BITCrashAttachment to crashAttachmentData --- Classes/BITCrashAttachment.h | 4 ++-- Classes/BITCrashAttachment.m | 8 ++++---- Classes/BITCrashManager.m | 2 +- Classes/BITCrashManagerDelegate.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Classes/BITCrashAttachment.h b/Classes/BITCrashAttachment.h index 482e0c004c..73217a2ac7 100644 --- a/Classes/BITCrashAttachment.h +++ b/Classes/BITCrashAttachment.h @@ -43,7 +43,7 @@ /** * The attachment data as NSData object */ -@property (nonatomic, readonly, strong) NSData *attachmentData; +@property (nonatomic, readonly, strong) NSData *crashAttachmentData; /** * The content type of your data as MIME type @@ -60,7 +60,7 @@ * @return An instsance of BITCrashAttachment */ - (instancetype)initWithFilename:(NSString *)filename - attachmentData:(NSData *)attachmentData + crashAttachmentData:(NSData *)crashAttachmentData contentType:(NSString *)contentType; @end diff --git a/Classes/BITCrashAttachment.m b/Classes/BITCrashAttachment.m index def32d2583..a4f2b17b73 100644 --- a/Classes/BITCrashAttachment.m +++ b/Classes/BITCrashAttachment.m @@ -31,12 +31,12 @@ @implementation BITCrashAttachment - (instancetype)initWithFilename:(NSString *)filename - attachmentData:(NSData *)attachmentData + crashAttachmentData:(NSData *)crashAttachmentData contentType:(NSString *)contentType { if (self = [super init]) { _filename = filename; - _attachmentData = attachmentData; + _crashAttachmentData = crashAttachmentData; _contentType = contentType; } @@ -48,14 +48,14 @@ - (void)encodeWithCoder:(NSCoder *)encoder { [encoder encodeObject:self.filename forKey:@"filename"]; - [encoder encodeObject:self.attachmentData forKey:@"data"]; + [encoder encodeObject:self.crashAttachmentData forKey:@"data"]; [encoder encodeObject:self.contentType forKey:@"contentType"]; } - (id)initWithCoder:(NSCoder *)decoder { if ((self = [super init])) { _filename = [decoder decodeObjectForKey:@"filename"]; - _attachmentData = [decoder decodeObjectForKey:@"data"]; + _crashAttachmentData = [decoder decodeObjectForKey:@"data"]; _contentType = [decoder decodeObjectForKey:@"contentType"]; } return self; diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m index 18b3aaf270..c9dc2ec7ca 100644 --- a/Classes/BITCrashManager.m +++ b/Classes/BITCrashManager.m @@ -1005,7 +1005,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus"; BITCrashAttachment *attachment = (BITCrashAttachment *)dict[KBITAttachmentDictAttachment]; - [postBody appendData:[BITHockeyAppClient dataWithPostValue:attachment.attachmentData + [postBody appendData:[BITHockeyAppClient dataWithPostValue:attachment.crashAttachmentData forKey:key contentType:attachment.contentType boundary:boundary diff --git a/Classes/BITCrashManagerDelegate.h b/Classes/BITCrashManagerDelegate.h index c88aef2c93..2697106ad7 100644 --- a/Classes/BITCrashManagerDelegate.h +++ b/Classes/BITCrashManagerDelegate.h @@ -66,7 +66,7 @@ NSData *data = [NSData dataWithContentsOfURL:@"mydatafile"]; BITCrashAttachment *attachment = [[BITCrashAttachment alloc] initWithFilename:@"myfile.data" - attachmentData:data + crashAttachmentData:data contentType:@"'application/octet-stream"]; return attachment; } From 5f9de5a4ebdb1d520ee52f3f6243bebff7f35153 Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Fri, 9 May 2014 14:41:28 +0200 Subject: [PATCH 2/3] Fix `updateManagerShouldSendUsageData` from `BITUpdateManagerDelegate` being called at the wrong time --- Classes/BITUpdateManager.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m index 597e35a4eb..ccf0b561cd 100644 --- a/Classes/BITUpdateManager.m +++ b/Classes/BITUpdateManager.m @@ -424,10 +424,6 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) { self.lastCheck = [NSDate distantPast]; } - if (self.delegate != nil && [self.delegate respondsToSelector:@selector(updateManagerShouldSendUsageData:)]) { - _sendUsageData = [self.delegate updateManagerShouldSendUsageData:self]; - } - if (!BITHockeyBundle()) { NSLog(@"[HockeySDK] WARNING: %@ is missing, make sure it is added!", BITHOCKEYSDK_BUNDLE); } @@ -763,6 +759,10 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) { BITHockeyLog(@"INFO: Starting UpdateManager"); + if (self.delegate != nil && [self.delegate respondsToSelector:@selector(updateManagerShouldSendUsageData:)]) { + _sendUsageData = [self.delegate updateManagerShouldSendUsageData:self]; + } + [self checkExpiryDateReached]; if (![self expiryDateReached]) { if ([self checkForTracker] || ([self isCheckForUpdateOnLaunch] && [self shouldCheckForUpdates])) { From 6cd4c089f0ac1a15e525c65080845250bd5343cd Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Tue, 13 May 2014 11:41:15 +0200 Subject: [PATCH 3/3] Fix BITUpdateManager BITUpdateCheckManually being ignored when the app comes back from background --- Classes/BITUpdateManager.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m index ccf0b561cd..61d1b6b09d 100644 --- a/Classes/BITUpdateManager.m +++ b/Classes/BITUpdateManager.m @@ -108,7 +108,8 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) { if ([self expiryDateReached]) return; [self startUsage]; - if (_checkForUpdateOnLaunch) { + + if ([self isCheckForUpdateOnLaunch] && [self shouldCheckForUpdates]) { [self checkForUpdate]; } }