瀏覽代碼

dev Photos delete

Marino Faggiana 6 年之前
父節點
當前提交
a481a02a70
共有 1 個文件被更改,包括 7 次插入10 次删除
  1. 7 10
      iOSClient/Photos/CCPhotos.m

+ 7 - 10
iOSClient/Photos/CCPhotos.m

@@ -395,14 +395,13 @@
     NSInteger numDelete = selectedMetadatas.count;
     __block NSInteger cont = 0;
     
-    for (tableMetadata *metadata in selectedMetadatas) {
+    OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:appDelegate.activeUser withUserID:appDelegate.activeUserID withPassword:appDelegate.activePassword withUrl:appDelegate.activeUrl];
     
-        NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
-        //
-        [[NCManageDatabase sharedInstance] setPhotosStatusWithFileID:metadata.fileID status:k_metadataStatusHide];
+    for (tableMetadata *metadata in selectedMetadatas) {
     
-        OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:appDelegate.activeUser withUserID:appDelegate.activeUserID withPassword:appDelegate.activePassword withUrl:appDelegate.activeUrl];
-        [ocNetworking deleteFileOrFolder:metadata.fileName serverUrl:serverUrl success:^{
+        [fileIDHide addObject:metadata.fileID];
+       
+        [ocNetworking deleteFileOrFolder:metadata.fileName serverUrl:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] success:^{
             
             [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadata.fileID] clearDateReadDirectoryID:metadata.directoryID];
             [[NCManageDatabase sharedInstance] deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadata.fileID]];
@@ -414,12 +413,10 @@
                 [self reloadDatasource];
             }
             
-            [fileIDHide addObject:metadata.fileID];
-            
         } failure:^(NSString *message, NSInteger errorCode) {
             
-            [[NCManageDatabase sharedInstance] setPhotosStatusWithFileID:metadata.fileID status:k_metadataStatusNormal];
-            
+            [fileIDHide removeObject:metadata.fileID];
+
             if (++cont == numDelete) {
                 [self reloadDatasource];
             }