coding

iOSClient/AppDelegate.swift

@@ -893,7 +893,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
                     NCAskAuthorization.shared.askAuthorizationAudioRecord(viewController: rootViewController) { hasPermission in
                         if hasPermission {
-                            let fileName = CCUtility.createFileNameDate(NSLocalizedString("_voice_memo_filename_", comment: ""), extension: "m4a")!
+                            let fileName = NCUtilityFileSystem.shared.createFileNameDate(NSLocalizedString("_voice_memo_filename_", comment: ""), ext: "m4a")
                             if let viewController = UIStoryboard(name: "NCAudioRecorderViewController", bundle: nil).instantiateInitialViewController() as? NCAudioRecorderViewController {
 
                                 viewController.delegate = self

iOSClient/Menu/AppDelegate+Menu.swift

@@ -95,7 +95,7 @@ extension AppDelegate {
                 title: NSLocalizedString("_create_voice_memo_", comment: ""), icon: UIImage(named: "microphone")!.image(color: UIColor.systemGray, size: 50), action: { _ in
                     NCAskAuthorization.shared.askAuthorizationAudioRecord(viewController: viewController) { hasPermission in
                         if hasPermission {
-                            let fileName = CCUtility.createFileNameDate(NSLocalizedString("_voice_memo_filename_", comment: ""), extension: "m4a")!
+                            let fileName = NCUtilityFileSystem.shared.createFileNameDate(NSLocalizedString("_voice_memo_filename_", comment: ""), ext: "m4a")
                             if let viewController = UIStoryboard(name: "NCAudioRecorderViewController", bundle: nil).instantiateInitialViewController() as? NCAudioRecorderViewController {
 
                                 viewController.delegate = self

iOSClient/Scan document/NCUploadScanDocument.swift

@@ -344,7 +344,7 @@ extension NCUploadScanDocument: NCCreateFormUploadConflictDelegate {
 
 struct UploadScanDocumentView: View {
 
-    @State var fileName = CCUtility.createFileNameDate("scan", extension: "") ?? "scan"
+    @State var fileName = NCUtilityFileSystem.shared.createFileNameDate("scan", ext: "")
     @State var password: String = ""
     @State var isSecuredPassword: Bool = true
     @State var isTextRecognition: Bool = NCKeychain().textRecognitionStatus

iOSClient/Utility/CCUtility.h

@@ -35,7 +35,6 @@
 @interface CCUtility : NSObject
 
 + (NSString *)dateDiff:(NSDate *)convertedDate;
-+ (NSString *)createFileNameDate:(NSString *)fileName extension:(NSString *)extension;
 + (NSString *)createFileName:(NSString *)fileName fileDate:(NSDate *)fileDate fileType:(PHAssetMediaType)fileType keyFileName:(NSString *)keyFileName keyFileNameType:(NSString *)keyFileNameType keyFileNameOriginal:(NSString *)keyFileNameOriginal forcedNewFileName:(BOOL)forcedNewFileName;
 + (NSString *)getTitleSectionDate:(NSDate *)date;
 + (NSString *)returnPathfromServerUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase userId:(NSString *)userId account:(NSString *)account;

iOSClient/Utility/CCUtility.m

@@ -71,32 +71,6 @@
     }
 }
 
-+ (NSString *)createFileNameDate:(NSString *)fileName extension:(NSString *)extension
-{
-    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-    [formatter setDateFormat:@"yy-MM-dd HH-mm-ss"];
-    NSString *fileNameDate = [formatter stringFromDate:[NSDate date]];
-    NSString *returnFileName;
-
-    if ([fileName isEqualToString:@""] && ![extension isEqualToString:@""]) {
-        returnFileName = [NSString stringWithFormat:@"%@.%@", fileNameDate, extension];
-    }
-
-    if (![fileName isEqualToString:@""] && [extension isEqualToString:@""]) {
-        returnFileName = [NSString stringWithFormat:@"%@ %@", fileName, fileNameDate];
-    }
-
-    if ([fileName isEqualToString:@""] && [extension isEqualToString:@""]) {
-        returnFileName = fileNameDate;
-    }
-
-    if (![fileName isEqualToString:@""] && ![extension isEqualToString:@""]) {
-        returnFileName = [NSString stringWithFormat:@"%@ %@.%@", fileName, fileNameDate, extension];
-    }
-
-    return returnFileName;
-}
-
 + (NSString *)createFileName:(NSString *)fileName fileDate:(NSDate *)fileDate fileType:(PHAssetMediaType)fileType keyFileName:(NSString *)keyFileName keyFileNameType:(NSString *)keyFileNameType keyFileNameOriginal:(NSString *)keyFileNameOriginal forcedNewFileName:(BOOL)forcedNewFileName
 {
     BOOL addFileNameType = NO;

iOSClient/Utility/NCUtilityFileSystem.swift

@@ -426,6 +426,23 @@ class NCUtilityFileSystem: NSObject {
         return resultFileName
     }
 
+    func createFileNameDate(_ fileName: String, ext: String) -> String {
+
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yy-MM-dd HH-mm-ss"
+        let fileNameDate = formatter.string(from: Date())
+
+        if fileName.isEmpty, !ext.isEmpty {
+            return fileNameDate + "." + ext
+        } else if !fileName.isEmpty, ext.isEmpty {
+            return fileName + " " + fileNameDate
+        } else if fileName.isEmpty, ext.isEmpty {
+            return fileNameDate
+        } else {
+            return fileName + " " + fileNameDate + "." + ext
+        }
+    }
+
     @objc func getDirectorySize(directory: String) -> Int64 {
 
         let url = URL(fileURLWithPath: directory)