FileNameMask

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -147,7 +147,7 @@ class NCUploadAssets: NSObject, ObservableObject, NCCreateFormUploadConflictDele
 
 struct UploadAssetsView: View {
 
-    @State private var fileName: String = CCUtility.getFileNameMask(NCGlobal.shared.keyFileNameMask)
+    @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 isPresentedSelect = false
@@ -187,7 +187,7 @@ struct UploadAssetsView: View {
 
         NCKeychain().setOriginalFileName(key: NCGlobal.shared.keyFileNameOriginal, value: isMaintainOriginalFilename)
         CCUtility.setFileNameType(isAddFilenametype, key: NCGlobal.shared.keyFileNameType)
-        CCUtility.setFileNameMask(fileName, key: NCGlobal.shared.keyFileNameMask)
+        NCKeychain().setFileNameMask(key: NCGlobal.shared.keyFileNameMask, mask: fileName)
 
         preview = CCUtility.createFileName(
             getOriginalFilenameForPreview() as String,

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -75,7 +75,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
         form.addFormSection(section)
 
         row = XLFormRowDescriptor(tag: "maskFileName", rowType: XLFormRowDescriptorTypeText, title: (NSLocalizedString("_filename_", comment: "")))
-        let fileNameMask: String = CCUtility.getFileNameMask(NCGlobal.shared.keyFileNameAutoUploadMask)
+        let fileNameMask: String = NCKeychain().getFileNameMask(key: NCGlobal.shared.keyFileNameAutoUploadMask)
         if !fileNameMask.isEmpty {
             row.value = fileNameMask
         }
@@ -199,13 +199,13 @@ class NCManageAutoUploadFileName: XLFormViewController {
 
             if valueRenameTrimming.isEmpty {
 
-                CCUtility.setFileNameMask("", key: NCGlobal.shared.keyFileNameAutoUploadMask)
+                NCKeychain().setFileNameMask(key: NCGlobal.shared.keyFileNameAutoUploadMask, mask: "")
                 returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: nil, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)
 
             } else {
 
                 self.form.delegate = nil
-                CCUtility.setFileNameMask(valueRename, key: NCGlobal.shared.keyFileNameAutoUploadMask)
+                NCKeychain().setFileNameMask(key: NCGlobal.shared.keyFileNameAutoUploadMask, mask: valueRename)
                 self.form.delegate = self
 
                 returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)
@@ -213,7 +213,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
 
         } else {
 
-            CCUtility.setFileNameMask("", key: NCGlobal.shared.keyFileNameAutoUploadMask)
+            NCKeychain().setFileNameMask(key: NCGlobal.shared.keyFileNameAutoUploadMask, mask: "")
             returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: nil, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)
         }
 

iOSClient/Utility/CCUtility.h

@@ -41,9 +41,6 @@
 
 + (void)deleteAllChainStore;
 
-+ (NSString *)getFileNameMask:(NSString *)key;
-+ (void)setFileNameMask:(NSString *)mask key:(NSString *)key;
-
 + (BOOL)getFileNameType:(NSString *)key;
 + (void)setFileNameType:(BOOL)prefix key:(NSString *)key;
 

iOSClient/Utility/CCUtility.m

@@ -50,21 +50,6 @@
 
 #pragma ------------------------------ GET/SET
 
-+ (NSString *)getFileNameMask:(NSString *)key
-{
-    NSString *mask = [UICKeyChainStore stringForKey:key service:NCGlobal.shared.serviceShareKeyChain];
-
-    if (mask == nil)
-        mask = @"";
-
-    return mask;
-}
-
-+ (void)setFileNameMask:(NSString *)mask key:(NSString *)key
-{
-    [UICKeyChainStore setString:mask forKey:key service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (BOOL)getFileNameType:(NSString *)key
 {
     return [[UICKeyChainStore stringForKey:key service:NCGlobal.shared.serviceShareKeyChain] boolValue];
@@ -678,7 +663,7 @@
 
     if (keyFileName) {
 
-        fileName = [CCUtility getFileNameMask:keyFileName];
+        fileName = [[NCKeychain init] getFileNameMaskWithKey:keyFileName];
 
         if ([fileName length] > 0) {
 

iOSClient/Utility/NCKeychain.swift

@@ -137,4 +137,16 @@ import KeychainAccess
     @objc func setOriginalFileName(key: String, value: Bool) {
         keychain[key] = String(value)
     }
+
+    @objc func setFileNameMask(key: String, mask: String) {
+        keychain[key] = mask
+    }
+
+    @objc func getFileNameMask(key: String) -> String {
+        if let value = try? keychain.get(key) {
+            return value
+        } else {
+            return ""
+        }
+    }
 }