remove old API request info server

iOSClient/Actions/CCActions.swift

@@ -154,7 +154,7 @@ class CCActions: NSObject {
 
         let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         
-        let fileName = CCUtility.removeForbiddenCharacters(fileName, hasServerForbiddenCharactersSupport: appDelegate.hasServerForbiddenCharactersSupport)!
+        let fileName = CCUtility.removeForbiddenCharactersServer(fileName)!
         
         let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)!
         

iOSClient/AppDelegate.h

@@ -62,11 +62,7 @@
 @property double currentLatitude;
 @property double currentLongitude;
 
-// Nextcloud
-@property BOOL hasServerForbiddenCharactersSupport;
-@property BOOL hasServerShareSupport;
-@property BOOL hasServerShareeSupport;
-@property BOOL hasServerCapabilitiesSupport;
+// Notification
 @property (nonatomic, strong) NSMutableArray<OCCommunication *> *listOfNotifications;
 @property NSInteger serverVersion;
 

iOSClient/CCGlobal.h

@@ -203,7 +203,6 @@ extern NSString *const urlBaseUploadDB;
 #define actionDownloadThumbnail                         @"downloadThumbnail"
 #define actionGetActivityServer                         @"getActivityServer"
 #define actionGetCapabilities                           @"getCapabilitiesOfServer"
-#define actionGetFeaturesSuppServer                     @"getFeaturesSupportedByServer"
 #define actionGetUserAndGroup                           @"getUserAndGroup"
 #define actionGetUserProfile                            @"getUserProfile"
 #define actionGetNotificationServer                     @"getNotificationServer"

iOSClient/Create/CCCreateCloud.swift

@@ -339,7 +339,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             self.form.delegate = nil
             
             if fileName != nil {
-                formRow.value = CCUtility.removeForbiddenCharacters(fileName, hasServerForbiddenCharactersSupport: appDelegate.hasServerForbiddenCharactersSupport)
+                formRow.value = CCUtility.removeForbiddenCharactersServer(fileName)
             }
             
             self.form.delegate = self

iOSClient/Favorites/CCFavorites.m

@@ -410,7 +410,7 @@
     }
     
     // Share
-    if (_metadata.cryptated == NO && app.hasServerShareSupport) {
+    if (_metadata.cryptated == NO) {
         
         [actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil) image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:image_actionSheetShare] color:[NCBrandColor sharedInstance].brand] backgroundColor:[UIColor whiteColor] height: 50.0 type:AHKActionSheetButtonTypeDefault handler:^(AHKActionSheet *as) {
                 // close swipe

iOSClient/Main/CCMain.h

@@ -89,7 +89,6 @@
 - (void)reloadDatasource;
 - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 
-- (void)requestSharedByServer;
 - (void)requestServerInformation;
 
 - (void)openWindowShare:(CCMetadata *)metadata;

iOSClient/Main/CCMain.m

@@ -1181,9 +1181,15 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Request Server  ====
+#pragma mark ==== User Profile  ====
 #pragma --------------------------------------------------------------------------------------------
 
+- (void)getUserProfileFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
+{
+    if (errorCode == 401)
+        [self changePasswordAccount];
+}
+
 - (void)getUserProfileSuccess:(CCMetadataNet *)metadataNet userProfile:(OCUserProfile *)userProfile
 {
     [CCCoreData setUserProfileActiveAccount:metadataNet.account userProfile:userProfile];
@@ -1199,6 +1205,16 @@
     });
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ==== Capabilities  ====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)getCapabilitiesOfServerFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
+{
+    if (errorCode == 401)
+        [self changePasswordAccount];
+}
+
 - (void)getCapabilitiesOfServerSuccess:(OCCapabilities *)capabilities
 {
     // Update capabilities db
@@ -1256,22 +1272,10 @@
     app.serverVersion = capabilities.versionMajor;
 }
 
