Marino Faggiana 7 年之前
父節點
當前提交
bc83e6a517
共有 2 個文件被更改,包括 8 次插入10 次删除
  1. 5 8
      iOSClient/FileSystem/CCCoreData.m
  2. 3 2
      iOSClient/FileSystem/NCManageDatabase.swift

+ 5 - 8
iOSClient/FileSystem/CCCoreData.m

@@ -1294,20 +1294,17 @@
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileID] error:nil];
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.ico", directoryUser, metadata.fileID] error:nil];
     
-    // ------------------------------------------ COREDATA -------------------------------------------
-    
-    //[self deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount]];
-    
-    [[NCManageDatabase sharedInstance] deleteMetadata:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount]];
-    
-    [self deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount]];
-    
+    // ------------------------------------------ DATABASE -------------------------------------------
+
     // se è una directory cancelliamo tutto quello che è della directory
     if (metadata.directory && serverUrl) {
         
         NSString *dirForDelete = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileNameData];
         [self deleteDirectoryAndSubDirectory:dirForDelete activeAccount:activeAccount];
     }
+    
+    [self deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount]];
+    [[NCManageDatabase sharedInstance] deleteMetadata:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount]];
 }
 
 #pragma --------------------------------------------------------------------------------------------

+ 3 - 2
iOSClient/FileSystem/NCManageDatabase.swift

@@ -1234,8 +1234,8 @@ class NCManageDatabase: NSObject {
                 
                 realm.delete(metadata)
                 
-                metadata.fileID = fileID!
-                realm.add(metadata, update: true)
+                //metadata.fileID = fileID!
+                //realm.add(metadata, update: true)
                 
                 
                 
@@ -1247,6 +1247,7 @@ class NCManageDatabase: NSObject {
                 realm.add(metadataWithIcon!, update: true)
             }
         }
+        
     }
     
     func setMetadataSession(_ session: String?, sessionError: String?, sessionSelector: String?, sessionSelectorPost: String?, sessionTaskIdentifier: Int, sessionTaskIdentifierPlist: Int, predicate: NSPredicate) {