marinofaggiana 5 years ago
parent
commit
2c2b7e3a99
2 changed files with 10 additions and 23 deletions
  1. 8 23
      iOSClient/Main/NCDetailViewController.swift
  2. 2 0
      iOSClient/Media/NCMedia.swift

+ 8 - 23
iOSClient/Main/NCDetailViewController.swift

@@ -218,32 +218,23 @@ class NCDetailViewController: UIViewController {
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata, let type = userInfo["type"] as? String {
                 
-                if type == "delete" {
-                    if viewerImageViewController != nil && self.mediaFilterImage {
-                        if let metadatas = appDelegate.activeMedia.sectionDatasource.metadatas as? [tableMetadata] {
-                            self.metadatas = metadatas
-                        }
-                        
+                if viewerImageViewController != nil && self.mediaFilterImage {
+                    if let metadatas = appDelegate.activeMedia.sectionDatasource.metadatas as? [tableMetadata] {
+                        self.metadatas = metadatas
+                    }
+                    
+                    if type == "delete" {
                         if metadatas.count > 0 {
-                            
                             var index = viewerImageViewController!.index - 1
                             if index < 0 { index = 0}
                             self.metadata = metadatas[index]
                             viewImage()
-
                         } else {
-                            
                             viewUnload()
                         }
                     }
-                }
-                
-                if type == "rename" {
-                    if viewerImageViewController != nil && self.mediaFilterImage {
-                        if let metadatas = appDelegate.activeMedia.sectionDatasource.metadatas as? [tableMetadata] {
-                            self.metadatas = metadatas
-                        }
-                        
+                    
+                    if type == "rename" ||  type == "upload"   {
                         viewerImageViewController?.reloadContentViews()
                     }
                 }
@@ -255,12 +246,6 @@ class NCDetailViewController: UIViewController {
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata, let errorCode = userInfo["errorCode"] as? Int {
                 
-                /*
-                if errorCode == 0 && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl {
-                
-                    self.deleteFile(notification)
-                }
-                */
             }
         }
     }

+ 2 - 0
iOSClient/Media/NCMedia.swift

@@ -211,6 +211,8 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
                 
                 if errorCode == 0 && (metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio) {
                     
+                    _ = NCManageDatabase.sharedInstance.createTableMedia([metadata], lteDate: metadata.date as Date, gteDate: metadata.date as Date, account: metadata.account)
+                    
                     self.reloadDataSource(loadNetworkDatasource: false) {
                     
                         let userInfo: [String : Any] = ["metadata": metadata, "type": "upload"]