marinofaggiana 3 anos atrás
pai
commit
7e03147eb9

+ 7 - 22
Share/NCShareExtension.swift

@@ -61,7 +61,6 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
     private var autoUploadFileName = ""
     private var autoUploadDirectory = ""
     
-    private var shares: [tableShare]?
     private let refreshControl = UIRefreshControl()
     private var activeAccount: tableAccount!
         
@@ -206,7 +205,6 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
         
         (layout, sort, ascending, groupBy, directoryOnTop, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: keyLayout,serverUrl: serverUrl)
             
-        shares = NCManageDatabase.shared.getTableShares(account: activeAccount.account, serverUrl: serverUrl)
         reloadDatasource(withLoadFolder: true)
         setNavigationBar()
     }
@@ -377,7 +375,6 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
         }
         serverUrl.removeLast()
         
-        shares = NCManageDatabase.shared.getTableShares(account: activeAccount.account, serverUrl: serverUrl)
         reloadDatasource(withLoadFolder: true)
         setNavigationBar()
     }
@@ -443,18 +440,6 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
             }
         }
     }
-    
-    func tapShareListItem(with objectId: String, sender: Any) {
-    }
-    
-    func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, sender: Any) {
-    }
-    
-    func longPressMoreListItem(with objectId: String, namedButtonMore: String, gestureRecognizer: UILongPressGestureRecognizer) {
-    }
-    
-    func longPressListItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) {
-    }
 }
 
 // MARK: - Collection View
@@ -463,13 +448,13 @@ extension NCShareExtension: UICollectionViewDelegate {
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         
-        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return }
-        guard let serverUrlTemp = CCUtility.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName) else { return }
-        
-        serverUrl = serverUrlTemp
-        shares = NCManageDatabase.shared.getTableShares(account: activeAccount.account, serverUrl: serverUrl)
-        reloadDatasource(withLoadFolder: true)
-        setNavigationBar()
+        if let metadata = dataSource.cellForItemAt(indexPath: indexPath) {
+            if let serverUrl = CCUtility.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName)  {
+                self.serverUrl = serverUrl
+                reloadDatasource(withLoadFolder: true)
+                setNavigationBar()
+            }
+        }
     }
 }
 

+ 7 - 0
iOSClient/Main/Collection Common/NCGridCell.swift

@@ -129,6 +129,13 @@ protocol NCGridCellDelegate {
     func longPressGridItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer)
 }
 
+// optional func
+extension NCGridCellDelegate {
+    func tapMoreGridItem(with objectId: String, namedButtonMore: String, image: UIImage?, sender: Any) {}
+    func longPressMoreGridItem(with objectId: String, namedButtonMore: String, gestureRecognizer: UILongPressGestureRecognizer) {}
+    func longPressGridItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) {}
+}
+
 // MARK: - Grid Layout
 
 class NCGridLayout: UICollectionViewFlowLayout {

+ 8 - 0
iOSClient/Main/Collection Common/NCListCell.swift

@@ -161,6 +161,14 @@ protocol NCListCellDelegate {
     func longPressListItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer)
 }
 
+// optional func
+extension NCListCellDelegate {
+    func tapShareListItem(with objectId: String, sender: Any) {}
+    func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, sender: Any) {}
+    func longPressMoreListItem(with objectId: String, namedButtonMore: String, gestureRecognizer: UILongPressGestureRecognizer) {}
+    func longPressListItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) {}
+}
+
 // MARK: - List Layout
 
 class NCListLayout: UICollectionViewFlowLayout {

+ 8 - 0
iOSClient/Main/Section Header Footer/NCSectionHeaderFooter.swift

@@ -145,6 +145,14 @@ protocol NCSectionHeaderMenuDelegate {
     func tapRichWorkspace(sender: Any)
 }
 
+// optional func
+extension NCSectionHeaderMenuDelegate {
+    func tapSwitchHeader(sender: Any) {}
+    func tapMoreHeader(sender: Any) {}
+    func tapOrderHeader(sender: Any) {}
+    func tapRichWorkspace(sender: Any) {}
+}
+
 class NCSectionFooter: UICollectionReusableView {
     
     @IBOutlet weak var labelSection: UILabel!

+ 0 - 27
iOSClient/Select/NCSelect.swift

@@ -316,33 +316,6 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         let sortMenu = NCSortMenu()
         sortMenu.toggleMenu(viewController: self, key: keyLayout, sortButton: sender as? UIButton, serverUrl: serverUrl)
     }
-    
-    func tapMoreHeader(sender: Any) {
-    }
-    
-    func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, sender: Any) {
-    }
-    
-    func tapMoreGridItem(with objectId: String, namedButtonMore: String, image: UIImage?, sender: Any) {
-    }
-    
-    func tapShareListItem(with objectId: String, sender: Any) {
-    }
-    
-    func tapRichWorkspace(sender: Any) {
-    }
-    
-    func longPressListItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) {
-    }
-    
-    func longPressGridItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) {
-    }
-    
-    func longPressMoreListItem(with objectId: String, namedButtonMore: String, gestureRecognizer: UILongPressGestureRecognizer) {
-    }
-    
-    func longPressMoreGridItem(with objectId: String, namedButtonMore: String, gestureRecognizer: UILongPressGestureRecognizer) {
-    }
 }
 
 // MARK: - Collection View