Build 8

Signed-off-by: Marino Faggiana <[email protected]>
nextcloud · Dec 2, 2024 · fd91ece · fd91ece
1 parent 729c962
commit fd91ece
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
@@ -5474,7 +5474,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -5540,7 +5540,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift
@@ -36,7 +36,7 @@ class NCImageCache: NSObject {
     private let allowExtensions = [NCGlobal.shared.previewExt256]
     private var brandElementColor: UIColor?
 
-    public var countLimit: Int = 0
+    public var countLimit: Int = 2000
     lazy var cache: LRUCache<String, UIImage> = {
         return LRUCache<String, UIImage>(countLimit: countLimit)
     }()
@@ -47,22 +47,15 @@ class NCImageCache: NSObject {
     override init() {
         super.init()
 
-        countLimit = calculateMaxImages(percentage: 4, imageSizeKB: 30.0)
-        NextcloudKit.shared.nkCommonInstance.writeLog("Counter cache image: \(countLimit)")
-
         NotificationCenter.default.addObserver(forName: LRUCacheMemoryWarningNotification, object: nil, queue: nil) { _ in
             self.cache.removeAllValues()
             self.cache = LRUCache<String, UIImage>(countLimit: self.countLimit)
-    #if DEBUG
-            NCContentPresenter().messageNotification("Cache image memory warning \(self.countLimit)", error: .success, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, priority: .max)
-    #endif
         }
 
         NotificationCenter.default.addObserver(forName: UIApplication.didEnterBackgroundNotification, object: nil, queue: nil) { _ in
             self.isDidEnterBackground = true
-            autoreleasepool {
-                self.cache.removeAllValues()
-            }
+            self.cache.removeAllValues()
+            self.cache = LRUCache<String, UIImage>(countLimit: self.countLimit)
         }
 
         NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: nil) { _ in
@@ -99,9 +92,6 @@ class NCImageCache: NSObject {
                                     self.cache.removeAllValues()
                                     break
                                 }
-                                if metadata.isInvalidated {
-                                    continue
-                                }
                                 if let image = self.utility.getImage(ocId: metadata.ocId, etag: metadata.etag, ext: NCGlobal.shared.previewExt256) {
                                     self.addImageCache(ocId: metadata.ocId, etag: metadata.etag, image: image, ext: NCGlobal.shared.previewExt256, cost: cost)
                                     cost += 1
@@ -128,15 +118,6 @@ class NCImageCache: NSObject {
         NotificationCenter.default.removeObserver(self, name: LRUCacheMemoryWarningNotification, object: nil)
     }
 
-    func calculateMaxImages(percentage: Double, imageSizeKB: Double) -> Int {
-        let totalRamBytes = Double(ProcessInfo.processInfo.physicalMemory)
-        let cacheSizeBytes = totalRamBytes * (percentage / 100.0)
-        let imageSizeBytes = imageSizeKB * 1024
-        let maxImages = Int(cacheSizeBytes / imageSizeBytes)
-
-        return maxImages
-    }
-
     func allowExtensions(ext: String) -> Bool {
         return allowExtensions.contains(ext)
     }