webDav List with username with space #506

iOSClient/Library/OCCommunicationLib/OCWebDavClient/Parsers/OCXMLListParser.m

@@ -130,11 +130,8 @@
             [_xmlBucket setObject:lastBit forKey:@"href"];
             _currentFile.fileName = lastBit;
             
-            NSString *decodedFileName = [self decodeFromPercentEscapeString:self.currentFile.fileName];
-            NSString *decodedFilePath = [self decodeFromPercentEscapeString:self.currentFile.filePath];
-            
-            self.currentFile.fileName = [decodedFileName encodeString:NSUTF8StringEncoding];
-            self.currentFile.filePath = [decodedFilePath encodeString:NSUTF8StringEncoding];
+            self.currentFile.fileName = [self.currentFile.fileName stringByRemovingPercentEncoding];
+            self.currentFile.filePath = [self.currentFile.filePath stringByRemovingPercentEncoding];
         }
         
     } else if ([elementName isEqualToString:@"d:getlastmodified"]) {
@@ -210,14 +207,4 @@
     NSLog(@"Finish xml directory list parse");
 }
 
-// Decode a percent escape encoded string.
-- (NSString*) decodeFromPercentEscapeString:(NSString *) string {
-    return (__bridge_transfer NSString *) CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL,
-                                                                                         (__bridge CFStringRef) string,
-                                                                                         CFSTR(""),
-                                                                                         kCFStringEncodingUTF8);
-}
-
-
-
 @end

iOSClient/Library/OCCommunicationLib/OCWebDavClient/Parsers/OCXMLParser.m

@@ -169,11 +169,8 @@ NSString *OCCWebDAVURIKey           = @"uri";
             _currentFile.fileName = lastBit;
         }
             
-        NSString *decodedFileName = [self decodeFromPercentEscapeString:self.currentFile.fileName];
-        NSString *decodedFilePath = [self decodeFromPercentEscapeString:self.currentFile.filePath];
-            
-        self.currentFile.fileName = [decodedFileName encodeString:NSUTF8StringEncoding];
-        self.currentFile.filePath = [decodedFilePath encodeString:NSUTF8StringEncoding];
+        self.currentFile.fileName = [self.currentFile.fileName stringByRemovingPercentEncoding];
+        self.currentFile.filePath = [self.currentFile.filePath stringByRemovingPercentEncoding];
             
         isNotFirstFileOfList = YES;
 
@@ -253,14 +250,4 @@ NSString *OCCWebDAVURIKey           = @"uri";
     NSLog(@"Finish xml directory list parse");
 }
 
-// Decode a percent escape encoded string.
-- (NSString*) decodeFromPercentEscapeString:(NSString *) string {
-    return (__bridge_transfer NSString *) CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL,
-                                                                                         (__bridge CFStringRef) string,
-                                                                                         CFSTR(""),
-                                                                                         kCFStringEncodingUTF8);
-}
-
-
-
 @end

iOSClient/Networking/OCNetworking.m

@@ -289,7 +289,6 @@
                 
                 OCFileDto *itemDto = [itemsSortedArray objectAtIndex:i];
                 
-                itemDto.fileName = [itemDto.fileName stringByRemovingPercentEncoding];
                 NSString *fileName = [itemDto.fileName  stringByReplacingOccurrencesOfString:@"/" withString:@""];
                 
                 // Skip hidden files
@@ -394,7 +393,6 @@
             
                 NSString *serverUrl;
 
-                itemDto.fileName = [itemDto.fileName stringByRemovingPercentEncoding];
                 NSString *fileName = [itemDto.fileName  stringByReplacingOccurrencesOfString:@"/" withString:@""];
 
                 // Skip hidden files
@@ -432,7 +430,6 @@
                 /* ---- */
             
                 serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
-                serverUrl = [serverUrl stringByRemovingPercentEncoding];
 
                 NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:serverUrl fileID:itemDto.ocId permissions:itemDto.permissions encrypted:itemDto.isEncrypted];
                 BOOL isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
@@ -555,8 +552,6 @@
             
             NSString *serverUrl, *fileName;
             
-            itemDto.fileName = [itemDto.fileName stringByRemovingPercentEncoding];
-            itemDto.filePath = [itemDto.filePath stringByRemovingPercentEncoding];
             fileName = [itemDto.fileName  stringByReplacingOccurrencesOfString:@"/" withString:@""];
             
             // Skip hidden files
@@ -595,7 +590,6 @@
             /*      */
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
-            serverUrl = [serverUrl stringByRemovingPercentEncoding];
 
             NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:serverUrl fileID:itemDto.ocId permissions:itemDto.permissions encrypted:itemDto.isEncrypted];
             BOOL isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];