fix

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
nextcloud · Oct 21, 2024 · e84cae9 · e84cae9
1 parent 4e32cc1
commit e84cae9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/iOSClient/Data/NCManageDatabase+Metadata+Session.swift b/iOSClient/Data/NCManageDatabase+Metadata+Session.swift
@@ -124,13 +124,15 @@ extension NCManageDatabase {
             let realm = try Realm()
             try realm.write {
                 for metadata in metadatas {
-                    metadata.sceneIdentifier = nil
-                    metadata.session = ""
-                    metadata.sessionTaskIdentifier = 0
-                    metadata.sessionError = ""
-                    metadata.sessionSelector = ""
-                    metadata.sessionDate = nil
-                    metadata.status = NCGlobal.shared.metadataStatusNormal
+                    if let result = realm.objects(tableMetadata.self).filter("ocId == %@", metadata.ocId).first {
+                        result.sceneIdentifier = nil
+                        result.session = ""
+                        result.sessionTaskIdentifier = 0
+                        result.sessionError = ""
+                        result.sessionSelector = ""
+                        result.sessionDate = nil
+                        result.status = NCGlobal.shared.metadataStatusNormal
+                    }
                 }
             }
         } catch let error {
@@ -142,13 +144,15 @@ extension NCManageDatabase {
         do {
             let realm = try Realm()
             try realm.write {
-                metadata.sceneIdentifier = nil
-                metadata.session = ""
-                metadata.sessionTaskIdentifier = 0
-                metadata.sessionError = ""
-                metadata.sessionSelector = ""
-                metadata.sessionDate = nil
-                metadata.status = NCGlobal.shared.metadataStatusNormal
+                if let result = realm.objects(tableMetadata.self).filter("ocId == %@", metadata.ocId).first {
+                    result.sceneIdentifier = nil
+                    result.session = ""
+                    result.sessionTaskIdentifier = 0
+                    result.sessionError = ""
+                    result.sessionSelector = ""
+                    result.sessionDate = nil
+                    result.status = NCGlobal.shared.metadataStatusNormal
+                }
             }
         } catch let error {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")

diff --git a/...t/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSourcePrefetching.swift b/...t/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSourcePrefetching.swift
@@ -27,9 +27,11 @@ import UIKit
 extension NCCollectionViewCommon: UICollectionViewDataSourcePrefetching {
     func collectionView(_ collectionView: UICollectionView, prefetchItemsAt indexPaths: [IndexPath]) {
         let ext = global.getSizeExtension(column: self.numberOfColumns)
-        guard !isSearchingMode,
+        guard !(self is NCTransfers),
+              !isSearchingMode,
               imageCache.allowExtensions(ext: ext)
         else { return }
+
         let cost = indexPaths.first?.row ?? 0
 
         DispatchQueue.global().async {

diff --git a/iOSClient/Networking/NCNetworkingProcess.swift b/iOSClient/Networking/NCNetworkingProcess.swift
@@ -54,8 +54,8 @@ class NCNetworkingProcess {
                 case .update(_, _, let insertions, let modifications):
                     if insertions.count > 0 || modifications.count > 0 {
                         guard let self else { return }
-
-                        self.lockQueue.sync {
+                        self.startTimer()
+                        self.lockQueue.async {
                             guard !self.hasRun, self.networking.isOnline else { return }
                             self.hasRun = true
 
@@ -79,7 +79,7 @@ class NCNetworkingProcess {
         self.timerProcess?.invalidate()
         self.timerProcess = Timer.scheduledTimer(withTimeInterval: 3, repeats: true, block: { _ in
 
-            self.lockQueue.sync {
+            self.lockQueue.async {
                 guard !self.hasRun,
                       self.networking.isOnline,
                       let results = self.database.getResultsMetadatas(predicate: NSPredicate(format: "status != %d", self.global.metadataStatusNormal))?.freeze()

diff --git a/iOSClient/Transfers/NCTransfers.swift b/iOSClient/Transfers/NCTransfers.swift
@@ -214,8 +214,8 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         cell.fileOcId = metadata.ocId
         cell.fileOcIdTransfer = metadata.ocIdTransfer
         cell.fileUser = metadata.ownerId
-        cell.imageItem.image = imageCache.getImageFile()
-        cell.imageItem.backgroundColor = nil
+        cell.filePreviewImageView?.image = imageCache.getImageFile()
+        cell.filePreviewImageView?.backgroundColor = nil
         cell.labelTitle.text = metadata.fileNameView
         cell.labelTitle.textColor = NCBrandColor.shared.textColor
         let serverUrlHome = utilityFileSystem.getHomeServer(session: session)
@@ -226,9 +226,9 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
 
         /// Image item
         if !metadata.iconName.isEmpty {
-            cell.imageItem.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true, account: metadata.account)
+            cell.filePreviewImageView?.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true, account: metadata.account)
         } else {
-            cell.imageItem.image = imageCache.getImageFile()
+            cell.filePreviewImageView?.image = imageCache.getImageFile()
         }
 
         /// Status and Info