FileNameType

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -149,7 +149,7 @@ struct UploadAssetsView: View {
 
     @State private var fileName: String = NCKeychain().getFileNameMask(key: NCGlobal.shared.keyFileNameMask)
     @State private var isMaintainOriginalFilename: Bool = NCKeychain().getOriginalFileName(key: NCGlobal.shared.keyFileNameOriginal)
-    @State private var isAddFilenametype: Bool = CCUtility.getFileNameType(NCGlobal.shared.keyFileNameType)
+    @State private var isAddFilenametype: Bool = NCKeychain().getFileNameType(key: NCGlobal.shared.keyFileNameType)
     @State private var isPresentedSelect = false
     @State private var isPresentedUploadConflict = false
     @State private var isPresentedQuickLook = false
@@ -186,7 +186,7 @@ struct UploadAssetsView: View {
         let creationDate = asset.creationDate ?? Date()
 
         NCKeychain().setOriginalFileName(key: NCGlobal.shared.keyFileNameOriginal, value: isMaintainOriginalFilename)
-        CCUtility.setFileNameType(isAddFilenametype, key: NCGlobal.shared.keyFileNameType)
+        NCKeychain().setFileNameType(key: NCGlobal.shared.keyFileNameType, prefix: isAddFilenametype)
         NCKeychain().setFileNameMask(key: NCGlobal.shared.keyFileNameMask, mask: fileName)
 
         preview = CCUtility.createFileName(

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -60,7 +60,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
         // Add File Name Type
 
         row = XLFormRowDescriptor(tag: "addFileNameType", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_add_filenametype_", comment: ""))
-        row.value = CCUtility.getFileNameType(NCGlobal.shared.keyFileNameAutoUploadType)
+        row.value = NCKeychain().getFileNameType(key: NCGlobal.shared.keyFileNameAutoUploadType)
         row.hidden = "$\("maintainOriginalFileName") == 1"
         row.cellConfig["backgroundColor"] = UIColor.secondarySystemGroupedBackground
 
@@ -147,7 +147,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
         super.formRowDescriptorValueHasChanged(formRow, oldValue: oldValue, newValue: newValue)
 
         if formRow.tag == "addFileNameType" {
-            CCUtility.setFileNameType((formRow.value! as AnyObject).boolValue, key: NCGlobal.shared.keyFileNameAutoUploadType)
+            NCKeychain().setFileNameType(key: NCGlobal.shared.keyFileNameAutoUploadType, prefix: (formRow.value! as AnyObject).boolValue) 
             self.reloadForm()
         } else if formRow.tag == "maintainOriginalFileName" {
             NCKeychain().setOriginalFileName(key: NCGlobal.shared.keyFileNameOriginalAutoUpload, value: (formRow.value! as AnyObject).boolValue)

iOSClient/Utility/CCUtility.h

@@ -41,8 +41,6 @@
 
 + (void)deleteAllChainStore;
 
-+ (BOOL)getFileNameType:(NSString *)key;
-+ (void)setFileNameType:(BOOL)prefix key:(NSString *)key;
 
 + (BOOL)getActivityVerboseHigh;
 + (void)setActivityVerboseHigh:(BOOL)debug;

iOSClient/Utility/CCUtility.m

@@ -50,17 +50,6 @@
 
 #pragma ------------------------------ GET/SET
 
-+ (BOOL)getFileNameType:(NSString *)key
-{
-    return [[UICKeyChainStore stringForKey:key service:NCGlobal.shared.serviceShareKeyChain] boolValue];
-}
-
-+ (void)setFileNameType:(BOOL)prefix key:(NSString *)key
-{
-    NSString *sPrefix = (prefix) ? @"true" : @"false";
-    [UICKeyChainStore setString:sPrefix forKey:key service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (BOOL)getActivityVerboseHigh
 {
     return [[UICKeyChainStore stringForKey:@"activityVerboseHigh" service:NCGlobal.shared.serviceShareKeyChain] boolValue];
@@ -657,7 +646,7 @@
 
     // Use File Name Type
     if (keyFileNameType)
-        addFileNameType = [CCUtility getFileNameType:keyFileNameType];
+        addFileNameType = [[NCKeychain init] getFileNameTypeWithKey:keyFileNameType];
 
     NSString *fileNameExt = [[fileName pathExtension] lowercaseString];
 

iOSClient/Utility/NCKeychain.swift

@@ -138,15 +138,29 @@ import KeychainAccess
         keychain[key] = String(value)
     }
 
-    @objc func setFileNameMask(key: String, mask: String) {
-        keychain[key] = mask
-    }
-
     @objc func getFileNameMask(key: String) -> String {
+        migrate(key: key)
         if let value = try? keychain.get(key) {
             return value
         } else {
             return ""
         }
     }
+
+    @objc func setFileNameMask(key: String, mask: String?) {
+        keychain[key] = mask
+    }
+
+    @objc func getFileNameType(key: String) -> Bool {
+        migrate(key: key)
+        if let value = try? keychain.get(key), let result = Bool(value) {
+            return result
+        } else {
+            return false
+        }
+    }
+
+    @objc func setFileNameType(key: String, prefix: Bool) {
+        keychain[key] = String(prefix)
+    }
 }