fix: initialize media data source before searching

iOSClient/Media/NCMedia.swift

@@ -180,6 +180,10 @@ class NCMedia: UIViewController {
         pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:)))
         collectionView.addGestureRecognizer(pinchGesture)
 
+        Task {
+            await loadDataSource()
+        }
+
         NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: global.notificationCenterChangeUser), object: nil, queue: nil) { [weak self] notification in
             guard let self else {
                 return
@@ -196,6 +200,7 @@ class NCMedia: UIViewController {
                 self.dataSource.clearCompactMetadatas()
                 self.setTitleDate()
 
+                await self.loadDataSource(forced: true)
                 await self.searchMediaUI(true)
             }
         }
@@ -247,7 +252,7 @@ class NCMedia: UIViewController {
                 return
             }
 
-            await self.loadDataSource()
+            self.searchNewMedia()
 
             guard !Task.isCancelled else {
                 return
@@ -263,8 +268,6 @@ class NCMedia: UIViewController {
         super.viewDidAppear(animated)
 
         NotificationCenter.default.addObserver(self, selector: #selector(enterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
-
-        searchNewMedia()
     }
 
     override func viewDidDisappear(_ animated: Bool) {

iOSClient/Media/NCMediaDataSource.swift

@@ -7,7 +7,7 @@ import NextcloudKit
 import RealmSwift
 
 extension NCMedia {
-    func loadDataSource() async {
+    func loadDataSource(forced: Bool = false) async {
         let account = self.session.account
 
         guard !Task.isCancelled else {
@@ -56,10 +56,12 @@ extension NCMedia {
             }
 
             let shouldContinue = await MainActor.run {
-                self.isViewActived &&
-                self.session.account == account &&
-                self.view.window != nil &&
-                self.tabBarController?.selectedViewController === self.navigationController
+                forced || (
+                    self.isViewActived &&
+                    self.session.account == account &&
+                    self.view.window != nil &&
+                    self.tabBarController?.selectedViewController === self.navigationController
+                )
             }
 
             guard shouldContinue,
@@ -77,10 +79,16 @@ extension NCMedia {
 
             await MainActor.run {
                 guard !Task.isCancelled,
-                      self.isViewActived,
-                      self.session.account == account,
-                      self.view.window != nil,
-                      self.tabBarController?.selectedViewController === self.navigationController else {
+                      forced || (
+                          self.isViewActived &&
+                          self.session.account == account &&
+                          self.view.window != nil &&
+                          self.tabBarController?.selectedViewController === self.navigationController
+                      ) else {
+                    return
+                }
+
+                guard !self.dataSource.hasSameContent(as: dataSource) else {
                     return
                 }
 
@@ -729,6 +737,26 @@ public class NCMediaDataSource: NSObject {
 
     // MARK: -
 
+    func hasSameContent(as otherDataSource: NCMediaDataSource) -> Bool {
+        guard compactMetadatas.count == otherDataSource.compactMetadatas.count else {
+            return false
+        }
+
+        for (currentMetadata, otherMetadata) in zip(
+            compactMetadatas,
+            otherDataSource.compactMetadatas
+        ) {
+            guard currentMetadata.ocId == otherMetadata.ocId,
+                  currentMetadata.etag == otherMetadata.etag,
+                  currentMetadata.date == otherMetadata.date,
+                  currentMetadata.isLivePhoto == otherMetadata.isLivePhoto else {
+                return false
+            }
+        }
+
+        return true
+    }
+
     func clearCompactMetadatas() {
         compactMetadatas.removeAll()
         sections.removeAll()