Change class name

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>

Nextcloud.xcodeproj/project.pbxproj

@@ -321,7 +321,7 @@
 		F74B6D9B2A7E239A00F03C5F /* NCManageDatabase+Chunk.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74B6D942A7E239A00F03C5F /* NCManageDatabase+Chunk.swift */; };
 		F74C0436253F1CDC009762AB /* NCShares.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74C0434253F1CDC009762AB /* NCShares.swift */; };
 		F74C0437253F1CDC009762AB /* NCShares.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F74C0435253F1CDC009762AB /* NCShares.storyboard */; };
-		F74C86382AEFBE64009A1D4A /* NCCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B649B2ADFFAED00014640 /* NCCache.swift */; };
+		F74C86382AEFBE64009A1D4A /* NCImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B649B2ADFFAED00014640 /* NCImageCache.swift */; };
 		F74C863D2AEFBFD9009A1D4A /* LRUCache in Frameworks */ = {isa = PBXBuildFile; productRef = F74C863C2AEFBFD9009A1D4A /* LRUCache */; };
 		F74DE14325135B6800917068 /* NCTransfers.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74DE14125135B6800917068 /* NCTransfers.swift */; };
 		F74DE14425135B6800917068 /* NCTransfers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F74DE14225135B6800917068 /* NCTransfers.storyboard */; };
@@ -401,7 +401,7 @@
 		F769CA1A2966EA3C00039397 /* ComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F769CA182966EA3C00039397 /* ComponentView.swift */; };
 		F76B3CCE1EAE01BD00921AC9 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */; };
 		F76B3CCF1EAE01BD00921AC9 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */; };
-		F76B649C2ADFFAED00014640 /* NCCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B649B2ADFFAED00014640 /* NCCache.swift */; };
+		F76B649C2ADFFAED00014640 /* NCImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B649B2ADFFAED00014640 /* NCImageCache.swift */; };
 		F76B649E2ADFFDEC00014640 /* LRUCache in Frameworks */ = {isa = PBXBuildFile; productRef = F76B649D2ADFFDEC00014640 /* LRUCache */; };
 		F76C26A62850D3A500E42BDF /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7F67BB81A24D27800EE80DA /* Images.xcassets */; };
 		F76D364628A4F8BF00214537 /* NCActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76D364528A4F8BF00214537 /* NCActivityIndicator.swift */; };
@@ -1086,7 +1086,7 @@
 		F769CA162965AB7C00039397 /* NCUploadAssets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCUploadAssets.swift; sourceTree = "<group>"; };
 		F769CA182966EA3C00039397 /* ComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComponentView.swift; sourceTree = "<group>"; };
 		F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCBrand.swift; sourceTree = "<group>"; };
-		F76B649B2ADFFAED00014640 /* NCCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCache.swift; sourceTree = "<group>"; };
+		F76B649B2ADFFAED00014640 /* NCImageCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCImageCache.swift; sourceTree = "<group>"; };
 		F76D364528A4F8BF00214537 /* NCActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityIndicator.swift; sourceTree = "<group>"; };
 		F76D3CF02428B40E005DFA87 /* NCViewerPDFSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerPDFSearch.swift; sourceTree = "<group>"; };
 		F76D3CF22428B94E005DFA87 /* NCViewerPDFSearchCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCViewerPDFSearchCell.xib; sourceTree = "<group>"; };
@@ -2477,7 +2477,7 @@
 			isa = PBXGroup;
 			children = (
 				F702F2CC25EE5B4F008F8E80 /* AppDelegate.swift */,
-				F76B649B2ADFFAED00014640 /* NCCache.swift */,
+				F76B649B2ADFFAED00014640 /* NCImageCache.swift */,
 				F702F2CE25EE5B5C008F8E80 /* NCGlobal.swift */,
 				F73CB5771ED46807005F2A5A /* NCBridgeSwift.h */,
 				F70F96AF2874394B006C8379 /* Nextcloud-Bridging-Header.h */,
@@ -3541,7 +3541,7 @@
 				F780710A1EDAB65800EAFFF6 /* NSNotificationCenter+MainThread.m in Sources */,
 				F79EC77F26316193004E59D6 /* NCRenameFile.swift in Sources */,
 				AF22B208277B4E4C00DAB0CC /* NCCreateFormUploadConflictCell.swift in Sources */,
-				F74C86382AEFBE64009A1D4A /* NCCache.swift in Sources */,
+				F74C86382AEFBE64009A1D4A /* NCImageCache.swift in Sources */,
 				F7148041262EBE4000693E51 /* NCShareExtension.swift in Sources */,
 				F76B3CCF1EAE01BD00921AC9 /* NCBrand.swift in Sources */,
 				F72944F32A84246400246839 /* NCEndToEndMetadataV20.swift in Sources */,
@@ -3701,7 +3701,7 @@
 				F77BB74A2899857B0090FC19 /* UINavigationController+Extension.swift in Sources */,
 				F769454622E9F1B0000A798A /* NCShareCommon.swift in Sources */,
 				F70753F12542A9A200972D44 /* NCViewerMedia.swift in Sources */,
-				F76B649C2ADFFAED00014640 /* NCCache.swift in Sources */,
+				F76B649C2ADFFAED00014640 /* NCImageCache.swift in Sources */,
 				F78A18B823CDE2B300F681F3 /* NCViewerRichWorkspace.swift in Sources */,
 				F7A60F86292D215000FCE1F2 /* NCShareAccounts.swift in Sources */,
 				F77910AB25DD53C700CEDB9E /* NCSettingsBundleHelper.swift in Sources */,

Share/NCShareCell.swift

@@ -54,7 +54,7 @@ class NCShareCell: UITableViewCell {
             if !resultInternalType.iconName.isEmpty {
                 imageCell?.image = UIImage(named: resultInternalType.iconName)
             } else {
-                imageCell?.image = NCCache.cacheImages.file
+                imageCell?.image = NCImageCache.images.file
             }
         }
 

