Marino Faggiana 1 year ago
parent
commit
064f589f1c

+ 1 - 2
iOSClient/Data/NCDataSource.swift

@@ -51,8 +51,7 @@ class NCDataSource: NSObject {
         super.init()
 
         self.metadatas = metadatas.filter({
-            !NCGlobal.shared.includeHiddenFiles.contains($0.fileNameView) ||
-            ($0.status > 0 && ($0.chunk || $0.e2eEncrypted))
+            NCGlobal.shared.includeHiddenFiles.contains($0.fileNameView)
         })
         self.directory = directory
         self.localFiles = NCManageDatabase.shared.getTableLocalFile(account: account)

+ 4 - 0
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -246,6 +246,10 @@ extension tableMetadata {
             return false
         }
     }
+
+    func isTransferInForeground() -> Bool {
+        return (status > 0 && (chunk || e2eEncrypted))
+    }
 }
 
 extension NCManageDatabase {

+ 1 - 2
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1750,11 +1750,10 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
     func getHeaderHeight() -> CGFloat {
 
         var size: CGFloat = 0
-        var headerTransfer = false
 
         // transfer in progress
         if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocIdTransferInForeground),
-           (metadata.status > 0 && (metadata.chunk || metadata.e2eEncrypted)) {
+           metadata.isTransferInForeground() {
             if !isSearchingMode {
                 size += NCGlobal.shared.heightHeaderTransfer
             }

+ 2 - 0
iOSClient/Main/Section Header Footer/NCSectionHeaderMenu.swift

@@ -97,6 +97,7 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
         imageButtonTransfer.image = UIImage(systemName: "stop.circle")
         imageButtonTransfer.tintColor = .white
         labelTransfer.text = ""
+        progressTransfer.progress = 0
         progressTransfer.tintColor = NCBrandColor.shared.brand
         progressTransfer.trackTintColor = .clear
         transferSeparatorTop.backgroundColor = .separator
@@ -194,6 +195,7 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
 
         labelTransfer.text = text
         viewTransfer.isHidden = isHidden
+        progressTransfer.progress = 0
 
         if isHidden {
             viewTransferHeightConstraint.constant = 0