Merge pull request #1295 from Infomaniak/fix-empty-state

fix: Correctly observe parent directory for empty files
Infomaniak · Sep 20, 2024 · f2a2c51 · f2a2c51
2 parents 20e1838 + 12d40b0
commit f2a2c51
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/kDrive/UI/Controller/Files/File List/FileListViewModel.swift b/kDrive/UI/Controller/Files/File List/FileListViewModel.swift
@@ -93,6 +93,7 @@ class FileListViewModel: SelectDelegate {
     }
 
     var realmObservationToken: NotificationToken?
+    var currentDirectoryObservationToken: NotificationToken?
 
     var currentDirectory: File
     var driveFileManager: DriveFileManager {
@@ -226,10 +227,28 @@ class FileListViewModel: SelectDelegate {
                 files = resultFiles
                 isShowingEmptyView = shouldShowEmptyView()
             }
+
+        currentDirectoryObservationToken?.invalidate()
+        guard currentDirectory.isManagedByRealm,
+              !currentDirectory.isInvalidated,
+              let liveCurrentDirectory = currentDirectory.thaw() else { return }
+        currentDirectoryObservationToken = liveCurrentDirectory
+            .observe(keyPaths: ["lastCursor", "fullyDownloaded"],
+                     on: .main) { [weak self] change in
+                guard let self else { return }
+
+                switch change {
+                case .change:
+                    currentDirectory = getRefreshedCurrentDirectory()
+                    isShowingEmptyView = shouldShowEmptyView()
+                default:
+                    break
+                }
+            }
     }
 
     func shouldShowEmptyView() -> Bool {
-        currentDirectory.children.isEmpty && currentDirectory.fullyDownloaded
+        files.isEmpty && currentDirectory.fullyDownloaded
     }
 
     func startObservation() {