mediaSortDate

iOSClient/Media/NCMediaCache.swift

@@ -139,7 +139,7 @@ import NextcloudKit
         livePhoto = NCKeychain().livePhoto
         metadatas = NCManageDatabase.shared.getMetadatasMedia(predicate: predicate, livePhoto: livePhoto)
 
-        switch CCUtility.getMediaSortDate() {
+        switch NCKeychain().mediaSortDate {
         case "date":
             metadatas = self.metadatas.sorted(by: {($0.date as Date) > ($1.date as Date)})
         case "creationDate":

iOSClient/Menu/NCMedia+Menu.swift

@@ -146,10 +146,10 @@ extension NCMedia {
                 NCMenuAction(
                     title: NSLocalizedString("_media_by_modified_date_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "circle.grid.cross.up.fill"),
-                    selected: CCUtility.getMediaSortDate() == "date",
+                    selected: NCKeychain().mediaSortDate == "date",
                     on: true,
                     action: { _ in
-                        CCUtility.setMediaSortDate("date")
+                        NCKeychain().mediaSortDate = "date"
                         self.reloadDataSourceWithCompletion { _ in }
                     }
                 )
@@ -159,10 +159,10 @@ extension NCMedia {
                 NCMenuAction(
                     title: NSLocalizedString("_media_by_created_date_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "circle.grid.cross.down.fill"),
-                    selected: CCUtility.getMediaSortDate() == "creationDate",
+                    selected:NCKeychain().mediaSortDate == "creationDate",
                     on: true,
                     action: { _ in
-                        CCUtility.setMediaSortDate("creationDate")
+                        NCKeychain().mediaSortDate = "creationDate"
                         self.reloadDataSourceWithCompletion { _ in }
                     }
                 )
@@ -172,10 +172,10 @@ extension NCMedia {
                 NCMenuAction(
                     title: NSLocalizedString("_media_by_upload_date_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "circle.grid.cross.right.fill"),
-                    selected: CCUtility.getMediaSortDate() == "uploadDate",
+                    selected: NCKeychain().mediaSortDate == "uploadDate",
                     on: true,
                     action: { _ in
-                        CCUtility.setMediaSortDate("uploadDate")
+                        NCKeychain().mediaSortDate = "uploadDate"
                         self.reloadDataSourceWithCompletion { _ in }
                     }
                 )

iOSClient/Utility/CCUtility.h

@@ -55,9 +55,6 @@
 + (NSString *)getPushNotificationDeviceIdentifierSignature:(NSString *)account;
 + (void)clearAllKeysPushNotification:(NSString *)account;
 
-+ (NSString *)getMediaSortDate;
-+ (void)setMediaSortDate:(NSString *)value;
-
 + (BOOL)getTextRecognitionStatus;
 + (void)setTextRecognitionStatus:(BOOL)value;
 + (BOOL)getDeleteAllScanImages;

iOSClient/Utility/CCUtility.m

@@ -132,24 +132,6 @@
     [self setPushNotificationDeviceIdentifierSignature:account deviceIdentifierSignature:nil];
 }
 
-+ (NSString *)getMediaSortDate
-{
-    NSString *valueString = [UICKeyChainStore stringForKey:@"mediaSortDate" service:NCGlobal.shared.serviceShareKeyChain];
-
-    // Default TRUE
-    if (valueString == nil) {
-        [self setMediaSortDate:@"date"];
-        return @"date";
-    }
-
-    return valueString;
-}
-
-+ (void)setMediaSortDate:(NSString *)value
-{
-    [UICKeyChainStore setString:value forKey:@"mediaSortDate" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (BOOL)getTextRecognitionStatus
 {
     return [[UICKeyChainStore stringForKey:@"textRecognitionStatus" service:NCGlobal.shared.serviceShareKeyChain] boolValue];

iOSClient/Utility/NCKeychain.swift

@@ -266,6 +266,19 @@ import KeychainAccess
         }
     }
 
+    var mediaSortDate: String {
+        get {
+            migrate(key: "mediaSortDate")
+            if let value = try? keychain.get("mediaSortDate") {
+                return value
+            }
+            return "date"
+        }
+        set {
+            keychain["mediaSortDate"] = newValue
+        }
+    }
+
     // MARK: -
 
     private func migrate(key: String) {