-- (void)getFeaturesSupportedByServerSuccess:(BOOL)hasCapabilitiesSupport hasForbiddenCharactersSupport:(BOOL)hasForbiddenCharactersSupport hasShareSupport:(BOOL)hasShareSupport hasShareeSupport:(BOOL)hasShareeSupport
-{
-    app.hasServerCapabilitiesSupport = hasCapabilitiesSupport;
-    app.hasServerForbiddenCharactersSupport = hasForbiddenCharactersSupport;
-    app.hasServerShareSupport = hasShareSupport;
-    app.hasServerShareeSupport = hasShareeSupport;
-    
-    if (hasShareSupport || hasShareeSupport)
-        [self requestSharedByServer];
-}
-
-- (void)getInfoServerFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    if (errorCode == 401)
-        [self changePasswordAccount];
-}
+#pragma mark -
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ==== Request Server Information  ====
+#pragma --------------------------------------------------------------------------------------------
 
 - (void)requestServerInformation
 {
@@ -1283,15 +1287,12 @@
    
     [app.sharesID removeAllObjects];
     
-    app.hasServerForbiddenCharactersSupport = YES;
-    app.hasServerShareSupport = YES;
-    
-    metadataNet.action = actionGetFeaturesSuppServer;
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-        
     metadataNet.action = actionGetCapabilities;
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 
+    metadataNet.action = actionReadShareServer;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    
     metadataNet.action = actionGetNotificationServer;
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 
@@ -1302,6 +1303,7 @@
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }
 
+#pragma mark -
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Download Thumbnail Delegate ====
 #pragma --------------------------------------------------------------------------------------------
@@ -1980,7 +1982,7 @@
     _isSearchMode = YES;
     [self deleteRefreshControl];
     
-    NSString *fileName = [CCUtility removeForbiddenCharacters:searchController.searchBar.text hasServerForbiddenCharactersSupport:app.hasServerForbiddenCharactersSupport];
+    NSString *fileName = [CCUtility removeForbiddenCharactersServer:searchController.searchBar.text];
     
     if (fileName.length >= k_minCharsSearch && [fileName isEqualToString:_searchFileName] == NO) {
         
@@ -2414,7 +2416,7 @@
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
-    fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder hasServerForbiddenCharactersSupport:app.hasServerForbiddenCharactersSupport];
+    fileNameFolder = [CCUtility removeForbiddenCharactersServer:fileNameFolder];
     if (![fileNameFolder length]) return;
     
     if (folderCameraUpload) metadataNet.serverUrl = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
@@ -2438,7 +2440,7 @@
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     NSString *fileNamePlist;
     
-    fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder hasServerForbiddenCharactersSupport:app.hasServerForbiddenCharactersSupport];
+    fileNameFolder = [CCUtility removeForbiddenCharactersServer:fileNameFolder];
     if (![fileNameFolder length]) return;
     
     NSString *title = [AESCrypt encrypt:fileNameFolder password:[[CCCrypto sharedManager] getKeyPasscode:[CCUtility getUUID]]];
@@ -2917,15 +2919,6 @@
     [self tableViewReload];
 }
 
-- (void)requestSharedByServer
-{
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-    
-    metadataNet.action = actionReadShareServer;
-
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-}
-
 - (void)shareFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     [_hud hideHud];
@@ -4246,7 +4239,7 @@
                                     }];
         }
 
-        if (_metadata.cryptated == NO && app.hasServerShareSupport && !lockDirectory) {
+        if (_metadata.cryptated == NO && !lockDirectory) {
             
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil)
                                       image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:image_actionSheetShare] color:[NCBrandColor sharedInstance].brand]
@@ -4407,7 +4400,7 @@
                                     }];
         }
 
-        if (_metadata.cryptated == NO && app.hasServerShareSupport) {
+        if (_metadata.cryptated == NO) {
             
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil)
                                       image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:image_actionSheetShare] color:[NCBrandColor sharedInstance].brand]

iOSClient/Move/CCMove.m

@@ -142,7 +142,7 @@
     if (buttonIndex == 1) {
         NSString *nome = [alertView textFieldAtIndex:0].text;
         if ([nome length]) {
-            nome = [NSString stringWithFormat:@"%@/%@", _serverUrl, [CCUtility removeForbiddenCharacters:nome hasServerForbiddenCharactersSupport:YES]];
+            nome = [NSString stringWithFormat:@"%@/%@", _serverUrl, [CCUtility removeForbiddenCharactersServer:nome]];
         }
     }
 }
@@ -383,7 +383,7 @@
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:activeAccount];
     
-    fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder hasServerForbiddenCharactersSupport:YES];
+    fileNameFolder = [CCUtility removeForbiddenCharactersServer:fileNameFolder];
     if (![fileNameFolder length]) return;
     
     metadataNet.action = actionCreateFolder;

iOSClient/Networking/CCNetworking.m

