floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential leak of NSURLConnection. Fixes #69.

This commit is contained in:
Lukhnos Liu 2012-10-23 20:39:13 -07:00
parent 3d686a4cd5
commit 9ada55e269
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/AppDelegate.h
View File

@ -41,6 +41,7 @@
@private
NSWindow *_window;
NSURLConnection *_updateCheckConnection;
NSMutableData *_receivingData;
UpdateNotificationController *_updateNotificationController;
}

53
Source/AppDelegate.m
View File

@ -41,8 +41,11 @@ void LTLoadLanguageModel();
static NSString *kNextUpdateCheckDateKey = @"NextUpdateCheckDate";
static NSString *kUpdateInfoEndpointKey = @"UpdateInfoEndpoint";
static NSString *kUpdateInfoSiteKey = @"UpdateInfoSite";
static const NSTimeInterval kTimeoutInterval = 10.0;
static const NSTimeInterval kNextCheckInterval = 86400.0;
static const NSTimeInterval kTimeoutInterval = 60.0;
@interface AppDelegate () <NSURLConnectionDataDelegate>
@end
@implementation AppDelegate
@synthesize window = _window;
@ -68,26 +71,27 @@ static const NSTimeInterval kNextCheckInterval = 86400.0;
- (void)checkForUpdate
{
NSDate *date = [[NSUserDefaults standardUserDefaults] objectForKey:kNextUpdateCheckDateKey];
if (![date isKindOfClass:[NSDate class]]) {
date = [NSDate date];
if (_updateCheckConnection) {
// busy
return;
}
if ([(NSDate *)[NSDate date] compare:date] == NSOrderedAscending) {
// time for update?
NSDate *now = [NSDate date];
NSDate *date = [[NSUserDefaults standardUserDefaults] objectForKey:kNextUpdateCheckDateKey];
if (![date isKindOfClass:[NSDate class]]) {
date = now;
}
if ([now compare:date] == NSOrderedAscending) {
return;
}
NSDate *nextUpdateDate = [NSDate dateWithTimeInterval:kNextCheckInterval sinceDate:[NSDate date]];
[[NSUserDefaults standardUserDefaults] setObject:nextUpdateDate forKey:kNextUpdateCheckDateKey];
if (_updateCheckConnection) {
[_updateCheckConnection release];
_updateCheckConnection = nil;
}
NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
NSString *updateInfoURLString = [infoDict objectForKey:kUpdateInfoEndpointKey];
if (![updateInfoURLString length]) {
return;
}
@ -98,7 +102,6 @@ static const NSTimeInterval kNextCheckInterval = 86400.0;
}
NSURLRequest *request = [NSURLRequest requestWithURL:updateInfoURL cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:kTimeoutInterval];
if (!request) {
return;
}
@ -106,21 +109,37 @@ static const NSTimeInterval kNextCheckInterval = 86400.0;
NSLog(@"about to request update url %@ ",updateInfoURL);
#endif
if (_receivingData) {
[_receivingData release];
_receivingData = nil;
}
// create a new data buffer and connection
_receivingData = [[NSMutableData alloc] init];
_updateCheckConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
[_updateCheckConnection start];
}
- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
{
NSLog(@"error");
[_receivingData release];
_receivingData = nil;
[_updateCheckConnection release];
_updateCheckConnection = nil;
}
- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
- (void)connectionDidFinishLoading:(NSURLConnection *)connection
{
id plist = [NSPropertyListSerialization propertyListFromData:data mutabilityOption:NSPropertyListImmutable format:NULL errorDescription:NULL];
id plist = [NSPropertyListSerialization propertyListFromData:_receivingData mutabilityOption:NSPropertyListImmutable format:NULL errorDescription:NULL];
#if DEBUG
NSLog(@"plist %@",plist);
#endif
[_receivingData release];
_receivingData = nil;
[_updateCheckConnection release];
_updateCheckConnection = nil;
if (!plist) {
return;
}
@ -174,4 +193,8 @@ static const NSTimeInterval kNextCheckInterval = 86400.0;
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
}
- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
{
[_receivingData appendData:data];
}
@end