marinofaggiana 5 years ago
parent
commit
3e0d1824f6
2 changed files with 38 additions and 24 deletions
  1. 4 4
      iOSClient/Main/CCMain.m
  2. 34 20
      iOSClient/Main/NCDetailViewController.swift

+ 4 - 4
iOSClient/Main/CCMain.m

@@ -1525,7 +1525,10 @@
                        
                         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
                             // Rename metadata
-                            (void) [[NCManageDatabase sharedInstance] renameMetadataWithFileNameTo:fileNameNew ocId:metadata.ocId];
+                            tableMetadata *newMetadata = [[NCManageDatabase sharedInstance] renameMetadataWithFileNameTo:fileNameNew ocId:metadata.ocId];
+                            
+                            NSDictionary* userInfo = @{@"metadata": newMetadata};
+                            [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:k_notificationCenter_renameFile object:nil userInfo:userInfo];
                             
                             if (metadata.directory) {
                                 
@@ -1557,9 +1560,6 @@
                                 [[NSFileManager defaultManager] moveItemAtPath:atPathIcon toPath:toPathIcon error:nil];
                             }
                             
-                            NSDictionary* userInfo = @{@"metadata": metadata};
-                            [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:k_notificationCenter_renameFile object:nil userInfo:userInfo];
-                            
                             [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:metadata.serverUrl ocId:metadata.ocId action:k_action_MOD];
                             
                         } else if (errorCode != 0) {

+ 34 - 20
iOSClient/Main/NCDetailViewController.swift

@@ -139,29 +139,27 @@ class NCDetailViewController: UIViewController {
             if let metadata = userInfo["metadata"] as? tableMetadata {
                 
                 // IMAGE
-                if mediaBrowser != nil {
-                    if metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
+                if mediaBrowser != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
                         
-                        if let metadatas = getMetadatasMediaBrowser() {
-                                    
-                            self.metadata = metadatas[0]
-                            
-                            for counter in 1...self.metadatas.count {
-                                let index = self.metadatas.count - counter
-                                let metadataLoop = self.metadatas[index]
-                                if metadataLoop.ocId != metadata.ocId {
-                                    self.metadata = metadataLoop
-                                } else {
-                                    break
-                                }
+                    if let metadatas = getMetadatasMediaBrowser() {
+                                
+                        self.metadata = metadatas[0]
+                        
+                        for counter in 1...self.metadatas.count {
+                            let index = self.metadatas.count - counter
+                            let metadataLoop = self.metadatas[index]
+                            if metadataLoop.ocId != metadata.ocId {
+                                self.metadata = metadataLoop
+                            } else {
+                                break
                             }
-                            
-                            viewImage()
-                            
-                        } else {
-                         
-                            viewUnload()
                         }
+                        
+                        viewImage()
+                        
+                    } else {
+                     
+                        viewUnload()
                     }
                     
                 // OTHER SINGLE FILE TYPE
@@ -176,6 +174,8 @@ class NCDetailViewController: UIViewController {
     @objc func uploadFile(_ notification: NSNotification) {
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata {
+                
+                // IMAGE
                 if mediaBrowser != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
                     if getMetadatasMediaBrowser() != nil {
                         viewImage()
@@ -190,6 +190,20 @@ class NCDetailViewController: UIViewController {
     @objc func renameFile(_ notification: NSNotification) {
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata {
+                
+                // IMAGE
+                if mediaBrowser != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
+                    if getMetadatasMediaBrowser() != nil {
+                        viewImage()
+                    } else {
+                        viewUnload()
+                    }
+                    
+                // OTHER SINGLE FILE TYPE
+                } else if metadata.ocId == self.metadata?.ocId {
+                    
+                    self.navigationController?.navigationBar.topItem?.title = metadata.fileNameView
+                }
             }
         }
     }