Marino Faggiana 8 years ago
parent
commit
9973ef0b90

+ 2 - 1
iOSClient/Networking/OCNetworking.m

@@ -357,7 +357,7 @@
             for (NSUInteger i=1; i < [itemsSortedArray count]; i++) {
                 
                 OCFileDto *itemDto = [itemsSortedArray objectAtIndex:i];
-                itemDto.fileName = [CCUtility clearFile:itemDto.fileName];
+                itemDto.fileName = [itemDto.fileName stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
                 
                 // ----- BUG #942 ---------
                 if ([itemDto.etag length] == 0) {
@@ -624,6 +624,7 @@
             
             OCFileDto *itemDto = [items objectAtIndex:0];
             itemDto.fileName = _metadataNet.fileName;
+            
             NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:_metadataNet.serverUrl activeAccount:_metadataNet.account];
             NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
             NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl typeCloud:_typeCloud];

+ 1 - 1
iOSClient/Utility/CCUtility.h

@@ -127,7 +127,7 @@
 + (NSString *)transformedSize:(double)value;
 
 + (NSString *)clearFile:(NSString *)nomeFile;
-+ (NSString*)stringAppendServerUrl:(NSString *)serverUrl addServerUrl:(NSString *)addServerUrl;
++ (NSString *)stringAppendServerUrl:(NSString *)serverUrl addServerUrl:(NSString *)addServerUrl;
 
 + (NSString *)createID;
 + (NSString *)createFileNameFromAsset:(PHAsset *)asset;

+ 1 - 3
iOSClient/Utility/CCUtility.m

@@ -415,13 +415,11 @@
     return [NSString stringWithFormat:@"%4.2f %@",value, [tokens objectAtIndex:multiplyFactor]];
 }
 
-// Replace NSUTF8StringEncoding and remove do not forbidden characters
+// Remove do not forbidden characters
 + (NSString *)clearFile:(NSString *)nomeFile
 {
     NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/", nil];
     
-    nomeFile = [nomeFile stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    
     for (NSString *currentCharacter in arrayForbiddenCharacters) {
         nomeFile = [nomeFile stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
     }