formatCompatibility

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1162,7 +1162,7 @@ extension NCManageDatabase {
         let fileNameNoExtension = (fileNameView as NSString).deletingPathExtension
         var fileNameConflict = fileNameView
 
-        if fileNameExtension == "heic" && CCUtility.getFormatCompatibility() {
+        if fileNameExtension == "heic", NCKeychain().formatCompatibility {
             fileNameConflict = fileNameNoExtension + ".jpg"
         }
         return getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView == %@", account, serverUrl, fileNameConflict))

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -245,7 +245,7 @@ class NCCreateFormUploadConflict: UIViewController {
                 var fileName = metadata.fileNameView
                 let fileNameExtension = (fileName as NSString).pathExtension.lowercased()
                 let fileNameNoExtension = (fileName as NSString).deletingPathExtension
-                if fileNameExtension == "heic" && CCUtility.getFormatCompatibility() {
+                if fileNameExtension == "heic" && NCKeychain().formatCompatibility {
                     fileName = fileNameNoExtension + ".jpg"
                 }
                 let oldPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)

iOSClient/Networking/NCAutoUpload.swift

@@ -151,7 +151,7 @@ class NCAutoUpload: NSObject {
                 var fileNameSearchMetadata = fileName
                 let ext = (fileNameSearchMetadata as NSString).pathExtension.uppercased()
 
-                if ext == "HEIC" && CCUtility.getFormatCompatibility() {
+                if ext == "HEIC", NCKeychain().formatCompatibility {
                     fileNameSearchMetadata = (fileNameSearchMetadata as NSString).deletingPathExtension + ".jpg"
                 }
 

iOSClient/Settings/CCAdvanced.m

@@ -62,7 +62,7 @@
 
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"formatCompatibility" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_format_compatibility_", nil)];
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    if ([CCUtility getFormatCompatibility]) row.value = @"1";
+    if ([[NCKeychain init] formatCompatibility]) row.value = @"1";
     else row.value = @"0";
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
@@ -318,7 +318,7 @@
     
     if ([rowDescriptor.tag isEqualToString:@"formatCompatibility"]) {
         
-        [CCUtility setFormatCompatibility:[[rowDescriptor.value valueData] boolValue]];
+        [[NCKeychain alloc] init].formatCompatibility = [[rowDescriptor.value valueData] boolValue];
     }
     
     if ([rowDescriptor.tag isEqualToString:@"livePhoto"]) {

iOSClient/Utility/CCUtility.h

@@ -41,10 +41,6 @@
 
 + (void)deleteAllChainStore;
 
-
-+ (BOOL)getFormatCompatibility;
-+ (void)setFormatCompatibility:(BOOL)set;
-
 // E2EE -------------------------------------------
 
 + (NSString *)getEndToEndCertificate:(NSString *)account;

iOSClient/Utility/CCUtility.m

@@ -50,25 +50,6 @@
 
 #pragma ------------------------------ GET/SET
 
-+ (BOOL)getFormatCompatibility
-{
-    NSString *valueString = [UICKeyChainStore stringForKey:@"formatCompatibility" service:NCGlobal.shared.serviceShareKeyChain];
-
-    // Default TRUE
-    if (valueString == nil) {
-        [self setFormatCompatibility:YES];
-        return true;
-    }
-
-    return [valueString boolValue];
-}
-
-+ (void)setFormatCompatibility:(BOOL)set
-{
-    NSString *sSet = (set) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSet forKey:@"formatCompatibility" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (NSString *)getEndToEndCertificate:(NSString *)account
 {
     NSString *key, *certificate;

iOSClient/Utility/NCCameraRoll.swift

@@ -139,7 +139,7 @@ class NCCameraRoll: NSObject {
         let creationDate = asset.creationDate ?? Date()
         let modificationDate = asset.modificationDate ?? Date()
 
-        if asset.mediaType == PHAssetMediaType.image && (extensionAsset == "HEIC" || extensionAsset == "DNG") && CCUtility.getFormatCompatibility() {
+        if asset.mediaType == PHAssetMediaType.image && (extensionAsset == "HEIC" || extensionAsset == "DNG") && NCKeychain().formatCompatibility {
             let fileName = (metadata.fileNameView as NSString).deletingPathExtension + ".jpg"
             metadata.contentType = "image/jpeg"
             fileNamePath = NSTemporaryDirectory() + fileName

iOSClient/Utility/NCKeychain.swift

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