Share/NCShareExtension+DataSource.swift

@@ -84,7 +84,7 @@ extension NCShareExtension: UICollectionViewDataSource {
 
         // image Favorite
         if metadata.favorite {
-            cell.imageFavorite.image = NCCache.cacheImages.favorite
+            cell.imageFavorite.image = NCImageCache.images.favorite
         }
 
         cell.imageSelect.isHidden = true
@@ -95,7 +95,7 @@ extension NCShareExtension: UICollectionViewDataSource {
 
         // Live Photo
         if metadata.livePhoto {
-            cell.imageStatus.image = NCCache.cacheImages.livePhoto
+            cell.imageStatus.image = NCImageCache.images.livePhoto
         }
 
         // Add TAGS
@@ -116,21 +116,21 @@ extension NCShareExtension: UICollectionViewDataSource {
         }
 
         if metadata.e2eEncrypted {
-            cell.imageItem.image = NCCache.cacheImages.folderEncrypted
+            cell.imageItem.image = NCImageCache.images.folderEncrypted
         } else if isShare {
-            cell.imageItem.image = NCCache.cacheImages.folderSharedWithMe
+            cell.imageItem.image = NCImageCache.images.folderSharedWithMe
         } else if !metadata.shareType.isEmpty {
             metadata.shareType.contains(3) ?
-            (cell.imageItem.image = NCCache.cacheImages.folderPublic) :
-            (cell.imageItem.image = NCCache.cacheImages.folderSharedWithMe)
+            (cell.imageItem.image = NCImageCache.images.folderPublic) :
+            (cell.imageItem.image = NCImageCache.images.folderSharedWithMe)
         } else if metadata.mountType == "group" {
-            cell.imageItem.image = NCCache.cacheImages.folderGroup
+            cell.imageItem.image = NCImageCache.images.folderGroup
         } else if isMounted {
-            cell.imageItem.image = NCCache.cacheImages.folderExternal
+            cell.imageItem.image = NCImageCache.images.folderExternal
         } else if metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory {
-            cell.imageItem.image = NCCache.cacheImages.folderAutomaticUpload
+            cell.imageItem.image = NCImageCache.images.folderAutomaticUpload
         } else {
-            cell.imageItem.image = NCCache.cacheImages.folder
+            cell.imageItem.image = NCImageCache.images.folder
         }
 
         cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date)
@@ -140,7 +140,7 @@ extension NCShareExtension: UICollectionViewDataSource {
 
         // Local image: offline
         if tableDirectory != nil && tableDirectory!.offline {
-            cell.imageLocal.image = NCCache.cacheImages.offlineFlag
+            cell.imageLocal.image = NCImageCache.images.offlineFlag
         }
     }
 }

Share/NCShareExtension+NCDelegate.swift

@@ -82,7 +82,7 @@ extension NCShareExtension: NCEmptyDataSetDelegate, NCAccountRequestDelegate {
         // COLORS
         NCBrandColor.shared.settingThemingColor(account: activeAccount.account)
         NCBrandColor.shared.createUserColors()
-        NCCache.shared.createImagesCache()
+        NCImageCache.shared.createImagesCache()
 
         // NETWORKING
         NextcloudKit.shared.setup(
@@ -132,7 +132,7 @@ extension NCShareExtension: NCShareCellDelegate, NCRenameFileDelegate, NCListCel
         if let previewImage = UIImage.downsample(imageAt: URL(fileURLWithPath: NSTemporaryDirectory() + fileName), to: CGSize(width: 140, height: 140)) {
             vcRename.imagePreview = previewImage
         } else {
-            vcRename.imagePreview = UIImage(named: resultInternalType.iconName) ?? NCCache.cacheImages.file
+            vcRename.imagePreview = UIImage(named: resultInternalType.iconName) ?? NCImageCache.images.file
         }
 
         let popup = NCPopupViewController(contentController: vcRename, popupWidth: vcRename.width, popupHeight: vcRename.height)

Share/NCShareExtension.swift

@@ -130,7 +130,7 @@ class NCShareExtension: UIViewController {
             NCBrandColor.shared.settingThemingColor(account: activeAccount.account)
         }
         NCBrandColor.shared.createUserColors()
-        NCCache.shared.createImagesCache()
+        NCImageCache.shared.createImagesCache()
 
         hud.indicatorView = JGProgressHUDRingIndicatorView()
         if let indicatorView = hud.indicatorView as? JGProgressHUDRingIndicatorView {

iOSClient/AppDelegate.swift

@@ -130,8 +130,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             NCManageDatabase.shared.setCapabilities(account: account)
 
             NCBrandColor.shared.settingThemingColor(account: activeAccount.account)
-            NCCache.shared.createImagesCache()
-            NCCache.shared.createMediaCache(account: activeAccount.account)
+            NCImageCache.shared.createImagesCache()
+            NCImageCache.shared.createMediaCache(account: activeAccount.account)
 
         } else {
 
@@ -140,7 +140,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 UserDefaults.standard.removePersistentDomain(forName: bundleID)
             }
 
-            NCCache.shared.createImagesCache()
+            NCImageCache.shared.createImagesCache()
         }
 
         NCBrandColor.shared.createUserColors()
@@ -598,7 +598,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Initialize Auto upload with \(items) uploads")
         }
 
