Header Empty Data fix

iOSClient/Favorites/NCFavorite.swift

@@ -71,7 +71,7 @@ class NCFavorite: NCCollectionViewCommon {
 
     override func getServerData(forced: Bool = false) async {
         defer {
-            restoreDefaultTitle()
+            stopGUIGetServerData()
             startSyncMetadata(metadatas: self.dataSource.getMetadatas())
         }
 
@@ -80,7 +80,7 @@ class NCFavorite: NCCollectionViewCommon {
             return
         }
 
-        showLoadingTitle()
+        startGUIGetServerData()
 
         let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: session.account)
         let resultsListingFavorites = await NextcloudKit.shared.listingFavoritesAsync(showHiddenFiles: showHiddenFiles,

iOSClient/Files/NCFiles.swift

@@ -181,7 +181,7 @@ class NCFiles: NCCollectionViewCommon {
 
     override func getServerData(forced: Bool = false) async {
         defer {
-            restoreDefaultTitle()
+            stopGUIGetServerData()
             startSyncMetadata(metadatas: self.dataSource.getMetadatas())
         }
 
@@ -266,7 +266,7 @@ class NCFiles: NCCollectionViewCommon {
             return (nil, NKError(), reloadRequired)
         }
 
-        showLoadingTitle()
+        startGUIGetServerData()
 
         let options = NKRequestOptions(timeout: 180)
         let (account, metadataFolder, metadatas, error) = await NCNetworking.shared.readFolderAsync(serverUrl: serverUrl,

iOSClient/Groupfolders/NCGroupfolders.swift

@@ -89,15 +89,15 @@ class NCGroupfolders: NCCollectionViewCommon {
 
     override func getServerData(forced: Bool = false) async {
         defer {
-            restoreDefaultTitle()
+            stopGUIGetServerData()
         }
 
         // If is already in-flight, do nothing
         if await NCNetworking.shared.networkingTasks.isReading(identifier: "NCGroupfolders") {
             return
         }
 
-        showLoadingTitle()
+        startGUIGetServerData()
 
         let homeServerUrl = utilityFileSystem.getHomeServer(session: session)
         let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: session.account)

iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift

@@ -523,7 +523,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                         emptyTitle = NSLocalizedString("_search_no_record_found_", comment: "")
                     }
                     emptyDescription = NSLocalizedString("_search_instruction_", comment: "")
-                } else if self.searchDataSourceTask?.state == .running {
+                } else if self.searchDataSourceTask?.state == .running || !self.dataSource.getGetServerData() {
                     emptyImage = utility.loadImage(named: "wifi", colors: [NCBrandColor.shared.getElement(account: session.account)])
                     emptyTitle = NSLocalizedString("_request_in_progress_", comment: "")
                     emptyDescription = ""

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -524,7 +524,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     func accountSettingsDidDismiss(tblAccount: tableAccount?, controller: NCMainTabBarController?) { }
 
     @MainActor
-    func showLoadingTitle() {
+    func startGUIGetServerData() {
+        self.dataSource.setGetServerData(false)
+        self.collectionView.reloadData()
+
         // Don't show spinner on iPad root folder
         if UIDevice.current.userInterfaceIdiom == .pad,
            (self.serverUrl == self.utilityFileSystem.getHomeServer(session: self.session)) || self.serverUrl.isEmpty {
@@ -548,7 +551,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     }
 
     @MainActor
-    func restoreDefaultTitle() {
+    func stopGUIGetServerData() {
+        self.dataSource.setGetServerData(true)
         self.navigationItem.titleView = nil
         self.navigationItem.title = self.titleCurrentFolder
     }

iOSClient/Main/Collection Common/NCCollectionViewDataSource.swift

@@ -20,6 +20,7 @@ class NCCollectionViewDataSource: NSObject {
     private var layoutForView: NCDBLayoutForView?
     private var directoryOnTop: Bool = true
     private var favoriteOnTop: Bool = true
+    private var hasGetServerData: Bool = true
 
     override init() { super.init() }
 
@@ -48,6 +49,16 @@ class NCCollectionViewDataSource: NSObject {
 
     // MARK: -
 
+    func getGetServerData() -> Bool {
+        return hasGetServerData
+    }
+
+    func setGetServerData(_ state: Bool) {
+        hasGetServerData = state
+    }
+
+    // MARK: -
+
     func removeAll() {
         self.metadatas.removeAll()
         self.metadatasForSection.removeAll()

iOSClient/Networking/NCNetworking+WebDAV.swift

@@ -26,6 +26,7 @@ extension NCNetworking {
                                                                                             name: "readFileOrFolder")
                 await NCNetworking.shared.networkingTasks.track(identifier: identifier, task: task)
             }
+            taskHandler(task)
         }
 
         guard resultsReadFolder.error == .success, let files = resultsReadFolder.files else {

iOSClient/Offline/NCOffline.swift

@@ -47,7 +47,7 @@ class NCOffline: NCCollectionViewCommon {
         super.viewWillAppear(animated)
 
         Task {
-            await self.reloadDataSource()
+            await getServerData()
         }
     }
 
@@ -86,6 +86,10 @@ class NCOffline: NCCollectionViewCommon {
     }
 
     override func getServerData(forced: Bool = false) async {
+        defer {
+            stopGUIGetServerData()
+        }
+
         await self.reloadDataSource()
     }
 }

iOSClient/Recent/NCRecent.swift

@@ -83,7 +83,7 @@ class NCRecent: NCCollectionViewCommon {
 
     override func getServerData(forced: Bool = false) async {
         defer {
-            restoreDefaultTitle()
+            stopGUIGetServerData()
         }
 
         // If is already in-flight, do nothing
@@ -160,7 +160,7 @@ class NCRecent: NCCollectionViewCommon {
         let requestBody = String(format: requestBodyRecent, "/files/" + session.userId, lessDateString)
         let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: session.account)
 
-        showLoadingTitle()
+        startGUIGetServerData()
 
         let resultsSearch = await NextcloudKit.shared.searchBodyRequestAsync(serverUrl: session.urlBase,
                                                                              requestBody: requestBody,

iOSClient/Shares/NCShares.swift

@@ -76,7 +76,7 @@ class NCShares: NCCollectionViewCommon {
             return
         }
 
-        showLoadingTitle()
+        startGUIGetServerData()
 
         let resultsReadShares = await NextcloudKit.shared.readSharesAsync(parameters: NKShareParameter(), account: session.account) { task in
             Task {
@@ -88,8 +88,8 @@ class NCShares: NCCollectionViewCommon {
         }
 
         guard resultsReadShares.error == .success else {
+            self.stopGUIGetServerData()
             await self.reloadDataSource()
-            self.restoreDefaultTitle()
             return
         }
 
@@ -134,7 +134,7 @@ class NCShares: NCCollectionViewCommon {
             }
 
             Task {
-                await self.restoreDefaultTitle()
+                await self.stopGUIGetServerData()
                 await self.reloadDataSource()
                 await self.startSyncMetadata(metadatas: self.dataSource.getMetadatas())
             }