marinofaggiana 4 年之前
父節點
當前提交
f80c80f841
共有 2 個文件被更改,包括 5 次插入39 次删除
  1. 4 3
      iOSClient/Main/Collection/NCCollectionViewCommon.swift
  2. 1 36
      iOSClient/Transfers/NCTransfers.swift

+ 4 - 3
iOSClient/Main/Collection/NCCollectionViewCommon.swift

@@ -358,7 +358,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata {
-                if metadata.serverUrl == serverUrl && metadata.account == appDelegate.account {
+                if (metadata.serverUrl == serverUrl && metadata.account == appDelegate.account) || (layoutKey == k_layout_view_transfers) {
                     
                     if let row = dataSource?.addMetadata(metadata) {
                         let indexPath = IndexPath(row: row, section: 0)
@@ -378,7 +378,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata, let ocIdTemp = userInfo["ocIdTemp"] as? String, let _ = userInfo["errorCode"] as? Int {
-                if metadata.serverUrl == serverUrl && metadata.account == appDelegate.account {
+                if (metadata.serverUrl == serverUrl && metadata.account == appDelegate.account) || (layoutKey == k_layout_view_transfers) {
                    
                     dataSource?.reloadMetadata(ocId: metadata.ocId, ocIdTemp: ocIdTemp)
                     collectionView?.reloadData()
@@ -392,7 +392,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata {
-                if metadata.serverUrl == serverUrl && metadata.account == appDelegate.account {
+                if (metadata.serverUrl == serverUrl && metadata.account == appDelegate.account) || (layoutKey == k_layout_view_transfers) {
                     
                     if let row = dataSource?.deleteMetadata(ocId: metadata.ocId) {
                         let indexPath = IndexPath(row: row, section: 0)
@@ -414,6 +414,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         if let userInfo = notification.userInfo as NSDictionary? {
             if let ocId = userInfo["ocId"] as? String {
+                
                 let progressNumber = userInfo["progress"] as? NSNumber ?? 0
                 let progress = progressNumber.floatValue
                 

+ 1 - 36
iOSClient/Transfers/NCTransfers.swift

@@ -45,42 +45,7 @@ class NCTransfers: NCCollectionViewCommon  {
     // MARK: - Collection View
     
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        
-        guard let metadata = dataSource?.cellForItemAt(indexPath: indexPath) else { return }
-        metadataPush = metadata
-        
-        if isEditMode {
-            if let index = selectOcId.firstIndex(of: metadata.ocId) {
-                selectOcId.remove(at: index)
-            } else {
-                selectOcId.append(metadata.ocId)
-            }
-            collectionView.reloadItems(at: [indexPath])
-            return
-        }
-        
-        if metadata.directory {
-            
-            guard let serverUrlPush = CCUtility.stringAppendServerUrl(metadataPush!.serverUrl, addFileName: metadataPush!.fileName) else { return }
-            let ncOffline:NCOffline = UIStoryboard(name: "NCOffline", bundle: nil).instantiateInitialViewController() as! NCOffline
-            
-            ncOffline.serverUrl = serverUrlPush
-            ncOffline.titleCurrentFolder = metadataPush!.fileNameView
-            
-            self.navigationController?.pushViewController(ncOffline, animated: true)
-            
-        } else {
-            
-            if CCUtility.fileProviderStorageExists(metadataPush?.ocId, fileNameView: metadataPush?.fileNameView) {
-                performSegue(withIdentifier: "segueDetail", sender: self)
-            } else {
-                NCNetworking.shared.download(metadata: metadataPush!, selector: "") { (errorCode) in
-                    if errorCode == 0 {
-                        self.performSegue(withIdentifier: "segueDetail", sender: self)
-                    }
-                }
-            }
-        }
+        super.collectionView(collectionView, didSelectItemAt: indexPath)
     }
     
     // MARK: - NC API & Algorithm