Browse Source

fix loop on download

Marino Faggiana 7 years ago
parent
commit
1d4c167ec5
2 changed files with 2 additions and 10 deletions
  1. 1 9
      iOSClient/Main/CCMain.m
  2. 1 1
      iOSClient/Networking/CCNetworking.m

+ 1 - 9
iOSClient/Main/CCMain.m

@@ -1421,7 +1421,7 @@
             
         } else {
             
-            if (errorCode != kCFURLErrorCancelled && errorCode != kOCErrorServerUnauthorized)
+            if (errorCode != kCFURLErrorCancelled && errorCode != kOCErrorServerUnauthorized && errorCode != k_CCErrorFileAlreadyInDownload)
                 [appDelegate messageNotification:@"_download_file_" description:errorMessage visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
         }
         
@@ -1465,10 +1465,6 @@
     [self tableViewSelect:NO];
 }
 
-- (void)downloadPlist:(NSString *)directoryID serverUrl:(NSString *)serverUrl
-{
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Upload new Photos/Videos =====
 #pragma --------------------------------------------------------------------------------------------
@@ -1758,10 +1754,6 @@
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         
-        // read plist
-        if (!_isSearchMode)
-            [self downloadPlist:metadataNet.directoryID serverUrl:metadataNet.serverUrl];
-
         // File is changed ??
         if (!_isSearchMode && metadatasToInsertInDB)
             [[CCSynchronize sharedSynchronize] verifyChangeMedatas:metadatasToInsertInDB serverUrl:metadataNet.serverUrl account:appDelegate.activeAccount withDownload:NO];

+ 1 - 1
iOSClient/Networking/CCNetworking.m

@@ -520,7 +520,7 @@
     }
     
     // it's in download
-    tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@ AND session CONTAINS 'download' AND sessionTaskIdentifier >= 0", _activeAccount, metadata.fileID]];
+    tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@ AND session CONTAINS 'download' AND sessionTaskIdentifier >= 0", metadata.fileID]];
         
     if (result) {