mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix background download operation 

FIx background download

Add task check when operation will deallocated && tidy code
This commit is contained in:
zhongwuzw 2018-10-11 17:44:18 +08:00 committed by DreamPiggy
parent 87f5f8b42f
commit 181d367215
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
SDWebImage/SDWebImageDownloaderOperation.m
View File

@ -64,6 +64,11 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
@synthesize executing = _executing; @synthesize executing = _executing;
@synthesize finished = _finished; @synthesize finished = _finished;
- (void)dealloc {
// Edge case if user call [SDWebImageDownloaderOperation start] directly and deallocated it.
[self cancel];
}
- (nonnull instancetype)init { - (nonnull instancetype)init {
return [self initWithRequest:nil inSession:nil options:0]; return [self initWithRequest:nil inSession:nil options:0];
} }
@ -82,6 +87,9 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
_unownedSession = session; _unownedSession = session;
_callbacksLock = dispatch_semaphore_create(1); _callbacksLock = dispatch_semaphore_create(1);
_coderQueue = dispatch_queue_create("com.hackemist.SDWebImageDownloaderOperationCoderQueue", DISPATCH_QUEUE_SERIAL); _coderQueue = dispatch_queue_create("com.hackemist.SDWebImageDownloaderOperationCoderQueue", DISPATCH_QUEUE_SERIAL);
#if SD_UIKIT
_backgroundTaskId = UIBackgroundTaskInvalid;
#endif
} }
return self; return self;
} }
@ -135,14 +143,7 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
__weak __typeof__ (self) wself = self; __weak __typeof__ (self) wself = self;
UIApplication * app = [UIApplicationClass performSelector:@selector(sharedApplication)]; UIApplication * app = [UIApplicationClass performSelector:@selector(sharedApplication)];
self.backgroundTaskId = [app beginBackgroundTaskWithExpirationHandler:^{ self.backgroundTaskId = [app beginBackgroundTaskWithExpirationHandler:^{
__strong __typeof (wself) sself = wself; [wself cancel];
if (sself) {
[sself cancel];
[app endBackgroundTask:sself.backgroundTaskId];
sself.backgroundTaskId = UIBackgroundTaskInvalid;
}
}]; }];
} }
#endif #endif
@ -206,18 +207,6 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
[self done]; [self done];
return; return;
} }
#if SD_UIKIT
Class UIApplicationClass = NSClassFromString(@"UIApplication");
if(!UIApplicationClass || ![UIApplicationClass respondsToSelector:@selector(sharedApplication)]) {
return;
}
if (self.backgroundTaskId != UIBackgroundTaskInvalid) {
UIApplication * app = [UIApplication performSelector:@selector(sharedApplication)];
[app endBackgroundTask:self.backgroundTaskId];
self.backgroundTaskId = UIBackgroundTaskInvalid;
}
#endif
} }
- (void)cancel { - (void)cancel {
@ -256,11 +245,23 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
LOCK(self.callbacksLock); LOCK(self.callbacksLock);
[self.callbackBlocks removeAllObjects]; [self.callbackBlocks removeAllObjects];
UNLOCK(self.callbacksLock); UNLOCK(self.callbacksLock);
self.dataTask = nil;
if (self.ownedSession) { @synchronized (self) {
[self.ownedSession invalidateAndCancel]; self.dataTask = nil;
self.ownedSession = nil;
if (self.ownedSession) {
[self.ownedSession invalidateAndCancel];
self.ownedSession = nil;
}
#if SD_UIKIT
if (self.backgroundTaskId != UIBackgroundTaskInvalid) {
// If backgroundTaskId != UIBackgroundTaskInvalid, sharedApplication is always exist
UIApplication * app = [UIApplication performSelector:@selector(sharedApplication)];
[app endBackgroundTask:self.backgroundTaskId];
self.backgroundTaskId = UIBackgroundTaskInvalid;
}
#endif
} }
} }