dev

iOSClient/Database/NCManageDatabase.swift

@@ -797,7 +797,7 @@ class NCManageDatabase: NSObject {
         let addObject = tableDirectory()
         
         addObject.account = account
-        addObject.directoryID = CCUtility.createIDfromAccount(account, serverUrl: serverUrl)
+        addObject.directoryID = CCUtility.createDirectoyID(fromAccount: account, serverUrl: serverUrl)
         addObject.e2eEncrypted = encrypted
         addObject.favorite = favorite
         if let fileID = fileID {

iOSClient/Utility/CCUtility.h

@@ -207,7 +207,8 @@
 
 + (void)writeData:(NSData *)data fileNamePath:(NSString *)fileNamePath;
 
-+ (NSString *)createIDfromAccount:(NSString *)account serverUrl:(NSString *)serverUrl;
++ (NSString *)createDirectoyIDFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl;
++ (NSString *)createFileIDUploadFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl fileName:(NSString *)fileName;
 
 // ===== E2E Encrypted =====
 

iOSClient/Utility/CCUtility.m

@@ -1103,9 +1103,9 @@
     [data writeToFile:fileNamePath atomically:YES];
 }
 
-+ (NSString *)createIDfromAccount:(NSString *)account serverUrl:(NSString *)serverUrl
++ (NSString *)createDirectoyIDFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl
 {
-    NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/",@" ", @".", @"-", @"@", nil];
+    NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/",@" ", @".", @"-", @"@", @"_", nil];
     
     for (NSString *currentCharacter in arrayForbiddenCharacters) {
         account = [account stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
@@ -1118,6 +1118,13 @@
     return [[account stringByAppendingString:serverUrl] lowercaseString];
 }
 
++ (NSString *)createFileIDUploadFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl fileName:(NSString *)fileName
+{
+    NSString *directoryID = [self createDirectoyIDFromAccount:account serverUrl:serverUrl];
+    
+    return [[directoryID stringByAppendingString:fileName] lowercaseString];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== E2E Encrypted =====
 #pragma --------------------------------------------------------------------------------------------