-        DispatchQueue.global().async { NCCache.shared.createMediaCache(account: self.account) }
+        DispatchQueue.global().async { NCImageCache.shared.createMediaCache(account: self.account) }
 
         NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeUser)
     }

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -530,7 +530,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                 if progressNumber.floatValue == 1 && !(cell is NCTransferCell) {
                     cell.fileProgressView?.isHidden = true
                     cell.fileProgressView?.progress = .zero
-                    cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCCache.cacheImages.buttonMore)
+                    cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCImageCache.images.buttonMore)
                     if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
                         cell.writeInfoDateSize(date: metadata.date, size: metadata.size)
                     } else {
@@ -539,7 +539,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                 } else {
                     cell.fileProgressView?.isHidden = false
                     cell.fileProgressView?.progress = progressNumber.floatValue
-                    cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCCache.cacheImages.buttonStop)
+                    cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCImageCache.images.buttonStop)
                     if status == NCGlobal.shared.metadataStatusInDownload {
                         cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(totalBytesExpected) + " - ↓ " + utilityFileSystem.transformedSize(totalBytes)
                     } else if status == NCGlobal.shared.metadataStatusInUpload {
@@ -1202,7 +1202,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                     (cell as? NCCellProtocol)?.filePreviewImageView?.image = image
                 } else {
                     if metadata.iconName.isEmpty {
-                        (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.file
+                        (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.file
                     } else {
                         (cell as? NCCellProtocol)?.filePreviewImageView?.image = UIImage(named: metadata.iconName)
                     }
@@ -1215,23 +1215,23 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 // Unified search
                 switch metadata.iconName {
                 case let str where str.contains("contacts"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconContacts
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconContacts
                 case let str where str.contains("conversation"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconTalk
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconTalk
                 case let str where str.contains("calendar"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconCalendar
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconCalendar
                 case let str where str.contains("deck"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconDeck
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconDeck
                 case let str where str.contains("mail"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconMail
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconMail
                 case let str where str.contains("talk"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconTalk
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconTalk
                 case let str where str.contains("confirm"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconConfirm
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconConfirm
                 case let str where str.contains("pages"):
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.iconPages
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.iconPages
                 default:
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.file
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.file
                 }
 
                 if !metadata.iconUrl.isEmpty {
@@ -1351,28 +1351,28 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             let tableDirectory = NCManageDatabase.shared.getTableDirectory(ocId: metadata.ocId)
 
             if metadata.e2eEncrypted {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folderEncrypted
+                cell.filePreviewImageView?.image = NCImageCache.images.folderEncrypted
             } else if isShare {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folderSharedWithMe
+                cell.filePreviewImageView?.image = NCImageCache.images.folderSharedWithMe
             } else if !metadata.shareType.isEmpty {
                 metadata.shareType.contains(3) ?
-                (cell.filePreviewImageView?.image = NCCache.cacheImages.folderPublic) :
-                (cell.filePreviewImageView?.image = NCCache.cacheImages.folderSharedWithMe)
+                (cell.filePreviewImageView?.image = NCImageCache.images.folderPublic) :
+                (cell.filePreviewImageView?.image = NCImageCache.images.folderSharedWithMe)
             } else if !metadata.shareType.isEmpty && metadata.shareType.contains(3) {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folderPublic
+                cell.filePreviewImageView?.image = NCImageCache.images.folderPublic
             } else if metadata.mountType == "group" {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folderGroup
+                cell.filePreviewImageView?.image = NCImageCache.images.folderGroup
             } else if isMounted {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folderExternal
+                cell.filePreviewImageView?.image = NCImageCache.images.folderExternal
             } else if metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folderAutomaticUpload
+                cell.filePreviewImageView?.image = NCImageCache.images.folderAutomaticUpload
             } else {
-                cell.filePreviewImageView?.image = NCCache.cacheImages.folder
+                cell.filePreviewImageView?.image = NCImageCache.images.folder
             }
 
             // Local image: offline
             if let tableDirectory, tableDirectory.offline {
-                cell.fileLocalImage?.image = NCCache.cacheImages.offlineFlag
+                cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
             }
 
             // color folder
@@ -1383,40 +1383,40 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             // image local
             if NCManageDatabase.shared.getTableLocalFile(ocId: metadata.ocId) != nil {
                 a11yValues.append(NSLocalizedString("_offline_", comment: ""))
-                cell.fileLocalImage?.image = NCCache.cacheImages.offlineFlag
+                cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
             } else if utilityFileSystem.fileProviderStorageExists(metadata) {
-                cell.fileLocalImage?.image = NCCache.cacheImages.local
+                cell.fileLocalImage?.image = NCImageCache.images.local
             }
         }
 
         // image Favorite
         if metadata.favorite {
-            cell.fileFavoriteImage?.image = NCCache.cacheImages.favorite
+            cell.fileFavoriteImage?.image = NCImageCache.images.favorite
             a11yValues.append(NSLocalizedString("_favorite_", comment: ""))
         }
 
         // Share image
         if isShare {
-            cell.fileSharedImage?.image = NCCache.cacheImages.shared
+            cell.fileSharedImage?.image = NCImageCache.images.shared
         } else if !metadata.shareType.isEmpty {
             metadata.shareType.contains(3) ?
-            (cell.fileSharedImage?.image = NCCache.cacheImages.shareByLink) :
-            (cell.fileSharedImage?.image = NCCache.cacheImages.shared)
+            (cell.fileSharedImage?.image = NCImageCache.images.shareByLink) :
+            (cell.fileSharedImage?.image = NCImageCache.images.shared)
         } else {
-            cell.fileSharedImage?.image = NCCache.cacheImages.canShare
+            cell.fileSharedImage?.image = NCImageCache.images.canShare
         }
         if appDelegate.account != metadata.account {
-            cell.fileSharedImage?.image = NCCache.cacheImages.shared
+            cell.fileSharedImage?.image = NCImageCache.images.shared
         }
 
         // Button More
         if metadata.isInTransfer || metadata.isWaitingTransfer {
-            cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCCache.cacheImages.buttonStop)
+            cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCImageCache.images.buttonStop)
         } else if metadata.lock == true {
-            cell.setButtonMore(named: NCGlobal.shared.buttonMoreLock, image: NCCache.cacheImages.buttonMoreLock)
+            cell.setButtonMore(named: NCGlobal.shared.buttonMoreLock, image: NCImageCache.images.buttonMoreLock)
             a11yValues.append(String(format: NSLocalizedString("_locked_by_", comment: ""), metadata.lockOwnerDisplayName))
         } else {
-            cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCCache.cacheImages.buttonMore)
+            cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCImageCache.images.buttonMore)
         }
 
         // Write status on Label Info
@@ -1448,7 +1448,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
 
         // Live Photo
         if metadata.livePhoto {
-            cell.fileStatusImage?.image = NCCache.cacheImages.livePhoto
+            cell.fileStatusImage?.image = NCImageCache.images.livePhoto
             a11yValues.append(NSLocalizedString("_upload_mov_livephoto_", comment: ""))
         }
 

iOSClient/Main/Collection Common/NCGridCell.swift

@@ -194,7 +194,7 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
                 imageVisualEffect.effect = UIBlurEffect(style: .extraLight)
                 imageVisualEffect.backgroundColor = .lightGray
             }
-            imageSelect.image = NCCache.cacheImages.checkedYes
+            imageSelect.image = NCImageCache.images.checkedYes
             imageVisualEffect.isHidden = false
         } else {
             imageSelect.isHidden = true

iOSClient/Main/Collection Common/NCListCell.swift

@@ -249,7 +249,7 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         if status {
             var blurEffect: UIVisualEffect?
             var blurEffectView: UIView?
-            imageSelect.image = NCCache.cacheImages.checkedYes
+            imageSelect.image = NCImageCache.images.checkedYes
             if traitCollection.userInterfaceStyle == .dark {
                 blurEffect = UIBlurEffect(style: .dark)
                 blurEffectView = UIVisualEffectView(effect: blurEffect)
@@ -264,7 +264,7 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             backgroundView = blurEffectView
             separator.isHidden = true
         } else {
-            imageSelect.image = NCCache.cacheImages.checkedNo
+            imageSelect.image = NCImageCache.images.checkedNo
             backgroundView = nil
             separator.isHidden = false
         }

iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -76,7 +76,7 @@ class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
 
     func selected(_ status: Bool) {
         if status {
-            imageSelect.image = NCCache.cacheImages.checkedYes
+            imageSelect.image = NCImageCache.images.checkedYes
             imageVisualEffect.isHidden = false
             imageVisualEffect.alpha = 0.4
         } else {

iOSClient/Media/NCMedia.swift

@@ -159,7 +159,7 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
               let error = userInfo["error"] as? NKError else { return }
         let onlyLocalCache: Bool = userInfo["onlyLocalCache"] as? Bool ?? false
 
-        NCCache.shared.getMediaMetadatas(account: appDelegate.account, filterClassTypeImage: filterClassTypeImage, filterClassTypeVideo: filterClassTypeVideo)
+        NCImageCache.shared.getMediaMetadatas(account: appDelegate.account, filterClassTypeImage: filterClassTypeImage, filterClassTypeVideo: filterClassTypeVideo)
 
         if error == .success, let indexPath = userInfo["indexPath"] as? [IndexPath], !indexPath.isEmpty, !onlyLocalCache {
             collectionView?.performBatchUpdates({
@@ -299,7 +299,7 @@ extension NCMedia: UICollectionViewDelegate {
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
 
-        let metadata = NCCache.shared.metadatas[indexPath.row]
+        let metadata = NCImageCache.shared.metadatas[indexPath.row]
         if isEditMode {
             if let index = selectOcId.firstIndex(of: metadata.ocId) {
                 selectOcId.remove(at: index)
@@ -315,14 +315,14 @@ extension NCMedia: UICollectionViewDelegate {
             // ACTIVE SERVERURL
             appDelegate.activeServerUrl = metadata.serverUrl
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridMediaCell
-            NCViewer().view(viewController: self, metadata: metadata, metadatas: NCCache.shared.metadatas, imageIcon: cell?.imageItem.image)
+            NCViewer().view(viewController: self, metadata: metadata, metadatas: NCImageCache.shared.metadatas, imageIcon: cell?.imageItem.image)
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
 
         guard let cell = collectionView.cellForItem(at: indexPath) as? NCGridMediaCell else { return nil }
-        let metadata = NCCache.shared.metadatas[indexPath.row]
+        let metadata = NCImageCache.shared.metadatas[indexPath.row]
         let identifier = indexPath as NSCopying
         let image = cell.imageItem.image
 
@@ -358,13 +358,13 @@ extension NCMedia: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        emptyDataSet?.numberOfItemsInSection(NCCache.shared.metadatas.count, section: section)
-        return NCCache.shared.metadatas.count
+        emptyDataSet?.numberOfItemsInSection(NCImageCache.shared.metadatas.count, section: section)
+        return NCImageCache.shared.metadatas.count
     }
 
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if !collectionView.indexPathsForVisibleItems.contains(indexPath) && indexPath.row < NCCache.shared.metadatas.count {
-            let metadata = NCCache.shared.metadatas[indexPath.row]
+        if !collectionView.indexPathsForVisibleItems.contains(indexPath) && indexPath.row < NCImageCache.shared.metadatas.count {
+            let metadata = NCImageCache.shared.metadatas[indexPath.row]
             for case let operation as NCMediaDownloadThumbnaill in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
                 operation.cancel()
             }
@@ -375,9 +375,9 @@ extension NCMedia: UICollectionViewDataSource {
 
         guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridMediaCell else { return UICollectionViewCell() }
 
-        if indexPath.section < collectionView.numberOfSections && indexPath.row < collectionView.numberOfItems(inSection: indexPath.section) && indexPath.row < NCCache.shared.metadatas.count {
+        if indexPath.section < collectionView.numberOfSections && indexPath.row < collectionView.numberOfItems(inSection: indexPath.section) && indexPath.row < NCImageCache.shared.metadatas.count {
 
-            let metadata = NCCache.shared.metadatas[indexPath.row]
+            let metadata = NCImageCache.shared.metadatas[indexPath.row]
 
             self.cellHeigth = cell.frame.size.height
 
@@ -388,20 +388,20 @@ extension NCMedia: UICollectionViewDataSource {
 
             if metadata.isAudioOrVideo {
                 cell.imageStatus.image = cacheImages.cellPlayImage
-            } else if metadata.livePhoto && NCCache.shared.livePhoto {
+            } else if metadata.livePhoto && NCImageCache.shared.livePhoto {
                 cell.imageStatus.image = cacheImages.cellLivePhotoImage
             } else {
                 cell.imageStatus.image = nil
             }
 
-            if let image = NCCache.shared.getMediaImage(ocId: metadata.ocId) {
+            if let image = NCImageCache.shared.getMediaImage(ocId: metadata.ocId) {
                 cell.imageItem.backgroundColor = nil
                 cell.imageItem.image = image
             } else if FileManager().fileExists(atPath: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
                 if let image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
                     cell.imageItem.backgroundColor = nil
                     cell.imageItem.image = image
-                    NCCache.shared.setMediaImage(ocId: metadata.ocId, image: image)
+                    NCImageCache.shared.setMediaImage(ocId: metadata.ocId, image: image)
                 }
             } else {
                 if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && (!utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)) {
@@ -449,12 +449,12 @@ extension NCMedia {
         guard !appDelegate.account.isEmpty else { return }
 
         DispatchQueue.global().async {
-            NCCache.shared.getMediaMetadatas(account: self.appDelegate.account, filterClassTypeImage: self.filterClassTypeImage, filterClassTypeVideo: self.filterClassTypeVideo)
+            NCImageCache.shared.getMediaMetadatas(account: self.appDelegate.account, filterClassTypeImage: self.filterClassTypeImage, filterClassTypeVideo: self.filterClassTypeVideo)
             DispatchQueue.main.sync {
                 self.reloadDataThenPerform {
                     self.updateMediaControlVisibility()
                     self.mediaCommandTitle()
-                    completion(NCCache.shared.metadatas)
+                    completion(NCImageCache.shared.metadatas)
                 }
             }
         }
@@ -462,7 +462,7 @@ extension NCMedia {
 
     func updateMediaControlVisibility() {
 
-        if NCCache.shared.metadatas.isEmpty {
+        if NCImageCache.shared.metadatas.isEmpty {
             if !self.filterClassTypeImage && !self.filterClassTypeVideo {
                 self.mediaCommandView?.toggleEmptyView(isEmpty: true)
                 self.mediaCommandView?.isHidden = false
@@ -491,7 +491,7 @@ extension NCMedia {
         }
 
         var lessDate = Date()
-        if let predicate = NCCache.shared.predicateDefault, let metadata = NCManageDatabase.shared.getMetadata(predicate: predicate, sorted: "date", ascending: true) {
+        if let predicate = NCImageCache.shared.predicateDefault, let metadata = NCManageDatabase.shared.getMetadata(predicate: predicate, sorted: "date", ascending: true) {
             lessDate = metadata.date as Date
         }
 
@@ -516,7 +516,7 @@ extension NCMedia {
                 if !files.isEmpty {
                     NCManageDatabase.shared.convertFilesToMetadatas(files, useMetadataFolder: false) { _, _, metadatas in
                         let predicateDate = NSPredicate(format: "date > %@ AND date < %@", greaterDate as NSDate, lessDate as NSDate)
-                        let predicateResult = NSCompoundPredicate(andPredicateWithSubpredicates: [predicateDate, NCCache.shared.predicateDefault!])
+                        let predicateResult = NSCompoundPredicate(andPredicateWithSubpredicates: [predicateDate, NCImageCache.shared.predicateDefault!])
                         let metadatasResult = NCManageDatabase.shared.getMetadatas(predicate: predicateResult)
                         let metadatasChanged = NCManageDatabase.shared.updateMetadatas(metadatas, metadatasResult: metadatasResult, addCompareLivePhoto: false)
                         if metadatasChanged.metadatasUpdate.isEmpty {
@@ -570,7 +570,7 @@ extension NCMedia {
         if let visibleCells = self.collectionView?.indexPathsForVisibleItems.sorted(by: { $0.row < $1.row }).compactMap({ self.collectionView?.cellForItem(at: $0) }) {
             if let cell = visibleCells.first as? NCGridMediaCell {
                 if cell.date != nil {
-                    if cell.date != NCCache.shared.metadatas.first?.date as Date? {
+                    if cell.date != NCImageCache.shared.metadatas.first?.date as Date? {
                         lessDate = Calendar.current.date(byAdding: .second, value: 1, to: cell.date!)!
                         limit = 0
                     }
@@ -597,14 +597,14 @@ extension NCMedia {
                 if error == .success, account == self.appDelegate.account, !files.isEmpty {
                     NCManageDatabase.shared.convertFilesToMetadatas(files, useMetadataFolder: false) { _, _, metadatas in
                         let predicate = NSPredicate(format: "date > %@ AND date < %@", greaterDate as NSDate, lessDate as NSDate)
-                        let predicateResult = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, NCCache.shared.predicate!])
+                        let predicateResult = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, NCImageCache.shared.predicate!])
                         let metadatasResult = NCManageDatabase.shared.getMetadatas(predicate: predicateResult)
                         let updateMetadatas = NCManageDatabase.shared.updateMetadatas(metadatas, metadatasResult: metadatasResult, addCompareLivePhoto: false)
                         if !updateMetadatas.metadatasUpdate.isEmpty || !updateMetadatas.metadatasDelete.isEmpty {
                             self.reloadDataSourceWithCompletion { _ in }
                         }
                     }
-                } else if error == .success, files.isEmpty, NCCache.shared.metadatas.isEmpty {
+                } else if error == .success, files.isEmpty, NCImageCache.shared.metadatas.isEmpty {
                     self.searchOldMedia()
                 } else if error != .success {
                     NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Media search new media error code \(error.errorCode) " + error.errorDescription)
@@ -856,7 +856,7 @@ class NCMediaDownloadThumbnaill: ConcurrentOperation {
                         self.collectionView?.reloadData()
                     }
                 }
-                NCCache.shared.setMediaImage(ocId: self.metadata.ocId, image: image)
+                NCImageCache.shared.setMediaImage(ocId: self.metadata.ocId, image: image)
             }
             self.finish()
         }

iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -56,9 +56,9 @@ extension NCCollectionViewCommon {
             iconHeader = imageIcon!
         } else {
             if metadata.directory {
-                iconHeader = NCCache.cacheImages.folder
+                iconHeader = NCImageCache.images.folder
             } else {
-                iconHeader = NCCache.cacheImages.file
+                iconHeader = NCImageCache.images.file
             }
         }
 

iOSClient/Menu/NCMedia+Menu.swift

@@ -40,7 +40,7 @@ extension NCMedia {
         defer { presentMenu(with: actions) }
 
         if !isEditMode {
-            if !NCCache.shared.metadatas.isEmpty {
+            if !NCImageCache.shared.metadatas.isEmpty {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_select_", comment: ""),

iOSClient/NCCache.swift → iOSClient/NCImageCache.swift

@@ -1,5 +1,5 @@
 //
-//  NCCache.swift
+//  NCImageCache.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 18/10/23.
@@ -25,9 +25,9 @@ import UIKit
 import LRUCache
 import NextcloudKit
 
-@objc class NCCache: NSObject {
-    @objc public static let shared: NCCache = {
-        let instance = NCCache()
+@objc class NCImageCache: NSObject {
+    @objc public static let shared: NCImageCache = {
+        let instance = NCImageCache()
         return instance
     }()
 
@@ -157,7 +157,7 @@ import NextcloudKit
 
     // MARK: -
 
-    struct cacheImages {
+    struct images {
         static var file = UIImage()
 
         static var shared = UIImage()
@@ -202,43 +202,43 @@ import NextcloudKit
         let yellowFavorite = NCBrandColor.shared.yellowFavorite
         let utility = NCUtility()
 
-        cacheImages.file = UIImage(named: "file")!
+        images.file = UIImage(named: "file")!
 
-        cacheImages.shared = UIImage(named: "share")!.image(color: .systemGray, size: 50)
-        cacheImages.canShare = UIImage(named: "share")!.image(color: .systemGray, size: 50)
-        cacheImages.shareByLink = UIImage(named: "sharebylink")!.image(color: .systemGray, size: 50)
+        images.shared = UIImage(named: "share")!.image(color: .systemGray, size: 50)
+        images.canShare = UIImage(named: "share")!.image(color: .systemGray, size: 50)
+        images.shareByLink = UIImage(named: "sharebylink")!.image(color: .systemGray, size: 50)
 
-        cacheImages.favorite = utility.loadImage(named: "star.fill", color: yellowFavorite)
-        cacheImages.comment = UIImage(named: "comment")!.image(color: .systemGray, size: 50)
-        cacheImages.livePhoto = utility.loadImage(named: "livephoto", color: .label)
-        cacheImages.offlineFlag = UIImage(named: "offlineFlag")!
-        cacheImages.local = UIImage(named: "local")!
+        images.favorite = utility.loadImage(named: "star.fill", color: yellowFavorite)
+        images.comment = UIImage(named: "comment")!.image(color: .systemGray, size: 50)
+        images.livePhoto = utility.loadImage(named: "livephoto", color: .label)
+        images.offlineFlag = UIImage(named: "offlineFlag")!
+        images.local = UIImage(named: "local")!
 
         let folderWidth: CGFloat = UIScreen.main.bounds.width / 3
-        cacheImages.folderEncrypted = UIImage(named: "folderEncrypted")!.image(color: brandElement, size: folderWidth)
-        cacheImages.folderSharedWithMe = UIImage(named: "folder_shared_with_me")!.image(color: brandElement, size: folderWidth)
-        cacheImages.folderPublic = UIImage(named: "folder_public")!.image(color: brandElement, size: folderWidth)
-        cacheImages.folderGroup = UIImage(named: "folder_group")!.image(color: brandElement, size: folderWidth)
-        cacheImages.folderExternal = UIImage(named: "folder_external")!.image(color: brandElement, size: folderWidth)
-        cacheImages.folderAutomaticUpload = UIImage(named: "folderAutomaticUpload")!.image(color: brandElement, size: folderWidth)
-        cacheImages.folder = UIImage(named: "folder")!.image(color: brandElement, size: folderWidth)
-
-        cacheImages.checkedYes = utility.loadImage(named: "checkmark.circle.fill", color: .systemBlue)
-        cacheImages.checkedNo = utility.loadImage(named: "circle", color: .systemGray)
-
-        cacheImages.buttonMore = UIImage(named: "more")!.image(color: .systemGray, size: 50)
-        cacheImages.buttonStop = UIImage(named: "stop")!.image(color: .systemGray, size: 50)
-        cacheImages.buttonMoreLock = UIImage(named: "moreLock")!.image(color: .systemGray, size: 50)
-        cacheImages.buttonRestore = UIImage(named: "restore")!.image(color: .systemGray, size: 50)
-        cacheImages.buttonTrash = UIImage(named: "trash")!.image(color: .systemGray, size: 50)
-
-        cacheImages.iconContacts = UIImage(named: "icon-contacts")!.image(color: brandElement, size: folderWidth)
-        cacheImages.iconTalk = UIImage(named: "icon-talk")!.image(color: brandElement, size: folderWidth)
-        cacheImages.iconCalendar = UIImage(named: "icon-calendar")!.image(color: brandElement, size: folderWidth)
-        cacheImages.iconDeck = UIImage(named: "icon-deck")!.image(color: brandElement, size: folderWidth)
-        cacheImages.iconMail = UIImage(named: "icon-mail")!.image(color: brandElement, size: folderWidth)
-        cacheImages.iconConfirm = UIImage(named: "icon-confirm")!.image(color: brandElement, size: folderWidth)
-        cacheImages.iconPages = UIImage(named: "icon-pages")!.image(color: brandElement, size: folderWidth)
+        images.folderEncrypted = UIImage(named: "folderEncrypted")!.image(color: brandElement, size: folderWidth)
+        images.folderSharedWithMe = UIImage(named: "folder_shared_with_me")!.image(color: brandElement, size: folderWidth)
+        images.folderPublic = UIImage(named: "folder_public")!.image(color: brandElement, size: folderWidth)
+        images.folderGroup = UIImage(named: "folder_group")!.image(color: brandElement, size: folderWidth)
+        images.folderExternal = UIImage(named: "folder_external")!.image(color: brandElement, size: folderWidth)
+        images.folderAutomaticUpload = UIImage(named: "folderAutomaticUpload")!.image(color: brandElement, size: folderWidth)
+        images.folder = UIImage(named: "folder")!.image(color: brandElement, size: folderWidth)
+
+        images.checkedYes = utility.loadImage(named: "checkmark.circle.fill", color: .systemBlue)
+        images.checkedNo = utility.loadImage(named: "circle", color: .systemGray)
+
+        images.buttonMore = UIImage(named: "more")!.image(color: .systemGray, size: 50)
+        images.buttonStop = UIImage(named: "stop")!.image(color: .systemGray, size: 50)
+        images.buttonMoreLock = UIImage(named: "moreLock")!.image(color: .systemGray, size: 50)
+        images.buttonRestore = UIImage(named: "restore")!.image(color: .systemGray, size: 50)
+        images.buttonTrash = UIImage(named: "trash")!.image(color: .systemGray, size: 50)
+
+        images.iconContacts = UIImage(named: "icon-contacts")!.image(color: brandElement, size: folderWidth)
+        images.iconTalk = UIImage(named: "icon-talk")!.image(color: brandElement, size: folderWidth)
+        images.iconCalendar = UIImage(named: "icon-calendar")!.image(color: brandElement, size: folderWidth)
+        images.iconDeck = UIImage(named: "icon-deck")!.image(color: brandElement, size: folderWidth)
+        images.iconMail = UIImage(named: "icon-mail")!.image(color: brandElement, size: folderWidth)
+        images.iconConfirm = UIImage(named: "icon-confirm")!.image(color: brandElement, size: folderWidth)
+        images.iconPages = UIImage(named: "icon-pages")!.image(color: brandElement, size: folderWidth)
 
         NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeTheming)
     }

iOSClient/Networking/NCService.swift

@@ -175,7 +175,7 @@ class NCService: NSObject {
         NextcloudKit.shared.getCapabilities(options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, data, error in
             guard error == .success, let data = data else {
                 NCBrandColor.shared.settingThemingColor(account: account)
-                NCCache.shared.createImagesCache()
+                NCImageCache.shared.createImagesCache()
                 return
             }
 
@@ -192,7 +192,7 @@ class NCService: NSObject {
             // Theming
             if NCGlobal.shared.capabilityThemingColor != NCBrandColor.shared.themingColor || NCGlobal.shared.capabilityThemingColorElement != NCBrandColor.shared.themingColorElement || NCGlobal.shared.capabilityThemingColorText != NCBrandColor.shared.themingColorText {
                 NCBrandColor.shared.settingThemingColor(account: account)
-                NCCache.shared.createImagesCache()
+                NCImageCache.shared.createImagesCache()
             }
 
             // Sharing & Comments

iOSClient/Rename file/NCRenameFile.swift

@@ -85,7 +85,7 @@ class NCRenameFile: UIViewController, UITextFieldDelegate {
             if metadata.directory {
 
                 if imagePreview == nil {
-                    previewFile.image = NCCache.cacheImages.folder
+                    previewFile.image = NCImageCache.images.folder
                 }
 
                 ext.isHidden = true
@@ -95,7 +95,7 @@ class NCRenameFile: UIViewController, UITextFieldDelegate {
             } else {
 
                 if imagePreview == nil {
-                    previewFile.image = NCCache.cacheImages.file
+                    previewFile.image = NCImageCache.images.file
                 }
 
                 fileNameNoExtensionTrailingContraint.constant = 90
@@ -114,7 +114,7 @@ class NCRenameFile: UIViewController, UITextFieldDelegate {
             ext.delegate = self
 
             if imagePreview == nil {
-                previewFile.image = NCCache.cacheImages.file
+                previewFile.image = NCImageCache.images.file
             } else {
                 previewFile.image = imagePreview
             }

iOSClient/Select/NCSelect.swift

@@ -303,7 +303,7 @@ extension NCSelect: UICollectionViewDataSource {
                 (cell as? NCCellProtocol)?.filePreviewImageView?.image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
             } else {
                 if metadata.iconName.isEmpty {
-                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCCache.cacheImages.file
+                    (cell as? NCCellProtocol)?.filePreviewImageView?.image = NCImageCache.images.file
                 } else {
                     (cell as? NCCellProtocol)?.filePreviewImageView?.image = UIImage(named: metadata.iconName)
                 }
@@ -370,21 +370,21 @@ extension NCSelect: UICollectionViewDataSource {
         if metadata.directory {
 
             if metadata.e2eEncrypted {
-                cell.imageItem.image = NCCache.cacheImages.folderEncrypted
+                cell.imageItem.image = NCImageCache.images.folderEncrypted
             } else if isShare {
-                cell.imageItem.image = NCCache.cacheImages.folderSharedWithMe
+                cell.imageItem.image = NCImageCache.images.folderSharedWithMe
             } else if !metadata.shareType.isEmpty {
                 metadata.shareType.contains(3) ?
-                (cell.imageItem.image = NCCache.cacheImages.folderPublic) :
-                (cell.imageItem.image = NCCache.cacheImages.folderSharedWithMe)
+                (cell.imageItem.image = NCImageCache.images.folderPublic) :
+                (cell.imageItem.image = NCImageCache.images.folderSharedWithMe)
             } else if metadata.mountType == "group" {
-                cell.imageItem.image = NCCache.cacheImages.folderGroup
+                cell.imageItem.image = NCImageCache.images.folderGroup
             } else if isMounted {
-                cell.imageItem.image = NCCache.cacheImages.folderExternal
+                cell.imageItem.image = NCImageCache.images.folderExternal
             } else if metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory {
-                cell.imageItem.image = NCCache.cacheImages.folderAutomaticUpload
+                cell.imageItem.image = NCImageCache.images.folderAutomaticUpload
             } else {
-                cell.imageItem.image = NCCache.cacheImages.folder
+                cell.imageItem.image = NCImageCache.images.folder
             }
             cell.imageItem.image = cell.imageItem.image?.colorizeFolder(metadata: metadata)
 
@@ -396,15 +396,15 @@ extension NCSelect: UICollectionViewDataSource {
 
             // image local
             if NCManageDatabase.shared.getTableLocalFile(ocId: metadata.ocId) != nil {
-                cell.imageLocal.image = NCCache.cacheImages.offlineFlag
+                cell.imageLocal.image = NCImageCache.images.offlineFlag
             } else if utilityFileSystem.fileProviderStorageExists(metadata) {
-                cell.imageLocal.image = NCCache.cacheImages.local
+                cell.imageLocal.image = NCImageCache.images.local
             }
         }
 
         // image Favorite
         if metadata.favorite {
-            cell.imageFavorite.image = NCCache.cacheImages.favorite
+            cell.imageFavorite.image = NCImageCache.images.favorite
         }
 
         cell.imageSelect.isHidden = true
@@ -415,7 +415,7 @@ extension NCSelect: UICollectionViewDataSource {
 
         // Live Photo
         if metadata.livePhoto {
-            cell.imageStatus.image = NCCache.cacheImages.livePhoto
+            cell.imageStatus.image = NCImageCache.images.livePhoto
         }
 
         // Remove last separator

iOSClient/Settings/CCAdvanced.m

@@ -388,7 +388,7 @@
 
         [[NCAutoUpload shared] alignPhotoLibraryWithViewController:self];
 
-        [[NCCache shared] clearMediaCache];
+        [[NCImageCache shared] clearMediaCache];
 
         [[NCActivityIndicator shared] stop];
         [self calculateSize];

iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift

@@ -41,7 +41,7 @@ class NCShareAdvancePermissionHeader: UIView {
             } else if !metadata.iconName.isEmpty {
                 imageView.image = UIImage(named: metadata.iconName)
             } else {
-                imageView.image = NCCache.cacheImages.file
+                imageView.image = NCImageCache.images.file
             }
         }
         fileName.text = metadata.fileNameView

iOSClient/Transfers/NCTransfers.swift

@@ -179,7 +179,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         cell.indexPath = indexPath
         cell.fileUser = metadata.ownerId
         cell.indexPath = indexPath
-        cell.imageItem.image = NCCache.cacheImages.file
+        cell.imageItem.image = NCImageCache.images.file
         cell.imageItem.backgroundColor = nil
         cell.labelTitle.text = metadata.fileNameView
         cell.labelTitle.textColor = .label
@@ -187,7 +187,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         var pathText = metadata.serverUrl.replacingOccurrences(of: serverUrlHome, with: "")
         if pathText.isEmpty { pathText = "/" }
         cell.labelPath.text = pathText
-        cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCCache.cacheImages.buttonStop)
+        cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCImageCache.images.buttonStop)
         cell.progressView.progress = 0.0
         if let image = utility.createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: true) {
             cell.imageItem.image = image

iOSClient/Trash/Cell/NCTrashListCell+NCTrashCellProtocol.swift

@@ -65,8 +65,8 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
 
         ]
 
-        imageRestore.image = NCCache.cacheImages.buttonRestore
-        imageMore.image = NCCache.cacheImages.buttonTrash
+        imageRestore.image = NCImageCache.images.buttonRestore
+        imageMore.image = NCImageCache.images.buttonTrash
 
         imageItem.layer.cornerRadius = 6
         imageItem.layer.masksToBounds = true
@@ -106,7 +106,7 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
         if status {
             var blurEffect: UIVisualEffect?
             var blurEffectView: UIView?
-            imageSelect.image = NCCache.cacheImages.checkedYes
+            imageSelect.image = NCImageCache.images.checkedYes
             if traitCollection.userInterfaceStyle == .dark {
                 blurEffect = UIBlurEffect(style: .dark)
                 blurEffectView = UIVisualEffectView(effect: blurEffect)
@@ -121,7 +121,7 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
             backgroundView = blurEffectView
             separator.isHidden = true
         } else {
-            imageSelect.image = NCCache.cacheImages.checkedNo
+            imageSelect.image = NCImageCache.images.checkedNo
             backgroundView = nil
             separator.isHidden = false
         }
@@ -159,7 +159,7 @@ extension NCTrashCellProtocol where Self: UICollectionViewCell {
             self.labelInfo?.text = dateFormatter.string(from: tableTrash.date as Date)
         }
         if tableTrash.directory {
-            self.imageItem.image = NCCache.cacheImages.folder
+            self.imageItem.image = NCImageCache.images.folder
         } else {
             self.imageItem.image = image
             self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)

iOSClient/Trash/NCTrash+CollectionView.swift

@@ -85,7 +85,7 @@ extension NCTrash: UICollectionViewDataSource {
         } else {
             // GRID
             guard let gridCell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridCell else { return UICollectionViewCell() }
-            gridCell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCCache.cacheImages.buttonMore)
+            gridCell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCImageCache.images.buttonMore)
             gridCell.delegate = self
             cell = gridCell
         }