Marino Faggiana 7 年之前
父节点
当前提交
b0fa433089
共有 3 个文件被更改,包括 17 次插入9 次删除
  1. 10 4
      iOSClient/Actions/CCActions.swift
  2. 6 4
      iOSClient/Main/CCDetail.m
  3. 1 1
      iOSClient/Main/CCMain.m

+ 10 - 4
iOSClient/Actions/CCActions.swift

@@ -134,7 +134,9 @@ class CCActions: NSObject {
     
     func deleteFileOrFolderSuccess(_ metadataNet: CCMetadataNet) {
         
-        CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
+        let metadata = NCManageDatabase.sharedInstance.getMetadataWithPreficate(NSPredicate(format: "fileID == %@", metadataNet.fileID))
+        
+        CCCoreData.deleteFile(metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
         
         metadataNet.delegate?.deleteFileOrFolderSuccess(metadataNet)
     }
@@ -143,7 +145,9 @@ class CCActions: NSObject {
         
         if errorCode == 404 {
             
-            CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
+            let metadata = NCManageDatabase.sharedInstance.getMetadataWithPreficate(NSPredicate(format: "fileID == %@", metadataNet.fileID))
+            
+            CCCoreData.deleteFile(metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
         }
 
         if message.length > 0 {
@@ -280,7 +284,9 @@ class CCActions: NSObject {
     
     func renameSuccess(_ metadataNet: CCMetadataNet) {
         
-        if metadataNet.metadata.directory {
+        let metadata = NCManageDatabase.sharedInstance.getMetadataWithPreficate(NSPredicate(format: "fileID == %@", metadataNet.fileID))
+        
+        if metadata?.directory == true {
             
             let directory = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileName)
             let directoryTo = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileNameTo)
@@ -289,7 +295,7 @@ class CCActions: NSObject {
             
         } else {
             
-            CCCoreData.renameLocalFile(withFileID: metadataNet.metadata.fileID, fileNameTo: metadataNet.fileNameTo, fileNamePrintTo: metadataNet.fileNameTo, activeAccount: appDelegate.activeAccount)
+            CCCoreData.renameLocalFile(withFileID: metadataNet.fileID, fileNameTo: metadataNet.fileNameTo, fileNamePrintTo: metadataNet.fileNameTo, activeAccount: appDelegate.activeAccount)
         }
         
         metadataNet.delegate?.renameSuccess(metadataNet)

+ 6 - 4
iOSClient/Main/CCDetail.m

@@ -982,14 +982,16 @@
     if (_webView || _readerPDFViewController)
         [self removeAllView];
     
+    tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataNet.fileID]];
+    
     // if a message for a directory of these
-    if (![_dataSourceDirectoryID containsObject:metadataNet.metadata.directoryID])
+    if (![_dataSourceDirectoryID containsObject:metadata.directoryID])
         return;
     
     // if we are not in browserPhoto and it's removed photo/video in preview then "< Back"
-    if (!self.photoBrowser && [self.metadataDetail.fileID isEqualToString:metadataNet.metadata.fileID]) {
+    if (!self.photoBrowser && [self.metadataDetail.fileID isEqualToString:metadata.fileID]) {
         
-        if ([metadataNet.metadata.typeFile isEqualToString: k_metadataTypeFile_audio])
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_audio])
             [app.player.mediaPlayer stop];
         
         NSArray *viewsToRemove = [self.view subviews];
@@ -1011,7 +1013,7 @@
             tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
         
             // ricerca index
-            if ([metadataNet.metadata.fileID isEqualToString:metadata.fileID]) {
+            if ([metadata.fileID isEqualToString:metadata.fileID]) {
             
                 [self.dataSourceImagesVideos removeObjectAtIndex:index];
             

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -2139,7 +2139,7 @@
         if (_isSearchMode)
             [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
         else
-            [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.metadata.fileID selector:metadataNet.selector];
+            [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
         
         // next
         if ([_selectedMetadatas count] > 0) {