|
@@ -1489,17 +1489,22 @@
|
|
|
|
|
|
if (counterUploadInSessionAndInLock < maxConcurrentDownloadUpload && counterUploadInLock < 1) {
|
|
|
|
|
|
- metadataNet = [[NCManageDatabase sharedInstance] getQueueUploadLockWithSelector:selectorUploadFile];
|
|
|
+ metadataNet = [[NCManageDatabase sharedInstance] getQueueUpload];
|
|
|
if (metadataNet) {
|
|
|
|
|
|
- if (metadataNet.path == nil) {
|
|
|
+ if (metadataNet.path == nil) {
|
|
|
+ metadataNet = [[NCManageDatabase sharedInstance] getQueueUploadLockWithSelector:selectorUploadFile];
|
|
|
[[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet delegate:_activeMain];
|
|
|
+ counterNewUpload++;
|
|
|
} else {
|
|
|
- NSString *toPath = [NSString stringWithFormat:@"%@/%@", self.directoryUser, metadataNet.fileName];
|
|
|
- [CCUtility copyFileAtPath:metadataNet.path toPath:toPath];
|
|
|
- [[CCNetworking sharedNetworking] uploadFile:metadataNet.fileName serverUrl:metadataNet.serverUrl assetLocalIdentifier:metadataNet.assetLocalIdentifier session:metadataNet.session taskStatus:k_taskStatusResume selector:metadataNet.selector selectorPost:metadataNet.selectorPost errorCode:0 delegate:nil];
|
|
|
+ if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
|
|
|
+ metadataNet = [[NCManageDatabase sharedInstance] getQueueUploadLockWithSelector:selectorUploadFile];
|
|
|
+ NSString *toPath = [NSString stringWithFormat:@"%@/%@", self.directoryUser, metadataNet.fileName];
|
|
|
+ [CCUtility copyFileAtPath:metadataNet.path toPath:toPath];
|
|
|
+ [[CCNetworking sharedNetworking] uploadFile:metadataNet.fileName serverUrl:metadataNet.serverUrl assetLocalIdentifier:metadataNet.assetLocalIdentifier session:metadataNet.session taskStatus:k_taskStatusResume selector:metadataNet.selector selectorPost:metadataNet.selectorPost errorCode:0 delegate:nil];
|
|
|
+ counterNewUpload++;
|
|
|
+ }
|
|
|
}
|
|
|
- counterNewUpload++;
|
|
|
}
|
|
|
|
|
|
counterUploadInSessionAndInLock = [[[NCManageDatabase sharedInstance] getTableMetadataUpload] count] + [[[NCManageDatabase sharedInstance] getTableMetadataUploadWWan] count] + [[[NCManageDatabase sharedInstance] getQueueUploadInLock] count];
|