zoriya/react-native-background-downloader
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-background-downloader.git synced 2026-05-27 08:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[iOS] fixes #18

Browse Source
This commit is contained in:
Kesha Antonov
2023-02-19 05:16:58 +03:00
parent c902327eec
commit ee2ea26179
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/RNBGDTaskConfig.h
+7 -1
View File
@@ -45,7 +45,13 @@
if (self) {
self.id = [aDecoder decodeObjectForKey:@"id"];
self.destination = [aDecoder decodeObjectForKey:@"destination"];
self.metadata = [aDecoder decodeObjectForKey:@"metadata"];
// metadata CAN BE nil AFTER UPGRADE FROM VERSION WHERE WAS NO PROP "metadata"
NSString * metadata = [aDecoder decodeObjectForKey:@"metadata"];
if (metadata == nil)
metadata = @"{}";
self.metadata = metadata;
self.reportedBegin = [aDecoder decodeBoolForKey:@"reportedBegin"];
}
ios/RNBackgroundDownloader.m
+11 -10
View File
@@ -112,7 +112,7 @@ RCT_EXPORT_MODULE();
// NOTE: FIXES HANGING DOWNLOADS WHEN GOING TO BG
- (void) resumeTasks:(NSNotification *) note {
NSLog(@"[RNBackgroundDownloader] - [resumeTasks] 1");
@synchronized (self->sharedLock) {
@synchronized (sharedLock) {
[urlSession getTasksWithCompletionHandler:^(NSArray<NSURLSessionDataTask *> * _Nonnull dataTasks, NSArray<NSURLSessionUploadTask *> * _Nonnull uploadTasks, NSArray<NSURLSessionDownloadTask *> * _Nonnull downloadTasks) {
NSLog(@"[RNBackgroundDownloader] - [resumeTasks] 2");
for (NSURLSessionDownloadTask *task in downloadTasks) {
@@ -280,19 +280,20 @@ RCT_EXPORT_METHOD(checkForExistingDownloads: (RCTPromiseResolveBlock)resolve rej
if (task.error && task.error.code == -999 && task.error.userInfo[NSURLSessionDownloadTaskResumeData] != nil) {
task = [urlSession downloadTaskWithResumeData:task.error.userInfo[NSURLSessionDownloadTaskResumeData]];
} else {
task = [urlSession downloadTaskWithURL:foundTask.currentRequest.URL];
task = [urlSession downloadTaskWithURL:task.currentRequest.URL];
}
[task resume];
}
NSNumber *percent = foundTask.countOfBytesExpectedToReceive > 0 ? [NSNumber numberWithFloat:(float)task.countOfBytesReceived/(float)foundTask.countOfBytesExpectedToReceive] : @0.0;
NSNumber *percent = task.countOfBytesExpectedToReceive > 0 ? [NSNumber numberWithFloat:(float)task.countOfBytesReceived/(float)task.countOfBytesExpectedToReceive] : @0.0;
[idsFound addObject:@{
@"id": taskConfig.id,
@"metadata": taskConfig.metadata,
@"state": [NSNumber numberWithInt: task.state],
@"bytesWritten": [NSNumber numberWithLongLong:task.countOfBytesReceived],
@"totalBytes": [NSNumber numberWithLongLong:foundTask.countOfBytesExpectedToReceive],
@"percent": percent
}];
@"id": taskConfig.id,
@"metadata": taskConfig.metadata,
@"state": [NSNumber numberWithInt: task.state],
@"bytesWritten": [NSNumber numberWithLongLong:task.countOfBytesReceived],
@"totalBytes": [NSNumber numberWithLongLong:task.countOfBytesExpectedToReceive],
@"percent": percent
}];
taskConfig.reportedBegin = YES;
taskToConfigMap[@(task.taskIdentifier)] = taskConfig;
idToTaskMap[taskConfig.id] = task;