@@ -414,7 +414,7 @@
             
         if (errorCode == 0) {
             
-            rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
+            rev = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-ETag"]];
             date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
 
             // Activity
@@ -451,8 +451,8 @@
             
         if (errorCode == 0) {
             
-            fileID = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-FileId"] hasServerForbiddenCharactersSupport:NO];
-            rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
+            fileID = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-FileId"]];
+            rev = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-ETag"]];
             date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
             
             // Activity

iOSClient/Networking/OCNetworking.h

@@ -88,9 +88,8 @@
 - (void)getUserAndGroupFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
 
 // Capabilities
-- (void)getFeaturesSupportedByServerSuccess:(BOOL)hasCapabilitiesSupport hasForbiddenCharactersSupport:(BOOL)hasForbiddenCharactersSupport hasShareSupport:(BOOL)hasShareSupport hasShareeSupport:(BOOL)hasShareeSupport;
 - (void)getCapabilitiesOfServerSuccess:(OCCapabilities *)capabilities;
-- (void)getInfoServerFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
+- (void)getCapabilitiesOfServerFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
 
 // Activity
 - (void)getActivityServerSuccess:(NSArray *)listOfActivity;

iOSClient/Networking/OCNetworking.m

@@ -40,7 +40,6 @@
     NSURLSessionUploadTask *_uploadTask;
     
     BOOL _isCryptoCloudMode;
-    BOOL _hasServerForbiddenCharactersSupport;
 }
 @end
 
@@ -119,11 +118,7 @@
 - (void)poolNetworking
 {
 #ifndef EXTENSION
-    _hasServerForbiddenCharactersSupport = app.hasServerForbiddenCharactersSupport;
-    
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-#else
-    _hasServerForbiddenCharactersSupport = YES;
 #endif
         
     if([self respondsToSelector:NSSelectorFromString(_metadataNet.action)])
@@ -669,7 +664,7 @@
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     
-    [communication createFolder:nameFolderURL onCommunication:communication withForbiddenCharactersSupported:_hasServerForbiddenCharactersSupport successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
+    [communication createFolder:nameFolderURL onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
         if ([self.delegate respondsToSelector:@selector(createFolderSuccess:)])
             [self.delegate createFolderSuccess:_metadataNet];
@@ -825,7 +820,7 @@
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     
-    [communication moveFileOrFolder:origineURL toDestiny:destinazioneURL onCommunication:communication withForbiddenCharactersSupported:_hasServerForbiddenCharactersSupport successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
+    [communication moveFileOrFolder:origineURL toDestiny:destinazioneURL onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
         if ([_metadataNet.selector isEqualToString:selectorRename] && [self.delegate respondsToSelector:@selector(renameSuccess:)])
             [self.delegate renameSuccess:_metadataNet];
@@ -1527,7 +1522,7 @@
 
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark =====  Server =====
+#pragma mark ===== Server =====
 #pragma --------------------------------------------------------------------------------------------
 
 - (NSError *)checkServerSync:(NSString *)serverUrl
@@ -1561,47 +1556,9 @@
     return returnError;
 }
 
-- (void)getFeaturesSupportedByServer
-{
-    OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
-    
-    [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent]];
-    
-    [communication getFeaturesSupportedByServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, BOOL hasShareSupport, BOOL hasShareeSupport, BOOL hasCookiesSupport, BOOL hasForbiddenCharactersSupport, BOOL hasCapabilitiesSupport, BOOL hasFedSharesOptionShareSupport, NSString *redirectedServer) {
-        
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
-        
-        if ([self.delegate respondsToSelector:@selector(getFeaturesSupportedByServerSuccess:hasForbiddenCharactersSupport:hasShareSupport:hasShareeSupport:)] && [recordAccount.account isEqualToString:_metadataNet.account])
-            [self.delegate getFeaturesSupportedByServerSuccess:hasCapabilitiesSupport hasForbiddenCharactersSupport:hasForbiddenCharactersSupport hasShareSupport:hasShareSupport hasShareeSupport:hasShareeSupport];
-
-        [self complete];
-        
-    } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
-        
-        NSInteger errorCode = response.statusCode;
-        if (errorCode == 0)
-            errorCode = error.code;
-
-        // Error
-        if ([self.delegate respondsToSelector:@selector(getInfoServerFailure:message:errorCode:)]) {
-            
-            if (errorCode == 503)
-                [self.delegate getInfoServerFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
-            else
-                [self.delegate getInfoServerFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
-        }
-        
-        // Request trusted certificated
-        if ([error code] == NSURLErrorServerCertificateUntrusted)
-            [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
-        
-        // Activity
-        [CCCoreData addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionFeatures selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
-
-        [self complete];
-    }];
-}
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Capabilities =====
+#pragma --------------------------------------------------------------------------------------------
 
 - (void)getCapabilitiesOfServer
 {
@@ -1626,12 +1583,12 @@
             errorCode = error.code;
 
         // Error
-        if ([self.delegate respondsToSelector:@selector(getInfoServerFailure:message:errorCode:)]) {
+        if ([self.delegate respondsToSelector:@selector(getCapabilitiesOfServerFailure:message:errorCode:)]) {
 
             if (errorCode == 503)
-                [self.delegate getInfoServerFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getCapabilitiesOfServerFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
             else
-                [self.delegate getInfoServerFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
+                [self.delegate getCapabilitiesOfServerFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
         
         // Request trusted certificated

iOSClient/Share/CCShareOC.m

@@ -99,21 +99,18 @@
 
     // Sharee
     
-    if (app.hasServerShareeSupport) {
-        
-        section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_share_title_", nil)];
-        [form addFormSection:section];
-        section.footerTitle = NSLocalizedString(@"_add_sharee_footer_", nil);
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_share_title_", nil)];
+    [form addFormSection:section];
+    section.footerTitle = NSLocalizedString(@"_add_sharee_footer_", nil);
         
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"findUser" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_add_sharee_", nil)];
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-        [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
-        row.action.formSelector = @selector(shareUserButton:);
-        [section addFormRow:row];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"findUser" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_add_sharee_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
+    row.action.formSelector = @selector(shareUserButton:);
+    [section addFormRow:row];
         
-        section = [XLFormSectionDescriptor formSectionWithTitle:@"" sectionOptions:XLFormSectionOptionCanDelete];
-        [form addFormSection:section];
-    }
+    section = [XLFormSectionDescriptor formSectionWithTitle:@"" sectionOptions:XLFormSectionOptionCanDelete];
+    [form addFormSection:section];
     
     self.form = form;
 }
@@ -211,41 +208,38 @@
     }
     
     // User & Group
-    if (app.hasServerShareeSupport) {
-    
-        XLFormSectionDescriptor *section = [self.form formSectionAtIndex:4];
-        [section.formRows removeAllObjects];
-        [self.itemsShareWith removeAllObjects];
+    XLFormSectionDescriptor *section = [self.form formSectionAtIndex:4];
+    [section.formRows removeAllObjects];
+    [self.itemsShareWith removeAllObjects];
         
-        if ([self.itemsUserAndGroupLink count] > 0) {
+    if ([self.itemsUserAndGroupLink count] > 0) {
     
-            for (NSString *idRemoteShared in self.itemsUserAndGroupLink) {
+        for (NSString *idRemoteShared in self.itemsUserAndGroupLink) {
             
-                OCSharedDto *item = [app.sharesID objectForKey:idRemoteShared];
+            OCSharedDto *item = [app.sharesID objectForKey:idRemoteShared];
             
-                XLFormRowDescriptor *row = [XLFormRowDescriptor formRowDescriptorWithTag:idRemoteShared rowType:XLFormRowDescriptorTypeButton];
+            XLFormRowDescriptor *row = [XLFormRowDescriptor formRowDescriptorWithTag:idRemoteShared rowType:XLFormRowDescriptorTypeButton];
 
-                [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-                //[row.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
-                [row.cellConfig setObject:[NCBrandColor sharedInstance].brand forKey:@"textLabel.textColor"];
-                row.action.formSelector = @selector(sharePermissionButton:);
+            [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+            //[row.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
+            [row.cellConfig setObject:[NCBrandColor sharedInstance].brand forKey:@"textLabel.textColor"];
+            row.action.formSelector = @selector(sharePermissionButton:);
                 
-                if (item.shareType == shareTypeGroup) row.title = [item.shareWithDisplayName stringByAppendingString:NSLocalizedString(@"_user_is_group_", nil)];
-                else row.title = item.shareWithDisplayName;
+            if (item.shareType == shareTypeGroup) row.title = [item.shareWithDisplayName stringByAppendingString:NSLocalizedString(@"_user_is_group_", nil)];
+            else row.title = item.shareWithDisplayName;
                 
-                [section addFormRow:row];
+            [section addFormRow:row];
                 
-                // add users
-                [self.itemsShareWith addObject:item];
-            }
+            // add users
+            [self.itemsShareWith addObject:item];
+        }
             
-            section.footerTitle = NSLocalizedString(@"_user_sharee_footer_", nil);
+        section.footerTitle = NSLocalizedString(@"_user_sharee_footer_", nil);
 
-        } else {
+    } else {
             
-            section.footerTitle = @"";
+        section.footerTitle = @"";
 
-        }
     }
     
     self.form.disabled = NO;

iOSClient/Utility/CCUtility.h

@@ -134,7 +134,9 @@
 + (NSString *)dateDiff:(NSDate *) convertedDate;
 + (NSString *)transformedSize:(double)value;
 
-+ (NSString *)removeForbiddenCharacters:(NSString *)fileName hasServerForbiddenCharactersSupport:(BOOL)hasServerForbiddenCharactersSupport;
++ (NSString *)removeForbiddenCharactersServer:(NSString *)fileName;
++ (NSString *)removeForbiddenCharactersFileSystem:(NSString *)fileName;
+
 + (NSString *)stringAppendServerUrl:(NSString *)serverUrl addFileName:(NSString *)addFileName;
 
 + (NSString *)createRandomString:(int)numChars;

iOSClient/Utility/CCUtility.m

@@ -436,15 +436,22 @@
     return [NSString stringWithFormat:@"%4.2f %@",value, [tokens objectAtIndex:multiplyFactor]];
 }
 
-// Remove do not forbidden characters
-+ (NSString *)removeForbiddenCharacters:(NSString *)fileName hasServerForbiddenCharactersSupport:(BOOL)hasServerForbiddenCharactersSupport
+// Remove do not forbidden characters for Nextcloud Server
++ (NSString *)removeForbiddenCharactersServer:(NSString *)fileName
 {
-    NSArray *arrayForbiddenCharacters;
+    NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"/", nil];
     
-    if (hasServerForbiddenCharactersSupport)
-        arrayForbiddenCharacters = [NSArray arrayWithObjects:@"/", nil];
-    else
-        arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/", nil];
+    for (NSString *currentCharacter in arrayForbiddenCharacters) {
+        fileName = [fileName stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
+    }
+    
+    return fileName;
+}
+
+// Remove do not forbidden characters for File System Server
++ (NSString *)removeForbiddenCharactersFileSystem:(NSString *)fileName
+{
+    NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/", nil];
     
     for (NSString *currentCharacter in arrayForbiddenCharacters) {
         fileName = [fileName stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
@@ -551,7 +558,7 @@
         if ([baseUrl hasPrefix:@"http://"]) baseUrl = [baseUrl substringFromIndex:7];
         
         dirUserBaseUrl = [NSString stringWithFormat:@"%@-%@", user, baseUrl];
-        dirUserBaseUrl = [[self removeForbiddenCharacters:dirUserBaseUrl hasServerForbiddenCharactersSupport:NO] lowercaseString];
+        dirUserBaseUrl = [[self removeForbiddenCharactersFileSystem:dirUserBaseUrl] lowercaseString];
     } else return @"";
     
     dirApplicationUserGroup = [[dirGroup URLByAppendingPathComponent:appApplicationSupport] path];
@@ -576,7 +583,7 @@
         if ([baseUrl hasPrefix:@"http://"]) baseUrl = [baseUrl substringFromIndex:7];
         
         dirUserBaseUrl = [NSString stringWithFormat:@"%@-%@", user, baseUrl];
-        dirUserBaseUrl = [[self removeForbiddenCharacters:dirUserBaseUrl hasServerForbiddenCharactersSupport:NO] lowercaseString];
+        dirUserBaseUrl = [[self removeForbiddenCharactersFileSystem:dirUserBaseUrl] lowercaseString];
     } else return @"";
     
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
@@ -781,9 +788,9 @@
     metadata.favorite = itemDto.isFavorite;
     metadata.fileID = itemDto.ocId;
     metadata.directoryID = directoryID;
-    metadata.fileName = [CCUtility removeForbiddenCharacters:itemDto.fileName hasServerForbiddenCharactersSupport:YES];
+    metadata.fileName = [CCUtility removeForbiddenCharactersServer:itemDto.fileName];
     metadata.fileNameData = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
-    metadata.fileNamePrint = [CCUtility removeForbiddenCharacters:fileNamePrint hasServerForbiddenCharactersSupport:YES];
+    metadata.fileNamePrint = [CCUtility removeForbiddenCharactersServer:fileNamePrint];
     metadata.iconName = @"";
     metadata.model = @"";
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];