|
@@ -1511,17 +1511,16 @@
|
|
|
|
|
|
while (counterUploadInSessionAndInLock < maxConcurrentDownloadUpload) {
|
|
|
|
|
|
+ // For encrypted ONLY 1 LOCK
|
|
|
+ NSArray *recordsUploadInLock = [[NCManageDatabase sharedInstance] getQueueUploadWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND lock = true", self.activeAccount]];
|
|
|
+ for (tableQueueUpload *upload in recordsUploadInLock) {
|
|
|
+ if ([CCUtility isFolderEncrypted:upload.serverUrl account:self.activeAccount]) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
metadataNet = [[NCManageDatabase sharedInstance] getQueueUploadLockWithSelector:selectorUploadFile];
|
|
|
if (metadataNet) {
|
|
|
|
|
|
- // Encrypted ONLY 1 LOCK
|
|
|
- if ([CCUtility isFolderEncrypted:metadataNet.serverUrl account:metadataNet.account]) {
|
|
|
-
|
|
|
- NSArray *recordUploadInLock = [[NCManageDatabase sharedInstance] getQueueUploadWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND lock = true", self.activeAccount]];
|
|
|
- if (recordUploadInLock.count >= 1)
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
// Priority Error only in Foreground
|
|
|
if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground && metadataNet.priority <= k_priorityAutoUploadError)
|
|
|
continue;
|