remove old variable

Picker/DocumentPickerViewController.swift

@@ -53,10 +53,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     var activeUrl: String?
     var activeUser: String?
     var activePassword: String?
-    var activeUID: String?
-    var activeAccessToken: String?
     var directoryUser: String?
-    var typeCloud: String?
     
     var serverUrl: String?
     var thumbnailInLoading = [String: IndexPath]()
@@ -100,12 +97,11 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             activePassword = record.password!
             activeUrl = record.url!
             activeUser = record.user!
-            typeCloud = record.typeCloud!
             directoryUser = CCUtility.getDirectoryActiveUser(activeUser, activeUrl: activeUrl)
             
             if (self.serverUrl == nil) {
             
-                self.serverUrl = CCUtility.getHomeServerUrlActiveUrl(activeUrl, typeCloud: typeCloud)
+                self.serverUrl = CCUtility.getHomeServerUrlActiveUrl(activeUrl)
                                 
             } else {
                 
@@ -256,7 +252,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         metadataNet.serverUrl = self.serverUrl
         metadataNet.selector = selectorReadFolder
         
-        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
+        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
         networkingOperationQueue.addOperation(ocNetworking)
         
         hud.visibleIndeterminateHud()
@@ -314,7 +310,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             }
             
             // Add record
-            CCCoreData.add(metadata, activeAccount: activeAccount, activeUrl: activeUrl, typeCloud: typeCloud, context: nil)
+            CCCoreData.add(metadata, activeAccount: activeAccount, activeUrl: activeUrl, context: nil)
             
             // if plist do not exists, download it
             if CCUtility.isCryptoPlistString(metadata.fileName) && FileManager.default.fileExists(atPath: "\(directoryUser!)/\(metadata.fileName!)") == false {
@@ -330,7 +326,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 metadataNet.session = k_download_session_foreground
                 metadataNet.taskStatus = Int(k_taskStatusResume)
                 
-                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
+                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
                 networkingOperationQueue.addOperation(ocNetworking)
             }
         }
@@ -372,14 +368,14 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         metadataNet.action = actionDownloadThumbnail
         metadataNet.fileID = metadata.fileID
-        metadataNet.fileName = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: self.serverUrl, activeUrl: activeUrl, typeCloud: typeCloud)
+        metadataNet.fileName = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: self.serverUrl, activeUrl: activeUrl)
         metadataNet.fileNameLocal = metadata.fileID;
         metadataNet.fileNamePrint = metadata.fileNamePrint;
         metadataNet.options = "m";
         metadataNet.selector = selectorDownloadThumbnail;
         metadataNet.serverUrl = self.serverUrl
         
-        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
+        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
         networkingOperationQueue.addOperation(ocNetworking)
     }
 
@@ -445,7 +441,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             
         case selectorLoadPlist :
             
-            CCCoreData.downloadFilePlist(metadata, activeAccount: activeAccount, activeUrl: activeUrl, typeCloud: typeCloud, directoryUser: directoryUser)
+            CCCoreData.downloadFilePlist(metadata, activeAccount: activeAccount, activeUrl: activeUrl,directoryUser: directoryUser)
             tableView.reloadData()
             
         default :
@@ -555,7 +551,7 @@ extension DocumentPickerViewController {
                     metadataNet.session = k_upload_session_foreground
                     metadataNet.taskStatus = Int(k_taskStatusResume)
                     
-                    let ocNetworking : OCnetworking = OCnetworking.init(delegate: self!, metadataNet: metadataNet, withUser: self!.activeUser, withPassword: self!.activePassword, withUrl: self!.activeUrl, withTypeCloud: self!.typeCloud, activityIndicator: false, isCryptoCloudMode: self!.isCryptoCloudMode!)
+                    let ocNetworking : OCnetworking = OCnetworking.init(delegate: self!, metadataNet: metadataNet, withUser: self!.activeUser, withPassword: self!.activePassword, withUrl: self!.activeUrl, activityIndicator: false, isCryptoCloudMode: self!.isCryptoCloudMode!)
                     self!.networkingOperationQueue.addOperation(ocNetworking)
                     
                     self!.hud.visibleHudTitle(NSLocalizedString("_uploading_", comment: ""), mode: MBProgressHUDMode.determinateHorizontalBar, color: self!.navigationController?.view.tintColor)
@@ -789,7 +785,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 metadataNet.session = k_download_session_foreground
                 metadataNet.taskStatus = Int(k_taskStatusResume)
             
-                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false, isCryptoCloudMode: self.isCryptoCloudMode!)
+                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: self.isCryptoCloudMode!)
                 networkingOperationQueue.addOperation(ocNetworking)
                 
                 hud.visibleHudTitle(NSLocalizedString("_loading_", comment: ""), mode: MBProgressHUDMode.determinateHorizontalBar, color: self.navigationController?.view.tintColor)

Share Ext/ShareViewController.h

@@ -47,10 +47,8 @@
 @property (nonatomic, strong) NSString *activeUrl;
 @property (nonatomic, strong) NSString *activeUser;
 @property (nonatomic, strong) NSString *activePassword;
-@property (nonatomic, strong) NSString *activeUID;
 @property (nonatomic, strong) NSString *activeAccessToken;
 @property (nonatomic, strong) NSString *directoryUser;
-@property (nonatomic, strong) NSString *typeCloud;
 @property (nonatomic, strong) NSString *serverUrl;
 
 @property BOOL localCryptated;

Share Ext/ShareViewController.m

@@ -71,7 +71,6 @@
         _activeUrl = recordAccount.url;
         _activeUser = recordAccount.user;
         _directoryUser = [CCUtility getDirectoryActiveUser:self.activeUser activeUrl:self.activeUrl];
-        _typeCloud = recordAccount.typeCloud;
         
         if ([[CCUtility getKeyChainPasscodeForUUID:[CCUtility getUUID]] length] == 0) {
             
@@ -100,7 +99,7 @@
             
             [CCUtility setActiveAccountShareExt:self.activeAccount];
 
-            _serverUrl  = [CCUtility getHomeServerUrlActiveUrl:self.activeUrl typeCloud:self.typeCloud];
+            _serverUrl  = [CCUtility getHomeServerUrlActiveUrl:self.activeUrl];
             [CCUtility setServerUrlShareExt:_serverUrl];
 
             _destinyFolderButton.title = [NSString stringWithFormat:NSLocalizedString(@"_destiny_folder_", nil), NSLocalizedString(@"_home_", nil)];
@@ -345,8 +344,7 @@
 {
     id operation;
    
-    if ([_typeCloud isEqualToString:typeCloudOwnCloud] || [_typeCloud isEqualToString:typeCloudNextcloud])
-        operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl withTypeCloud:_typeCloud activityIndicator:NO isCryptoCloudMode:_isCryptoCloudMode];
+    operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl activityIndicator:NO isCryptoCloudMode:_isCryptoCloudMode];
     
     [operation setQueuePriority:metadataNet.priority];
     

iOSClient/Actions/CCActions.swift

@@ -109,7 +109,7 @@ class CCActions: NSObject {
     
     func deleteFileOrFolderSuccess(_ metadataNet: CCMetadataNet) {
         
-        CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, typeCloud: appDelegate.typeCloud, activeAccount: appDelegate.activeAccount)
+        CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
         
         metadataNet.delegate?.deleteFileOrFolderSuccess(metadataNet)
     }
@@ -118,7 +118,7 @@ class CCActions: NSObject {
         
         if errorCode == 404 {
             
-            CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, typeCloud: appDelegate.typeCloud, activeAccount: appDelegate.activeAccount)
+            CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
         }
 
         if message.length > 0 {
@@ -213,7 +213,7 @@ class CCActions: NSObject {
             appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
             
             // delete file in filesystem
-            CCCoreData.deleteFile(metadata, serverUrl: serverUrl, directoryUser: appDelegate.directoryUser, typeCloud: appDelegate.typeCloud, activeAccount: appDelegate.activeAccount)
+            CCCoreData.deleteFile(metadata, serverUrl: serverUrl, directoryUser: appDelegate.directoryUser, activeAccount: appDelegate.activeAccount)
  
         } else {
  

iOSClient/AppDelegate.h

@@ -53,9 +53,6 @@
 @property (nonatomic, strong) NSString *activeUrl;
 @property (nonatomic, strong) NSString *activeUser;
 @property (nonatomic, strong) NSString *activePassword;
-@property (nonatomic, strong) NSString *activeUID;
-@property (nonatomic, strong) NSString *activeAccessToken;
-@property (nonatomic, strong) NSString *typeCloud;
 @property (nonatomic, strong) NSString *directoryUser;
 @property double quotaUsed;
 @property double quotaAvailable;
@@ -153,7 +150,7 @@
 @property BOOL isCryptoCloudMode;
 
 // Setting Active Account
-- (void)settingActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl activeUser:(NSString *)activeUser activePassword:(NSString *)activePassword activeUID:(NSString *)activeUID activeAccessToken:(NSString *)activeAccessToken typeCloud:(NSString *)typeCloud;
+- (void)settingActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl activeUser:(NSString *)activeUser activePassword:(NSString *)activePassword;
 
 // initializations 
 - (void)applicationInitialized;

iOSClient/AppDelegate.m

@@ -109,7 +109,7 @@
 
     } else {
         
-        [self settingActiveAccount:recordAccount.account activeUrl:recordAccount.url activeUser:recordAccount.user activePassword:recordAccount.password activeUID:recordAccount.uid activeAccessToken:recordAccount.token typeCloud:recordAccount.typeCloud];
+        [self settingActiveAccount:recordAccount.account activeUrl:recordAccount.url activeUser:recordAccount.user activePassword:recordAccount.password];
     }
     
     // Operation Queue OC Networking
@@ -411,18 +411,14 @@
 #pragma mark ===== Setting Active Account =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)settingActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl activeUser:(NSString *)activeUser activePassword:(NSString *)activePassword activeUID:(NSString *)activeUID activeAccessToken:(NSString *)activeAccessToken typeCloud:(NSString *)typeCloud
+- (void)settingActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl activeUser:(NSString *)activeUser activePassword:(NSString *)activePassword
 {
     self.activeAccount = activeAccount;
     self.activeUrl = activeUrl;
     self.activeUser = activeUser;
     self.activePassword = activePassword;
-    self.typeCloud = typeCloud;
     
-    self.directoryUser = [CCUtility getDirectoryActiveUser:activeUser activeUrl:activeUrl];
-    
-    self.activeUID = activeUID;
-    self.activeAccessToken = activeAccessToken;
+    self.directoryUser = [CCUtility getDirectoryActiveUser:activeUser activeUrl:activeUrl];    
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -824,29 +820,25 @@
     // netQueueDownload
     for (NSOperation *operation in [app.netQueueDownload operations]) {
         
-        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
-            if (((OCnetworking *)operation).isExecuting == NO) _queueNunDownload++;
+        if (((OCnetworking *)operation).isExecuting == NO) _queueNunDownload++;
     }
     
     // netQueueDownloadWWan
     for (NSOperation *operation in [app.netQueueDownloadWWan operations]) {
         
-        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
-            if (((OCnetworking *)operation).isExecuting == NO) _queueNumDownloadWWan++;
+        if (((OCnetworking *)operation).isExecuting == NO) _queueNumDownloadWWan++;
     }
     
     // netQueueUpload
     for (NSOperation *operation in [app.netQueueUpload operations]) {
         
-        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
-            if (((OCnetworking *)operation).isExecuting == NO) _queueNumUpload++;
+        if (((OCnetworking *)operation).isExecuting == NO) _queueNumUpload++;
     }
     
     // netQueueUploadWWan
     for (NSOperation *operation in [app.netQueueUploadWWan operations]) {
         
-        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
-            if (((OCnetworking *)operation).isExecuting == NO) _queueNumUploadWWan++;
+        if (((OCnetworking *)operation).isExecuting == NO) _queueNumUploadWWan++;
     }
     
     // Total
@@ -1112,8 +1104,7 @@
     if (netQueue == _netQueue)
         activityIndicator = YES;
     
-    if ([_typeCloud isEqualToString:typeCloudOwnCloud] || [_typeCloud isEqualToString:typeCloudNextcloud])
-        operation = [[OCnetworking alloc] initWithDelegate:delegate metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl withTypeCloud:_typeCloud activityIndicator:activityIndicator isCryptoCloudMode:_isCryptoCloudMode];
+    operation = [[OCnetworking alloc] initWithDelegate:delegate metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl activityIndicator:activityIndicator isCryptoCloudMode:_isCryptoCloudMode];
     
     [operation setQueuePriority:metadataNet.priority];
     
@@ -1124,16 +1115,13 @@
 {
     NSMutableArray *metadatasNet = [[NSMutableArray alloc] init];
     
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        for (OCnetworking *operation in [self.netQueueDownload operations])
-            if ([operation.metadataNet.selector isEqualToString:selector])
-                [metadatasNet addObject:[operation.metadataNet copy]];
+    for (OCnetworking *operation in [self.netQueueDownload operations])
+        if ([operation.metadataNet.selector isEqualToString:selector])
+            [metadatasNet addObject:[operation.metadataNet copy]];
         
-        for (OCnetworking *operation in [self.netQueueDownloadWWan operations])
-            if ([operation.metadataNet.selector isEqualToString:selector])
-                [metadatasNet addObject:[operation.metadataNet copy]];
-    }
+    for (OCnetworking *operation in [self.netQueueDownloadWWan operations])
+        if ([operation.metadataNet.selector isEqualToString:selector])
+            [metadatasNet addObject:[operation.metadataNet copy]];
     
     return metadatasNet;
 }
@@ -1142,16 +1130,13 @@
 {
     NSMutableArray *metadatasNet = [[NSMutableArray alloc] init];
     
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
+    for (OCnetworking *operation in [self.netQueueUpload operations])
+        if ([operation.metadataNet.selector isEqualToString:selector])
+            [metadatasNet addObject:[operation.metadataNet copy]];
         
-        for (OCnetworking *operation in [self.netQueueUpload operations])
-            if ([operation.metadataNet.selector isEqualToString:selector])
-                [metadatasNet addObject:[operation.metadataNet copy]];
-        
-        for (OCnetworking *operation in [self.netQueueUploadWWan operations])
-            if ([operation.metadataNet.selector isEqualToString:selector])
-                [metadatasNet addObject:[operation.metadataNet copy]];
-    }
+    for (OCnetworking *operation in [self.netQueueUploadWWan operations])
+        if ([operation.metadataNet.selector isEqualToString:selector])
+            [metadatasNet addObject:[operation.metadataNet copy]];
     
     return metadatasNet;
 }

iOSClient/CCGlobal.h

@@ -30,8 +30,6 @@ extern NSString *const appDatabase;
 extern NSString *const appCertificates;
 
 extern NSString *const webDAV;
-extern NSString *const typeCloudNextcloud;
-extern NSString *const typeCloudOwnCloud;
 
 extern NSString *const appKeyCryptoCloud;
 extern NSString *const appSecretCryptoCloud;

iOSClient/CCGlobal.m

@@ -30,8 +30,6 @@ NSString *const appCertificates = @"Library/Application Support/Certificates";
 
 // Cloud
 NSString *const webDAV = @"/remote.php/webdav";
-NSString *const typeCloudNextcloud = @"nextcloud";
-NSString *const typeCloudOwnCloud = @"owncloud";
 
 // BKPasscode
 NSString *const BKPasscodeKeychainServiceName = @"Crypto Cloud";

iOSClient/CCImages.h

@@ -150,7 +150,7 @@
 #define image_tabBarSettings                    @"tabBarSettings"
 #define image_txt                               @"txt"
 #define image_txtcrypto                         @"txtcrypto"
-#define image_typeCloudNextcloud                @"typeCloudNextcloud"
+#define image_Nextcloud                         @"typeCloudNextcloud"
 #define image_typeFileCompress                  @"typeFileCompress"
 #define image_filetype_htlm                     @"filetype_html"
 #define image_filetype_htlm_crypto              @"filetype_html_crypto"

iOSClient/Create/CCCreateCloud.swift

@@ -454,7 +454,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             var useSubFolder : Bool = false
             
             if (useFolderPhotoRow.value! as AnyObject).boolValue == true {
-                self.serverUrl = CCCoreData.getCameraUploadFolderNamePathActiveAccount(self.appDelegate.activeAccount, activeUrl: self.appDelegate.activeUrl, typeCloud: self.appDelegate.typeCloud)
+                self.serverUrl = CCCoreData.getCameraUploadFolderNamePathActiveAccount(self.appDelegate.activeAccount, activeUrl: self.appDelegate.activeUrl)
                 useSubFolder = (useSubFolderRow.value! as AnyObject).boolValue
             }
             

iOSClient/FileSystem/CCCoreData.h

@@ -46,7 +46,7 @@
 
 // ===== Account =====
 
-+ (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password uid:(NSString*)uid typeCloud:(NSString *)typeCloud;
++ (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password;
 + (void)updateAccount:(NSString *)account withPassword:(NSString *)password;
 + (void)deleteAccount:(NSString *)account;
 + (TableAccount *)setActiveAccount:(NSString *)account;
@@ -56,12 +56,9 @@
 + (NSArray *)getAllTableAccount;
 + (TableAccount *)getActiveAccount;
 
-+ (NSString *)getTokenActiveAccount:(NSString *)activeAccount;
-+ (void)setTokenAccount:(NSString *)token activeAccount:(NSString *)activeAccount;
-
 + (NSString *)getCameraUploadFolderNameActiveAccount:(NSString *)activeAccount;
-+ (NSString *)getCameraUploadFolderPathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
-+ (NSString *)getCameraUploadFolderNamePathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
++ (NSString *)getCameraUploadFolderPathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
++ (NSString *)getCameraUploadFolderNamePathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
 
 + (BOOL)getCameraUploadActiveAccount:(NSString *)activeAccount;
 + (BOOL)getCameraUploadBackgroundActiveAccount:(NSString *)activeAccount;
@@ -91,7 +88,7 @@
 + (void)setCameraUploadWWanPhoto:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadWWanVideo:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderName:(NSString *)fileName activeAccount:(NSString *)activeAccount;
-+ (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud activeAccount:(NSString *)activeAccount;
++ (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount;
 
 // ===== Certificates =====
@@ -101,10 +98,10 @@
 
 // ===== Metadata =====
 
-+ (void)addMetadata:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud context:(NSManagedObjectContext *)context;
++ (void)addMetadata:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context;
 + (void)deleteMetadataWithPredicate:(NSPredicate *)predicate;
 + (void)moveMetadata:(NSString *)fileName directoryID:(NSString *)directoryID directoryIDTo:(NSString *)directoryIDTo activeAccount:(NSString *)activeAccount;
-+ (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud context:(NSManagedObjectContext *)context;
++ (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context;
 + (void)setMetadataSession:(NSString *)session sessionError:(NSString *)sessionError sessionSelector:(NSString *)sessionSelector sessionSelectorPost:(NSString *)sessionSelectorPost sessionTaskIdentifier:(NSInteger)sessionTaskIdentifier sessionTaskIdentifierPlist:(NSInteger)sessionTaskIdentifierPlist predicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
 
 + (NSArray *)getTableMetadataWithPredicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
@@ -194,7 +191,7 @@
 + (void)setShareLink:(NSString *)share fileName:(NSString *)fileName serverUrl:(NSString *)serverUrl sharesLink:(NSMutableDictionary *)sharesLink activeAccount:(NSString *)activeAccount;
 + (void)setShareUserAndGroup:(NSString *)share fileName:(NSString *)fileName serverUrl:(NSString *)serverUrl sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup activeAccount:(NSString *)activeAccount;
 + (void)unShare:(NSString *)share fileName:(NSString *)fileName serverUrl:(NSString *)serverUrl sharesLink:(NSMutableDictionary *)sharesLink sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup activeAccount:(NSString *)activeAccount;
-+ (void)updateShare:(NSDictionary *)items sharesLink:(NSMutableDictionary *)sharesLink sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
++ (void)updateShare:(NSDictionary *)items sharesLink:(NSMutableDictionary *)sharesLink sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
 + (void)populateSharesVariableFromDBActiveAccount:(NSString *)activeAccount sharesLink:(NSMutableDictionary *)sharesLink sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup;
 
 // ===== Offline =====
@@ -204,12 +201,12 @@
 // ===== File System =====
 
 + (BOOL)downloadFile:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
-+ (void)downloadFilePlist:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud directoryUser:(NSString *)directoryUser;
-+ (void)deleteFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser typeCloud:(NSString *)typeCloud activeAccount:(NSString *)activeAccount;
++ (void)downloadFilePlist:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl directoryUser:(NSString *)directoryUser;
++ (void)deleteFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
 
 // ===== Metadata <> Entity =====
 
-+ (void)insertMetadataInEntity:(CCMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
++ (void)insertMetadataInEntity:(CCMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
 + (CCMetadata *)insertEntityInMetadata:(TableMetadata *)recordMetadata;
 
 // ===== Routine for migrate =====

iOSClient/FileSystem/CCCoreData.m

@@ -31,7 +31,7 @@
 #pragma mark ===== Account =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password uid:(NSString*)uid typeCloud:(NSString *)typeCloud
++ (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
     
@@ -53,8 +53,6 @@
     record.dateRecord = [NSDate date];
     record.optimization = [NSDate date];
     record.password = password;
-    record.typeCloud = typeCloud;
-    record.uid = uid;
     record.url = url;
     record.user = user;
     
@@ -108,18 +106,6 @@
     return [self getActiveAccount];
 }
 
-+ (TableAccount *)setActiveFirstAccountNextcloudOwncloud
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-        
-    TableAccount *record = [TableAccount MR_findFirstWithPredicate:[NSPredicate predicateWithFormat:@"(typeCloud == %@) OR (typeCloud == %@)", typeCloudNextcloud, typeCloudOwnCloud] inContext:context];
-    
-    if (record)
-        return [self setActiveAccount:record.account];
-    
-    return nil;
-}
-
 + (NSArray *)getAllAccount
 {
     NSMutableArray *accounts = [[NSMutableArray alloc] init];
@@ -127,7 +113,7 @@
     
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
     
-    records = [TableAccount MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(typeCloud == %@) OR (typeCloud == %@)", typeCloudNextcloud, typeCloudOwnCloud] inContext:context];
+    records = [TableAccount MR_findAllInContext:context];
     
     for (TableAccount *tableAccount in records)
         [accounts addObject:tableAccount.account];
@@ -148,8 +134,8 @@
 
     NSSortDescriptor *descriptor = [[NSSortDescriptor alloc] initWithKey:@"account" ascending:YES selector:@selector(localizedCaseInsensitiveCompare:)];
     NSArray *records;
-        
-    records = [TableAccount MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(typeCloud == %@) OR (typeCloud == %@)", typeCloudNextcloud, typeCloudOwnCloud] inContext:context];
+    
+    records = [TableAccount MR_findAllInContext:context];
     
     records = [NSMutableArray arrayWithArray:[records sortedArrayUsingDescriptors:[[NSArray alloc] initWithObjects:descriptor, nil]]];
     
@@ -162,38 +148,10 @@
 
     TableAccount *record = [TableAccount MR_findFirstByAttribute:@"active" withValue:[NSNumber numberWithBool:YES] inContext:context];
     
-    if ([record.typeCloud isEqualToString:typeCloudNextcloud] == NO && [record.typeCloud isEqualToString:typeCloudOwnCloud] == NO)
-        return [self setActiveFirstAccountNextcloudOwncloud];
-    
     if (record) return record;
     else return nil;
 }
 
-+ (NSString *)getTokenActiveAccount:(NSString *)activeAccount
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-
-    TableAccount *record = [TableAccount MR_findFirstWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", activeAccount] inContext:context];
-    
-    if (record) return record.token;
-    else return nil;
-}
-
-+ (void)setTokenAccount:(NSString *)token activeAccount:(NSString *)activeAccount
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-    
-    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
-    TableAccount *record = [TableAccount MR_findFirstWithPredicate:predicate inContext:context];
-    
-    if (record) {
-        
-        record.token = token;
-        
-        [context MR_saveToPersistentStoreAndWait];
-    }
-}
-
 + (NSString *)getCameraUploadFolderNameActiveAccount:(NSString *)activeAccount
 {
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
@@ -207,7 +165,7 @@
     } else return @"";
 }
 
-+ (NSString *)getCameraUploadFolderPathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
++ (NSString *)getCameraUploadFolderPathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl
 {
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
     TableAccount *record = [TableAccount MR_findFirstWithPredicate:predicate];
@@ -215,15 +173,15 @@
     if (record) {
         
         if ([record.cameraUploadFolderPath length] > 0 ) return record.cameraUploadFolderPath;
-        else return [CCUtility getHomeServerUrlActiveUrl:activeUrl typeCloud:typeCloud];
+        else return [CCUtility getHomeServerUrlActiveUrl:activeUrl];
         
     } else return @"";
 }
 
-+ (NSString *)getCameraUploadFolderNamePathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
++ (NSString *)getCameraUploadFolderNamePathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl
 {
     NSString *cameraFolderName = [self getCameraUploadFolderNameActiveAccount:activeAccount];
-    NSString *cameraFolderPath = [self getCameraUploadFolderPathActiveAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud];
+    NSString *cameraFolderPath = [self getCameraUploadFolderPathActiveAccount:activeAccount activeUrl:activeUrl];
     
     NSString *folderPhotos = [CCUtility stringAppendServerUrl:cameraFolderPath addServerUrl:cameraFolderName];
     return folderPhotos;
@@ -516,10 +474,10 @@
     }];
 }
 
-+ (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud activeAccount:(NSString *)activeAccount
++ (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl activeAccount:(NSString *)activeAccount
 {
     if (pathName == nil)
-        pathName = [self getCameraUploadFolderPathActiveAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud];
+        pathName = [self getCameraUploadFolderPathActiveAccount:activeAccount activeUrl:activeUrl];
     
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
@@ -580,7 +538,7 @@
 #pragma mark ===== Metadata =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)addMetadata:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud context:(NSManagedObjectContext *)context
++ (void)addMetadata:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context
 {
     if (context == nil)
         context = [NSManagedObjectContext MR_context];
@@ -602,7 +560,7 @@
     [record setValue:[NSDate date] forKey:@"dateRecord"];
 
     // Insert metdata -> entity
-    [self insertMetadataInEntity:metadata recordMetadata:record activeAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud];
+    [self insertMetadataInEntity:metadata recordMetadata:record activeAccount:activeAccount activeUrl:activeUrl];
     
     // Aggiorniamo la data nella directory (ottimizzazione v 2.10)
     [self setDateReadDirectoryID:metadata.directoryID activeAccount:activeAccount];
@@ -648,7 +606,7 @@
     }];
 }
 
-+ (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud context:(NSManagedObjectContext *)context
++ (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context
 {
     TableMetadata *record;
     
@@ -659,7 +617,7 @@
     
     if (record) {
         
-        [self insertMetadataInEntity:metadata recordMetadata:record activeAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud];
+        [self insertMetadataInEntity:metadata recordMetadata:record activeAccount:activeAccount activeUrl:activeUrl];
         
         // Aggiorniamo la data nella directory (ottimizzazione v 2.10)
         [self setDateReadDirectoryID:metadata.directoryID activeAccount:activeAccount];
@@ -1655,73 +1613,70 @@
     [sharesUserAndGroup removeAllObjects];
 }
 
-+ (void)updateShare:(NSDictionary *)items sharesLink:(NSMutableDictionary *)sharesLink sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
++ (void)updateShare:(NSDictionary *)items sharesLink:(NSMutableDictionary *)sharesLink sharesUserAndGroup:(NSMutableDictionary *)sharesUserAndGroup activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl
 {
     // rimuovi tutte le condivisioni
     [self removeAllShareActiveAccount:activeAccount sharesLink:sharesLink sharesUserAndGroup:sharesUserAndGroup];
     
-    if ([typeCloud isEqualToString:typeCloudOwnCloud] || [typeCloud isEqualToString:typeCloudNextcloud]) {
+    NSMutableArray *itemsLink = [[NSMutableArray alloc] init];
+    NSMutableArray *itemsUsersAndGroups = [[NSMutableArray alloc] init];
         
-        NSMutableArray *itemsLink = [[NSMutableArray alloc] init];
-        NSMutableArray *itemsUsersAndGroups = [[NSMutableArray alloc] init];
-        
-        for (NSString *idRemoteShared in items) {
+    for (NSString *idRemoteShared in items) {
             
-            OCSharedDto *item = [items objectForKey:idRemoteShared];
+        OCSharedDto *item = [items objectForKey:idRemoteShared];
             
-            if (item.shareType == shareTypeLink) [itemsLink addObject:item];
-            if ([[item shareWith] length] > 0 && (item.shareType == shareTypeUser || item.shareType == shareTypeGroup || item.shareType == shareTypeRemote)) [itemsUsersAndGroups addObject:item];
-        }
+        if (item.shareType == shareTypeLink) [itemsLink addObject:item];
+        if ([[item shareWith] length] > 0 && (item.shareType == shareTypeUser || item.shareType == shareTypeGroup || item.shareType == shareTypeRemote)) [itemsUsersAndGroups addObject:item];
+    }
         
-        // Link
-        for (OCSharedDto *item in itemsLink) {
+    // Link
+    for (OCSharedDto *item in itemsLink) {
             
-            NSString *fullPath = [[CCUtility getHomeServerUrlActiveUrl:activeUrl typeCloud:typeCloud] stringByAppendingString:item.path];
+        NSString *fullPath = [[CCUtility getHomeServerUrlActiveUrl:activeUrl] stringByAppendingString:item.path];
             
-            NSString *fileName = [fullPath lastPathComponent];
-            NSString *serverUrl = [fullPath substringToIndex:([fullPath length]-[fileName length]-1)];
-            if ([serverUrl hasSuffix:@"/"]) serverUrl = [serverUrl substringToIndex:[serverUrl length] - 1];
+        NSString *fileName = [fullPath lastPathComponent];
+        NSString *serverUrl = [fullPath substringToIndex:([fullPath length]-[fileName length]-1)];
+        if ([serverUrl hasSuffix:@"/"]) serverUrl = [serverUrl substringToIndex:[serverUrl length] - 1];
             
-            if ([@(item.idRemoteShared) stringValue])
-                [self setShareLink:[@(item.idRemoteShared) stringValue] fileName:fileName serverUrl:serverUrl sharesLink:sharesLink activeAccount:activeAccount];
-        }
+        if ([@(item.idRemoteShared) stringValue])
+            [self setShareLink:[@(item.idRemoteShared) stringValue] fileName:fileName serverUrl:serverUrl sharesLink:sharesLink activeAccount:activeAccount];
+    }
         
-        // Condivisioni
-        NSMutableDictionary *paths = [[NSMutableDictionary alloc] init];
+    // Condivisioni
+    NSMutableDictionary *paths = [[NSMutableDictionary alloc] init];
         
-        // Creazione dizionario
-        for (OCSharedDto *item in itemsUsersAndGroups) {
+    // Creazione dizionario
+    for (OCSharedDto *item in itemsUsersAndGroups) {
             
-            if ([paths objectForKey:item.path]) {
+        if ([paths objectForKey:item.path]) {
                 
-                NSMutableArray *share = [paths objectForKey:item.path];
-                [share addObject:[@(item.idRemoteShared) stringValue]];
-                [paths setObject:share forKey:item.path];
+            NSMutableArray *share = [paths objectForKey:item.path];
+            [share addObject:[@(item.idRemoteShared) stringValue]];
+            [paths setObject:share forKey:item.path];
                 
-            } else {
+        } else {
                 
-                NSMutableArray *share = [[NSMutableArray alloc] initWithObjects:[@(item.idRemoteShared) stringValue], nil];
-                [paths setObject:share forKey:item.path];
-            }
+            NSMutableArray *share = [[NSMutableArray alloc] initWithObjects:[@(item.idRemoteShared) stringValue], nil];
+            [paths setObject:share forKey:item.path];
         }
+    }
         
-        // Scrittura su DB
-        for (NSString *path in paths) {
+    // Scrittura su DB
+    for (NSString *path in paths) {
             
-            NSArray *items = [paths objectForKey:path];
-            NSString *share = [items componentsJoinedByString:@","];
+        NSArray *items = [paths objectForKey:path];
+        NSString *share = [items componentsJoinedByString:@","];
             
-            NSLog(@"[LOG] share %@", share);
+        NSLog(@"[LOG] share %@", share);
             
-            NSString *fullPath = [[CCUtility getHomeServerUrlActiveUrl:activeUrl typeCloud:typeCloud] stringByAppendingString:path];
+        NSString *fullPath = [[CCUtility getHomeServerUrlActiveUrl:activeUrl] stringByAppendingString:path];
             
-            NSString *fileName = [fullPath lastPathComponent];
-            NSString *serverUrl = [fullPath substringToIndex:([fullPath length]-[fileName length]-1)];
-            if ([serverUrl hasSuffix:@"/"]) serverUrl = [serverUrl substringToIndex:[serverUrl length] - 1];
+        NSString *fileName = [fullPath lastPathComponent];
+        NSString *serverUrl = [fullPath substringToIndex:([fullPath length]-[fileName length]-1)];
+        if ([serverUrl hasSuffix:@"/"]) serverUrl = [serverUrl substringToIndex:[serverUrl length] - 1];
             
-            if (share)
-                [self setShareUserAndGroup:share fileName:fileName serverUrl:serverUrl sharesUserAndGroup:sharesUserAndGroup activeAccount:activeAccount];
-        }
+        if (share)
+            [self setShareUserAndGroup:share fileName:fileName serverUrl:serverUrl sharesUserAndGroup:sharesUserAndGroup activeAccount:activeAccount];
     }
 }
 
@@ -1834,13 +1789,13 @@
     return YES;
 }
 
-+ (void)downloadFilePlist:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud directoryUser:(NSString *)directoryUser
++ (void)downloadFilePlist:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl directoryUser:(NSString *)directoryUser
 {
     // inseriamo le info nel plist
     [CCUtility insertInformationPlist:metadata directoryUser:directoryUser];
     
     // aggiorniamo il CCMetadata
-    [self updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount] activeAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud context:nil];
+    [self updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount] activeAccount:activeAccount activeUrl:activeUrl context:nil];
     
     // se è un template aggiorniamo anche nel FileSystem
     if ([metadata.type isEqualToString: k_metadataType_template]){
@@ -1848,7 +1803,7 @@
     }
 }
 
-+ (void)deleteFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser typeCloud:(NSString *)typeCloud activeAccount:(NSString *)activeAccount
++ (void)deleteFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
 {
     // ----------------------------------------- FILESYSTEM ------------------------------------------
     
@@ -1872,7 +1827,7 @@
 #pragma mark ===== Metadata <> Entity =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)insertMetadataInEntity:(CCMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
++ (void)insertMetadataInEntity:(CCMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl
 {
     if ([activeAccount length]) recordMetadata.account = activeAccount;
     recordMetadata.cryptated = [NSNumber numberWithBool:metadata.cryptated];
@@ -1908,11 +1863,10 @@
     recordMetadata.thumbnailExists = [NSNumber numberWithBool:metadata.thumbnailExists];
 
     if ([metadata.type length]) recordMetadata.type = metadata.type;
-    if ([metadata.typeCloud length]) recordMetadata.typeCloud = metadata.typeCloud;
     if ([metadata.uuid length]) recordMetadata.uuid = metadata.uuid;
 
     // inseriamo il typeFile e icona di default.
-    [CCUtility insertTypeFileIconName:metadata directory:[self getServerUrlFromDirectoryID:metadata.directoryID activeAccount:activeAccount] cameraFolderName:[self getCameraUploadFolderNameActiveAccount:activeAccount] cameraFolderPath:[self getCameraUploadFolderPathActiveAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud]];
+    [CCUtility insertTypeFileIconName:metadata directory:[self getServerUrlFromDirectoryID:metadata.directoryID activeAccount:activeAccount] cameraFolderName:[self getCameraUploadFolderNameActiveAccount:activeAccount] cameraFolderPath:[self getCameraUploadFolderPathActiveAccount:activeAccount activeUrl:activeUrl]];
     
     recordMetadata.typeFile = metadata.typeFile;
     recordMetadata.iconName = metadata.iconName;
@@ -1953,7 +1907,6 @@
     metadata.thumbnailExists = [recordMetadata.thumbnailExists boolValue];
     metadata.title = recordMetadata.title;
     metadata.type = recordMetadata.type;
-    metadata.typeCloud = recordMetadata.typeCloud;
     metadata.typeFile = recordMetadata.typeFile;
     metadata.uuid = recordMetadata.uuid;
     

iOSClient/FileSystem/CCMetadata.h

@@ -55,7 +55,6 @@
 @property BOOL thumbnailExists;
 @property (nonatomic, strong) NSString *title;
 @property (nonatomic, strong) NSString *type;
-@property (nonatomic, strong) NSString *typeCloud;
 @property (nonatomic, strong) NSString *typeFile;
 @property (nonatomic, strong) NSString *uuid;
 

iOSClient/FileSystem/CCMetadata.m

@@ -70,7 +70,6 @@
     [metadata setThumbnailExists: self.thumbnailExists];
     [metadata setTitle: self.title];
     [metadata setType: self.type];
-    [metadata setTypeCloud: self.typeCloud];
     [metadata setTypeFile: self.typeFile];
     [metadata setUuid: self.uuid];
     
@@ -112,7 +111,6 @@
         _thumbnailExists = [decoder decodeBoolForKey:@"thumbnailExists"];
         _title = [decoder decodeObjectForKey:@"title"];
         _type = [decoder decodeObjectForKey:@"type"];
-        _typeCloud = [decoder decodeObjectForKey:@"typeCloud"];
         _typeFile = [decoder decodeObjectForKey:@"typeFile"];
         _uuid = [decoder decodeObjectForKey:@"uuid"];
     };
@@ -151,7 +149,6 @@
     [encoder encodeBool:_thumbnailExists forKey:@"thumbnailExists"];
     [encoder encodeObject:_title forKey:@"title"];
     [encoder encodeObject:_type forKey:@"type"];
-    [encoder encodeObject:_typeCloud forKey:@"typeCloud"];
     [encoder encodeObject:_typeFile forKey:@"typeFile"];
     [encoder encodeObject:_uuid forKey:@"uuid"];
 }

iOSClient/FileSystem/TableAccount+CoreDataProperties.h

@@ -47,9 +47,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, retain) NSDate *dateRecord;
 @property (nullable, nonatomic, retain) NSDate *optimization;
 @property (nullable, nonatomic, retain) NSString *password;
-@property (nullable, nonatomic, retain) NSString *token;
-@property (nullable, nonatomic, retain) NSString *typeCloud;
-@property (nullable, nonatomic, retain) NSString *uid;
 @property (nullable, nonatomic, retain) NSString *url;
 @property (nullable, nonatomic, retain) NSString *user;
 

iOSClient/FileSystem/TableAccount+CoreDataProperties.m

@@ -45,9 +45,6 @@
 @dynamic dateRecord;
 @dynamic optimization;
 @dynamic password;
-@dynamic token;
-@dynamic typeCloud;
-@dynamic uid;
 @dynamic url;
 @dynamic user;
 

iOSClient/FileSystem/TableMetadata+CoreDataProperties.h

@@ -56,7 +56,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, retain) NSNumber *thumbnailExists;
 @property (nullable, nonatomic, retain) NSString *title;
 @property (nullable, nonatomic, retain) NSString *type;
-@property (nullable, nonatomic, retain) NSString *typeCloud;
 @property (nullable, nonatomic, retain) NSString *typeFile;
 @property (nullable, nonatomic, retain) NSString *uuid;
 

iOSClient/FileSystem/TableMetadata+CoreDataProperties.m

@@ -54,7 +54,6 @@
 @dynamic thumbnailExists;
 @dynamic title;
 @dynamic type;
-@dynamic typeCloud;
 @dynamic typeFile;
 @dynamic uuid;
 

iOSClient/Login/CCLogin.m

@@ -39,7 +39,8 @@
 {
     [super viewDidLoad];
     
-    if (([app.typeCloud isEqualToString:typeCloudNextcloud] || [app.typeCloud isEqualToString:typeCloudOwnCloud])&& app.activeAccount) {
+    if (app.activeAccount) {
+        
         self.baseUrl.text = app.activeUrl;
         self.user.text = app.activeUser;
     }
@@ -125,7 +126,7 @@
     self.loadingBaseUrl.hidden = NO;
     
     NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:self.baseUrl.text] cachePolicy:0 timeoutInterval:20.0];
-    [request addValue:[CCUtility getUserAgent:typeCloudNextcloud] forHTTPHeaderField:@"User-Agent"];
+    [request addValue:[CCUtility getUserAgent] forHTTPHeaderField:@"User-Agent"];
     
     NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
     NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
@@ -203,7 +204,7 @@
     if ([[self.baseUrl.text substringFromIndex:[self.baseUrl.text length] - 1] isEqualToString:@"/"])
         self.baseUrl.text = [self.baseUrl.text substringToIndex:[self.baseUrl.text length] - 1];
     
-    OCnetworking *ocNet = [[OCnetworking alloc] initWithDelegate:self metadataNet:nil withUser:self.user.text withPassword:self.password.text withUrl:nil withTypeCloud:typeCloudNextcloud activityIndicator:NO isCryptoCloudMode:NO];
+    OCnetworking *ocNet = [[OCnetworking alloc] initWithDelegate:self metadataNet:nil withUser:self.user.text withPassword:self.password.text withUrl:nil activityIndicator:NO isCryptoCloudMode:NO];
     NSError *error = [ocNet readFileSync:[NSString stringWithFormat:@"%@%@", self.baseUrl.text, webDAV]];
     
     if (!error) {
@@ -220,7 +221,7 @@
             [CCCoreData deleteAccount:account];
         
             // Add default account
-            [CCCoreData addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text uid:nil typeCloud:typeCloudNextcloud];
+            [CCCoreData addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
         }
         
         TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
@@ -228,7 +229,7 @@
         // verifica
         if ([tableAccount.account isEqualToString:account]) {
             
-            [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password activeUID:nil activeAccessToken:nil typeCloud:tableAccount.typeCloud];
+            [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password];
             
             [self.delegate loginSuccess:_loginType];
             

iOSClient/Main/CCMain.m

@@ -156,7 +156,7 @@
     }
 
     // Back Button
-    if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud]])
+    if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl]])
         self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_brandNavigationController] style:UIBarButtonItemStylePlain target:nil action:nil];
     
     // reMenu Background
@@ -301,7 +301,7 @@
     _dateReadDataSource = nil;
     
     // test
-    if ([app.activeAccount length] == 0 || [app.activeUrl length] == 0 || [app.typeCloud length] == 0)
+    if ([app.activeAccount length] == 0 || [app.activeUrl length] == 0)
         return;
     
     if ([app.listMainVC count] == 0 || _isRoot) {
@@ -325,7 +325,7 @@
         // Remove search mode
         [self cancelSearchBar];
         
-        _serverUrl = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud];
+        _serverUrl = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
         _isFolderEncrypted = NO;
         
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
@@ -497,7 +497,7 @@
     } else {
         
         // we are in home : LOGO BRAND
-        if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud]]) {
+        if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl]]) {
             
             self.navigationItem.title = nil;
             
@@ -1144,22 +1144,19 @@
     app.hasServerForbiddenCharactersSupport = YES;
     app.hasServerShareSupport = YES;
     
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        metadataNet.action = actionGetFeaturesSuppServer;
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    metadataNet.action = actionGetFeaturesSuppServer;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
         
-        metadataNet.action = actionGetCapabilities;
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    metadataNet.action = actionGetCapabilities;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
         
-        metadataNet.action = actionGetNotificationsOfServer;
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    metadataNet.action = actionGetNotificationsOfServer;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 
-        metadataNet.action = actionReadFile;
-        metadataNet.selector = selectorReadFileQuota;
-        metadataNet.serverUrl = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud];
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    }
+    metadataNet.action = actionReadFile;
+    metadataNet.selector = selectorReadFileQuota;
+    metadataNet.serverUrl = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -1203,10 +1200,7 @@
     
     metadataNet.action = actionDownloadThumbnail;
     metadataNet.fileID = metadata.fileID;
-
-    if ([metadata.typeCloud isEqualToString:typeCloudOwnCloud] || [metadata.typeCloud isEqualToString:typeCloudNextcloud])
-        metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl typeCloud:app.typeCloud];
-    
+    metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl];
     metadataNet.fileNameLocal = metadata.fileID;
     metadataNet.fileNamePrint = metadata.fileNamePrint;
     metadataNet.options = @"m";
@@ -1227,7 +1221,7 @@
     
     // File do not exists on server, remove in local
     if (errorCode == kOCErrorServerPathNotFound || errorCode == kCFURLErrorBadServerResponse) {
-        [CCCoreData deleteFile:metadata serverUrl:serverUrl directoryUser:app.directoryUser typeCloud:app.typeCloud activeAccount:app.activeAccount];
+        [CCCoreData deleteFile:metadata serverUrl:serverUrl directoryUser:app.directoryUser activeAccount:app.activeAccount];
     }
     
     if ([selector isEqualToString:selectorLoadViewImage]) {
@@ -1383,7 +1377,7 @@
     // download and view a template
     if ([selector isEqualToString:selectorLoadModelView]) {
         
-        [CCCoreData downloadFilePlist:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud directoryUser:app.directoryUser];
+        [CCCoreData downloadFilePlist:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl directoryUser:app.directoryUser];
         
         [self openModel:metadata.model isNew:false];
         
@@ -1393,16 +1387,14 @@
     //download file plist
     if ([selector isEqualToString:selectorLoadPlist]) {
         
-        [CCCoreData downloadFilePlist:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud directoryUser:app.directoryUser];
+        [CCCoreData downloadFilePlist:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl directoryUser:app.directoryUser];
         
         long countSelectorLoadPlist = 0;
         
         for (NSOperation *operation in [app.netQueue operations]) {
             
-            if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-                if ([((OCnetworking *)operation).metadataNet.selector isEqualToString:selectorLoadPlist])
-                    countSelectorLoadPlist++;
-            }
+            if ([((OCnetworking *)operation).metadataNet.selector isEqualToString:selectorLoadPlist])
+                countSelectorLoadPlist++;
         }
         
         if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % k_maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount]]) {
@@ -1553,7 +1545,7 @@
     // remove title (graphics)
     [self setTitleBackgroundTableView:nil];
 
-    NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
     
     // Create if request the folder for Photos
@@ -1619,19 +1611,16 @@
             
             CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
             
-            if ([app.typeCloud isEqualToString:typeCloudNextcloud] || [app.typeCloud isEqualToString:typeCloudOwnCloud]) {
-            
-                metadataNet.action = actionReadFile;
-                metadataNet.identifier = asset.localIdentifier;
-                metadataNet.cryptated = cryptated;
-                metadataNet.fileName = fileName;
-                metadataNet.priority = NSOperationQueuePriorityVeryHigh;
-                metadataNet.session = session;
-                metadataNet.selector = selectorReadFileUploadFile;
-                metadataNet.serverUrl = serverUrl;
+            metadataNet.action = actionReadFile;
+            metadataNet.identifier = asset.localIdentifier;
+            metadataNet.cryptated = cryptated;
+            metadataNet.fileName = fileName;
+            metadataNet.priority = NSOperationQueuePriorityVeryHigh;
+            metadataNet.session = session;
+            metadataNet.selector = selectorReadFileUploadFile;
+            metadataNet.serverUrl = serverUrl;
                 
-                [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-            }
+            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
         }
     }
     
@@ -1809,7 +1798,7 @@
                 metadataDB.sessionTaskIdentifier = k_taskIdentifierDone;
                 metadataDB.sessionTaskIdentifierPlist = k_taskIdentifierDone;
                 
-                [CCCoreData updateMetadata:metadataDB predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, app.activeAccount] activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud context:nil];
+                [CCCoreData updateMetadata:metadataDB predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, app.activeAccount] activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
                 
                 [CCCoreData addLocalFile:metadataDB activeAccount:app.activeAccount];
                 
@@ -1823,7 +1812,7 @@
         }
 
         // end test, insert in CoreData
-        [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud context:nil];
+        [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
     }
     
     // read plist
@@ -2285,7 +2274,7 @@
     fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder hasServerForbiddenCharactersSupport:app.hasServerForbiddenCharactersSupport];
     if (![fileNameFolder length]) return;
     
-    if (folderCameraUpload) metadataNet.serverUrl = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    if (folderCameraUpload) metadataNet.serverUrl = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     else  metadataNet.serverUrl = _serverUrl;
     
     metadataNet.action = actionCreateFolder;
@@ -2746,9 +2735,9 @@
     if([record.account isEqualToString:metadataNet.account] == NO)
         return;
     
-    [CCCoreData updateShare:items sharesLink:app.sharesLink sharesUserAndGroup:app.sharesUserAndGroup activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    [CCCoreData updateShare:items sharesLink:app.sharesLink sharesUserAndGroup:app.sharesUserAndGroup activeAccount:app.activeAccount activeUrl:app.activeUrl];
     
-    if (openWindow && ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])) {
+    if (openWindow) {
             
         if (_shareOC) {
                 
@@ -2803,19 +2792,16 @@
 - (void)share:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+    
+    metadataNet.action = actionShare;
+    metadataNet.fileID = metadata.fileID;
+    metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl];
+    metadataNet.fileNamePrint = metadata.fileNamePrint;
+    metadataNet.password = password;
+    metadataNet.selector = selectorShare;
+    metadataNet.serverUrl = serverUrl;
         
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        metadataNet.action = actionShare;
-        metadataNet.fileID = metadata.fileID;
-        metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl typeCloud:app.typeCloud];
-        metadataNet.fileNamePrint = metadata.fileNamePrint;
-        metadataNet.password = password;
-        metadataNet.selector = selectorShare;
-        metadataNet.serverUrl = serverUrl;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    }
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 
     [_hud visibleHudTitle:NSLocalizedString(@"_creating_sharing_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
 }
@@ -2826,11 +2812,8 @@
     
     // rimuoviamo la condivisione da db
     [CCCoreData unShare:metadataNet.share fileName:metadataNet.fileName serverUrl:metadataNet.serverUrl sharesLink:app.sharesLink sharesUserAndGroup:app.sharesUserAndGroup activeAccount:app.activeAccount];
-        
-    if ([app.typeCloud isEqualToString:typeCloudNextcloud] && _shareOC)
-        [_shareOC reloadData];
-
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] && _shareOC)
+    
+    if (_shareOC)
         [_shareOC reloadData];
     
     [self tableViewReload];
@@ -2857,19 +2840,16 @@
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        metadataNet.action = actionUpdateShare;
-        metadataNet.fileID = metadata.fileID;
-        metadataNet.expirationTime = expirationTime;
-        metadataNet.password = password;
-        metadataNet.selector = selectorUpdateShare;
-        metadataNet.serverUrl = serverUrl;
-        metadataNet.share = share;
-        metadataNet.sharePermission = permission;
+    metadataNet.action = actionUpdateShare;
+    metadataNet.fileID = metadata.fileID;
+    metadataNet.expirationTime = expirationTime;
+    metadataNet.password = password;
+    metadataNet.selector = selectorUpdateShare;
+    metadataNet.serverUrl = serverUrl;
+    metadataNet.share = share;
+    metadataNet.sharePermission = permission;
         
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    }
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 
     [_hud visibleHudTitle:NSLocalizedString(@"_updating_sharing_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
 }
@@ -2892,15 +2872,12 @@
 - (void)getUserAndGroup:(NSString *)find
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+    
+    metadataNet.action = actionGetUserAndGroup;
+    metadataNet.options = find;
+    metadataNet.selector = selectorGetUserAndGroup;
         
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        metadataNet.action = actionGetUserAndGroup;
-        metadataNet.options = find;
-        metadataNet.selector = selectorGetUserAndGroup;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    }
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     
     [_hud visibleIndeterminateHud];
 }
@@ -2912,7 +2889,7 @@
     metadataNet.action = actionShareWith;
     metadataNet.fileID = metadata.fileID;
     metadataNet.directoryID = directoryID;
-    metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl];
     metadataNet.fileNamePrint = metadata.fileNamePrint;
     metadataNet.serverUrl = serverUrl;
     metadataNet.selector = selectorShare;
@@ -3129,7 +3106,7 @@
         
         item.title = [record.account stringByTruncatingToWidth:self.view.bounds.size.width - 100 withFont:[UIFont systemFontOfSize:12.0] atEnd:YES];
         item.argument = record.account;
-        item.image = [UIImage imageNamed:image_typeCloudNextcloud];        
+        item.image = [UIImage imageNamed:image_Nextcloud];
         item.target = self;
         item.action = @selector(changeDefaultAccount:);
         
@@ -3184,7 +3161,7 @@
     
         TableAccount *tableAccount = [CCCoreData setActiveAccount:[sender argument]];
         if (tableAccount)
-            [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password activeUID:tableAccount.uid activeAccessToken:tableAccount.token typeCloud:tableAccount.typeCloud];
+            [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password];
     
         // go to home sweet home
         [[NSNotificationCenter defaultCenter] postNotificationName:@"initializeMain" object:nil];
@@ -4150,7 +4127,7 @@
         
         NSString *dirServerUrl = [CCUtility stringAppendServerUrl:serverUrl addServerUrl:_metadata.fileNameData];
         NSString *upDir = [CCUtility deletingLastPathComponentFromServerUrl:dirServerUrl];
-        NSString *homeDir = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud];
+        NSString *homeDir = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
         
         // Directory bloccata ?
         if ([CCCoreData isDirectoryLock:dirServerUrl activeAccount:app.activeAccount] && [[CCUtility getBlockCode] length] && app.sessionePasscodeLock == nil) lockDirectory = YES;
@@ -4158,7 +4135,7 @@
         iconHeader = [UIImage imageNamed:_metadata.iconName];
 
         NSString *cameraUploadFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
-        NSString *cameraUploadFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+        NSString *cameraUploadFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
         
         
         
@@ -4269,10 +4246,10 @@
                                         [self setEditing:NO animated:YES];
                                         
                                         // Settings new folder Automatatic upload
-                                        NSString *oldPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+                                        NSString *oldPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
                                         
                                         [CCCoreData setCameraUploadFolderName:_metadata.fileName activeAccount:app.activeAccount];
-                                        [CCCoreData setCameraUploadFolderPath:serverUrl activeUrl:app.activeUrl typeCloud:app.typeCloud activeAccount:app.activeAccount];
+                                        [CCCoreData setCameraUploadFolderPath:serverUrl activeUrl:app.activeUrl activeAccount:app.activeAccount];
                                         
                                         [CCCoreData clearDateReadDirectory:oldPath activeAccount:app.activeAccount];
                                         

iOSClient/Move/CCMove.m

@@ -34,9 +34,6 @@
     NSString *activeUrl;
     NSString *activeUser;
     NSString *directoryUser;
-    NSString *typeCloud;
-    NSString *activeUID;
-    NSString *activeAccessToken;
     
     CCHud *_hud;
     BOOL _isCryptoCloudMode;
@@ -60,9 +57,6 @@
         activeUrl = recordAccount.url;
         activeUser = recordAccount.user;
         directoryUser = [CCUtility getDirectoryActiveUser:activeUser activeUrl:activeUrl];
-        typeCloud = recordAccount.typeCloud;
-        activeUID = recordAccount.uid;
-        activeAccessToken = recordAccount.token;
         
         // Crypto Mode
         if ([[CCUtility getKeyChainPasscodeForUUID:[CCUtility getUUID]] length] == 0) {
@@ -94,7 +88,7 @@
 
     if (![_serverUrl length]) {
         
-        _serverUrl = [CCUtility getHomeServerUrlActiveUrl:activeUrl typeCloud:typeCloud];
+        _serverUrl = [CCUtility getHomeServerUrlActiveUrl:activeUrl];
         UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:image_brandNavigationController]];
         [self.navigationController.navigationBar.topItem setTitleView:image];
         self.title = @"Home";
@@ -234,13 +228,10 @@
 
 - (void)addNetworkingQueue:(CCMetadataNet *)metadataNet
 {
-    if ([typeCloud isEqualToString:typeCloudOwnCloud] || [typeCloud isEqualToString:typeCloudNextcloud]) {
+    OCnetworking *operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:activeUser withPassword:activePassword withUrl:activeUrl activityIndicator:NO isCryptoCloudMode:_isCryptoCloudMode];
         
-        OCnetworking *operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:activeUser withPassword:activePassword withUrl:activeUrl withTypeCloud:typeCloud activityIndicator:NO isCryptoCloudMode:_isCryptoCloudMode];
-        
-        _networkingOperationQueue.maxConcurrentOperationCount = k_maxConcurrentOperation;
-        [_networkingOperationQueue addOperation:operation];
-    }
+    _networkingOperationQueue.maxConcurrentOperationCount = k_maxConcurrentOperation;
+    [_networkingOperationQueue addOperation:operation];
 }
 
 // MARK: - Download File
@@ -251,7 +242,7 @@
 
         CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, activeAccount] context:nil];
 
-        [CCCoreData downloadFilePlist:metadata activeAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud directoryUser:directoryUser];
+        [CCCoreData downloadFilePlist:metadata activeAccount:activeAccount activeUrl:activeUrl directoryUser:directoryUser];
         
         [self.tableView reloadData];
     }
@@ -299,7 +290,7 @@
             if (isCryptoComplete == NO) continue;
         }
         
-        [CCCoreData addMetadata:metadata activeAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud context:nil];
+        [CCCoreData addMetadata:metadata activeAccount:activeAccount activeUrl:activeUrl context:nil];
         
         // if plist do not exists, download it !
         if ([CCUtility isCryptoPlistString:metadata.fileName] && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileName]] == NO) {

iOSClient/Networking/CCNetworking.m

@@ -37,12 +37,9 @@
     
     NSString *_activeAccount;
     NSString *_activePassword;
-    NSString *_activeUID;
-    NSString *_activeAccessToken;
     NSString *_activeUser;
     NSString *_activeUrl;
     NSString *_directoryUser;
-    NSString *_typeCloud;
 }
 @end
 
@@ -96,12 +93,9 @@
     
     _activeAccount = tableAccount.account;
     _activePassword = tableAccount.password;
-    _activeUID = tableAccount.uid;
-    _activeAccessToken = tableAccount.token;
     _activeUser = tableAccount.user;
     _activeUrl = tableAccount.url;
     _directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
-    _typeCloud = tableAccount.typeCloud;
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -422,14 +416,11 @@
     
     if ([task isKindOfClass:[NSURLSessionDownloadTask class]]) {
         
-        if ([_typeCloud isEqualToString:typeCloudOwnCloud] || [_typeCloud isEqualToString:typeCloudNextcloud]) {
+        NSDictionary *fields = [httpResponse allHeaderFields];
             
-            NSDictionary *fields = [httpResponse allHeaderFields];
-            
-            if (errorCode == 0) {
-                rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
-                date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
-            }
+        if (errorCode == 0) {
+            rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
+            date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -446,15 +437,12 @@
     
     if ([task isKindOfClass:[NSURLSessionUploadTask class]]) {
         
-        if ([_typeCloud isEqualToString:typeCloudOwnCloud] || [_typeCloud isEqualToString:typeCloudNextcloud]) {
-            
-            NSDictionary *fields = [httpResponse allHeaderFields];
+        NSDictionary *fields = [httpResponse allHeaderFields];
             
-            if (errorCode == 0) {
-                fileID = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-FileId"] hasServerForbiddenCharactersSupport:NO];
-                rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
-                date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
-            }
+        if (errorCode == 0) {
+            fileID = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-FileId"] hasServerForbiddenCharactersSupport:NO];
+            rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
+            date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -531,17 +519,14 @@
     NSURL *url;
     NSMutableURLRequest *request;
     
-    if ([_typeCloud isEqualToString:typeCloudNextcloud] || [_typeCloud isEqualToString:typeCloudOwnCloud]) {
-        
-        NSString *serverFileUrl = [[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *serverFileUrl = [[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         
-        url = [NSURL URLWithString:serverFileUrl];
-        request = [NSMutableURLRequest requestWithURL:url];
+    url = [NSURL URLWithString:serverFileUrl];
+    request = [NSMutableURLRequest requestWithURL:url];
         
-        NSData *authData = [[NSString stringWithFormat:@"%@:%@", _activeUser, _activePassword] dataUsingEncoding:NSUTF8StringEncoding];
-        NSString *authValue = [NSString stringWithFormat: @"Basic %@",[authData base64EncodedStringWithOptions:0]];
-        [request setValue:authValue forHTTPHeaderField:@"Authorization"];
-    }
+    NSData *authData = [[NSString stringWithFormat:@"%@:%@", _activeUser, _activePassword] dataUsingEncoding:NSUTF8StringEncoding];
+    NSString *authValue = [NSString stringWithFormat: @"Basic %@",[authData base64EncodedStringWithOptions:0]];
+    [request setValue:authValue forHTTPHeaderField:@"Authorization"];
     
     if ([session isEqualToString:k_download_session]) sessionDownload = [self sessionDownload];
     else if ([session isEqualToString:k_download_session_foreground]) sessionDownload = [self sessionDownloadForeground];
@@ -840,7 +825,7 @@
     
     // create Metadata
     NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_activeAccount];
-    NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud];
+    NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_activeAccount activeUrl:_activeUrl];
     
     CCMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     
@@ -866,10 +851,9 @@
         metadata.sessionID = uploadID;
         metadata.sessionSelector = selector;
         metadata.sessionSelectorPost = selectorPost;
-        metadata.typeCloud = _typeCloud;
         metadata.typeFile = k_metadataTypeFile_unknown;
         
-        [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+        [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
         
         [self uploadURLSession:fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist selector:selector];
     }
@@ -897,10 +881,9 @@
             metadata.sessionID = uploadID;
             metadata.sessionSelector = selector;
             metadata.sessionSelectorPost = selectorPost;
-            metadata.typeCloud = _typeCloud;
             metadata.typeFile = k_metadataTypeFile_template;
             
-            [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+            [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
             
             // DATA
             [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist selector:selector];
@@ -958,7 +941,6 @@
             metadata.sessionID = uploadID;
             metadata.sessionSelector = selector;
             metadata.sessionSelectorPost = selectorPost;
-            metadata.typeCloud = _typeCloud;
             metadata.title = [self getTitleFromPlistName:fileNameCrypto];
             metadata.type = k_metadataType_file;
             
@@ -986,7 +968,7 @@
                     
                     // -- remove record --
                     CCMetadata *metadataDelete = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (directoryID == %@)", _activeAccount, [fileNameCrypto stringByAppendingString:@".plist"], directoryID] context:nil];
-                    [CCCoreData deleteFile:metadataDelete serverUrl:serverUrl directoryUser:_directoryUser typeCloud:_typeCloud activeAccount:_activeAccount];
+                    [CCCoreData deleteFile:metadataDelete serverUrl:serverUrl directoryUser:_directoryUser activeAccount:_activeAccount];
                     
 #ifndef EXTENSION
                     [CCGraphics createNewImageFrom:fileName directoryUser:_directoryUser fileNameTo:uploadID fileNamePrint:fileName size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
@@ -995,7 +977,7 @@
                     if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                         [crypto addPlistImage:[NSString stringWithFormat:@"%@/%@", _directoryUser, [fileNameCrypto stringByAppendingString:@".plist"]] fileNamePathImage:[NSTemporaryDirectory() stringByAppendingString:uploadID]];
                     
-                    [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+                    [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
                     
                     // DATA
                     [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist selector:selector];
@@ -1024,7 +1006,7 @@
                 if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                     [crypto addPlistImage:[NSString stringWithFormat:@"%@/%@", _directoryUser, [fileNameCrypto stringByAppendingString:@".plist"]] fileNamePathImage:[NSTemporaryDirectory() stringByAppendingString:uploadID]];
                 
-                [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+                [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
                 
                 // DATA
                 [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist selector:selector];
@@ -1050,7 +1032,6 @@
         metadata.sessionSelector = selector;
         metadata.sessionSelectorPost = selectorPost;
         metadata.type = k_metadataType_file;
-        metadata.typeCloud = _typeCloud;
         
         // File exists ???
         if (errorCode == 403) {
@@ -1077,12 +1058,12 @@
                 
                 // -- remove record --
                 CCMetadata *metadataDelete = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (directoryID == %@)", _activeAccount, fileName, directoryID] context:nil];
-                [CCCoreData deleteFile:metadataDelete serverUrl:serverUrl directoryUser:_directoryUser typeCloud:_typeCloud activeAccount:_activeAccount];
+                [CCCoreData deleteFile:metadataDelete serverUrl:serverUrl directoryUser:_directoryUser activeAccount:_activeAccount];
                 
                 // -- Go to Upload --
                 [CCGraphics createNewImageFrom:metadata.fileNamePrint directoryUser:_directoryUser fileNameTo:metadata.fileID fileNamePrint:metadata.fileNamePrint size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
                 
-                [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+                [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
                 
                 [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist selector:selector];
             }];
@@ -1105,7 +1086,7 @@
 #ifndef EXTENSION
             [CCGraphics createNewImageFrom:metadata.fileNamePrint directoryUser:_directoryUser fileNameTo:metadata.fileID fileNamePrint:metadata.fileNamePrint size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
 #endif
-            [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+            [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
             
             [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist selector:selector];
         }
@@ -1165,18 +1146,15 @@
     NSURL *url;
     NSMutableURLRequest *request;
     
-    if ([_typeCloud isEqualToString:typeCloudNextcloud] || [_typeCloud isEqualToString:typeCloudOwnCloud]) {
-        
-        NSString *fileNamePath = [[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *fileNamePath = [[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         
-        url = [NSURL URLWithString:fileNamePath];
-        request = [NSMutableURLRequest requestWithURL:url];
+    url = [NSURL URLWithString:fileNamePath];
+    request = [NSMutableURLRequest requestWithURL:url];
         
-        NSData *authData = [[NSString stringWithFormat:@"%@:%@", _activeUser, _activePassword] dataUsingEncoding:NSUTF8StringEncoding];
-        NSString *authValue = [NSString stringWithFormat: @"Basic %@",[authData base64EncodedStringWithOptions:0]];
-        [request setHTTPMethod:@"PUT"];
-        [request setValue:authValue forHTTPHeaderField:@"Authorization"];
-    }
+    NSData *authData = [[NSString stringWithFormat:@"%@:%@", _activeUser, _activePassword] dataUsingEncoding:NSUTF8StringEncoding];
+    NSString *authValue = [NSString stringWithFormat: @"Basic %@",[authData base64EncodedStringWithOptions:0]];
+    [request setHTTPMethod:@"PUT"];
+    [request setValue:authValue forHTTPHeaderField:@"Authorization"];
     
     // Rename with the SessionID
     NSString *fileNameForUpload;
@@ -1352,7 +1330,7 @@
         // copy ico in new fileID
         [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, sessionID] toPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, fileID]];
         
-        [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+        [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
     }
     
     // CRYPTO
@@ -1360,7 +1338,7 @@
         
         metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         
-        [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+        [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
     }
     
     // ALL TASK DONE (PLAIN/CRYPTO)
@@ -1377,7 +1355,7 @@
         metadata.sessionError = @"";
         metadata.sessionID = @"";
         
-        [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
+        [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
         
         // rename file sessionID -> fileID
         [CCUtility moveFileAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, sessionID]  toPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]];
@@ -1715,10 +1693,7 @@
 {
     NSString *fileName = [url lastPathComponent];
     
-    if ([_typeCloud isEqualToString:typeCloudOwnCloud] || [_typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        url = [url stringByReplacingOccurrencesOfString:[@"/" stringByAppendingString:fileName] withString:@""];
-    }
+    url = [url stringByReplacingOccurrencesOfString:[@"/" stringByAppendingString:fileName] withString:@""];
 
     return url;
 }

iOSClient/Networking/OCNetworking.h

@@ -35,7 +35,7 @@
 
 @interface OCnetworking : NSOperation <CCNetworkingDelegate>
 
-- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl withTypeCloud:(NSString *)withTypeCloud activityIndicator:(BOOL)activityIndicator isCryptoCloudMode:(BOOL)isCryptoCloudMode;
+- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl activityIndicator:(BOOL)activityIndicator isCryptoCloudMode:(BOOL)isCryptoCloudMode;
 
 @property (nonatomic, weak) id <OCNetworkingDelegate> delegate;
 

iOSClient/Networking/OCNetworking.m

@@ -35,7 +35,6 @@
     NSString *_activeUser;
     NSString *_activePassword;
     NSString *_activeUrl;
-    NSString *_typeCloud;
     
     NSURLSessionDownloadTask *_downloadTask;
     NSURLSessionUploadTask *_uploadTask;
@@ -48,7 +47,7 @@
 
 @implementation OCnetworking
 
-- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl withTypeCloud:(NSString *)withTypeCloud activityIndicator:(BOOL)activityIndicator isCryptoCloudMode:(BOOL)isCryptoCloudMode
+- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl activityIndicator:(BOOL)activityIndicator isCryptoCloudMode:(BOOL)isCryptoCloudMode
 {
     self = [super init];
     
@@ -62,7 +61,6 @@
         _activeUser = withUser;
         _activePassword = withPassword;
         _activeUrl = withUrl;
-        _typeCloud = withTypeCloud;
         
         _isCryptoCloudMode = isCryptoCloudMode;
         _activityIndicator = activityIndicator;
@@ -268,7 +266,7 @@
     }
 
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication getRemoteThumbnailByServer:[_activeUrl stringByAppendingString:@"/"] ofFilePath:_metadataNet.fileName withWidth:width andHeight:height onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSData *thumbnail, NSString *redirectedServer) {
         
@@ -309,7 +307,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication readFolder:_metadataNet.serverUrl withUserSessionToken:nil onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer, NSString *token) {
         
@@ -342,14 +340,14 @@
         NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl date:date permissions:permissions activeAccount:_metadataNet.account];
             
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
-        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl typeCloud:_typeCloud];
+        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
         NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
         // Update metadataNet.directoryID
         _metadataNet.directoryID = directoryID;
         
 #ifndef EXTENSION
-        NSString *root = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
+        NSString *root = [CCUtility getHomeServerUrlActiveUrl:_activeUrl];
         
         if ([root isEqualToString:_metadataNet.serverUrl]) {
             
@@ -395,12 +393,12 @@
                 // Starting with [itemDto.fileName.lowercaseString hasPrefix:_metadataNet.fileName.lowercaseString]
                 if ([_metadataNet.selector isEqualToString:selectorSearch] && [itemDto.fileName.lowercaseString containsString:_metadataNet.fileName.lowercaseString]) {
                     
-                    [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser typeCloud:_typeCloud]];
+                    [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
                 }
                 
                 if ([_metadataNet.selector isEqualToString:selectorReadFolder]) {
                     
-                    [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser typeCloud:_typeCloud]];
+                    [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
                 }
             }
             
@@ -448,7 +446,7 @@
     NSString *nameFolderURL = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication createFolder:nameFolderURL onCommunication:communication withForbiddenCharactersSupported:_hasServerForbiddenCharactersSupport successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -461,7 +459,7 @@
         
         NSString *message;
         
-        if (([_metadataNet.fileName isEqualToString:[CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account]] == YES && [_metadataNet.serverUrl isEqualToString:[CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl typeCloud:_typeCloud]] == YES))
+        if (([_metadataNet.fileName isEqualToString:[CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account]] == YES && [_metadataNet.serverUrl isEqualToString:[CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl]] == YES))
             message = nil;
         else
             message = [CCError manageErrorOC:response.statusCode error:error];
@@ -483,7 +481,7 @@
         
          NSString *message;
         
-        if (([_metadataNet.fileName isEqualToString:[CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account]] == YES && [_metadataNet.serverUrl isEqualToString:[CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl typeCloud:_typeCloud]] == YES))
+        if (([_metadataNet.fileName isEqualToString:[CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account]] == YES && [_metadataNet.serverUrl isEqualToString:[CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl]] == YES))
             message = nil;
         else {
             
@@ -508,7 +506,7 @@
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication createFolder:folderPathName onCommunication:communication withForbiddenCharactersSupported:_hasServerForbiddenCharactersSupport successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -547,7 +545,7 @@
     NSString *serverFileUrl = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication deleteFileOrFolder:serverFileUrl onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -585,7 +583,7 @@
     NSString *destinazioneURL = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrlTo, _metadataNet.fileNameTo];
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication moveFileOrFolder:origineURL toDestiny:destinazioneURL onCommunication:communication withForbiddenCharactersSupported:_hasServerForbiddenCharactersSupport successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -649,7 +647,7 @@
         fileName = _metadataNet.serverUrl;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication readFile:fileName onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer) {
         
@@ -664,13 +662,13 @@
             
             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];
+            NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
-            metadata = [CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:_metadataNet.fileNamePrint serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser typeCloud:_typeCloud];
+            metadata = [CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:_metadataNet.fileNamePrint serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser];
             
 #ifndef EXTENSION
-            NSString *root = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
+            NSString *root = [CCUtility getHomeServerUrlActiveUrl:_activeUrl];
             
             if ([root isEqualToString:fileName]) {
                 
@@ -722,7 +720,7 @@
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
 
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication readFile:filePathName onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer) {
         
@@ -762,7 +760,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication readSharedByServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer) {
         
@@ -811,7 +809,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
         
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication shareFileOrFolderByServer:[_activeUrl stringByAppendingString:@"/"] andFileOrFolderPath:[_metadataNet.fileName encodeString:NSUTF8StringEncoding] andPassword:[_metadataNet.password encodeString:NSUTF8StringEncoding] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *token, NSString *redirectedServer) {
         
@@ -841,7 +839,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication shareWith:_metadataNet.share shareeType:_metadataNet.shareeType inServer:[_activeUrl stringByAppendingString:@"/"] andFileOrFolderPath:[_metadataNet.fileName encodeString:NSUTF8StringEncoding] andPermissions:_metadataNet.sharePermission onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -869,7 +867,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication updateShare:[_metadataNet.share intValue] ofServerPath:[_activeUrl stringByAppendingString:@"/"] withPasswordProtect:[_metadataNet.password encodeString:NSUTF8StringEncoding] andExpirationTime:_metadataNet.expirationTime andPermissions:_metadataNet.sharePermission onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -901,7 +899,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication unShareFileOrFolderByServer:[_activeUrl stringByAppendingString:@"/"] andIdRemoteShared:[_metadataNet.share intValue] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -936,7 +934,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication searchUsersAndGroupsWith:_metadataNet.options forPage:1 with:50 ofServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *itemList, NSString *redirectedServer) {
         
@@ -971,7 +969,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication getNotificationsOfServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *listOfNotifications, NSString *redirectedServer) {
         
@@ -1002,7 +1000,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     NSString *type = _metadataNet.options;
     
@@ -1042,7 +1040,7 @@
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication checkServer:serverUrl onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
@@ -1070,7 +1068,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [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) {
         
@@ -1103,7 +1101,7 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent:_typeCloud]];
+    [communication setUserAgent:[CCUtility getUserAgent]];
     
     [communication getCapabilitiesOfServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, OCCapabilities *capabilities, NSString *redirectedServer) {
         

iOSClient/Offline/CCOfflineFileFolder.m

@@ -194,7 +194,7 @@
             // delete metadata not present
             for (CCMetadata *metadata in metadatasNotPresents) {
                 
-                [CCCoreData deleteFile:metadata serverUrl:metadataNet.serverUrl directoryUser:app.directoryUser typeCloud:app.typeCloud activeAccount:app.activeAccount];
+                [CCCoreData deleteFile:metadata serverUrl:metadataNet.serverUrl directoryUser:app.directoryUser activeAccount:app.activeAccount];
             }
             
             if ([metadatasNotPresents count] > 0)
@@ -213,7 +213,7 @@
                     
                     NSString *dir = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addServerUrl:metadata.fileNameData];
                     
-                    [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud context:nil];
+                    [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
                     
                     [[CCOfflineFileFolder sharedOfflineFileFolder] addOfflineFolder:dir];
 
@@ -278,7 +278,7 @@
 
 - (void)readFileOffline
 {
-    if (app.activeAccount == nil || [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud] == nil)
+    if (app.activeAccount == nil || [CCUtility getHomeServerUrlActiveUrl:app.activeUrl] == nil)
         return;
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
@@ -417,7 +417,7 @@
                 selector = selectorLoadPlist;
             }
         
-            [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:serverUrl typeCloud:app.typeCloud context:nil];
+            [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:serverUrl context:nil];
         
             CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
             

iOSClient/Offline/CCOfflinePageContent.m

@@ -384,7 +384,7 @@
     if ([_pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
-        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
         
         metadata = [CCUtility insertFileSystemInMetadata:[dataSource objectAtIndex:indexPath.row] directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     }
@@ -486,7 +486,7 @@
     if ([_pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
-        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
         
         metadata = [CCUtility insertFileSystemInMetadata:[dataSource objectAtIndex:indexPath.row] directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
         
@@ -713,7 +713,7 @@
     if ([self.pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
-        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
         
         for (NSString *fileName in dataSource) {
             

iOSClient/PeekPop/CCPeekPop.m

@@ -110,10 +110,7 @@
     
     metadataNet.action = actionDownloadThumbnail;
     metadataNet.fileID = metadata.fileID;
-    
-    if ([metadata.typeCloud isEqualToString:typeCloudOwnCloud] || [metadata.typeCloud isEqualToString:typeCloudNextcloud])
-        metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl];
-    
+    metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl];
     metadataNet.fileNameLocal = metadata.fileID;
     metadataNet.fileNamePrint = metadata.fileNamePrint;
     metadataNet.options = @"l";
@@ -126,7 +123,7 @@
 
 - (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl
 {
-    NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud] withString:@""], metadataFileName];
+    NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl] withString:@""], metadataFileName];
     
     if ([fileName hasPrefix:@"/"]) fileName = [fileName substringFromIndex:1];
     

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -519,7 +519,7 @@
     if (app.activeAccount == nil || app.activeUrl == nil) return;
     
     
-    NSString *serverUrl = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    NSString *serverUrl = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
 
     // datasource
     NSArray *recordsTableMetadata = [CCCoreData getRecordsTableMetadataPhotosCameraUpload:serverUrl activeAccount:app.activeAccount];
@@ -1063,7 +1063,7 @@
     // STOP new request : initStateCameraUpload
     _AutomaticCameraUploadInProgress = YES;
     
-    NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     
     // verify/create folder Camera Upload, if error exit
     if(![self createFolder:folderPhotos]) {
@@ -1111,7 +1111,7 @@
 {
     NSMutableArray *newItemsPHAssetToUpload = [[NSMutableArray alloc] init];
     
-    NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
+    NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     BOOL createSubfolders = [CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount];
     
     // Conversion from ALAsset -to-> PHAsset
@@ -1209,23 +1209,19 @@
 - (BOOL)createFolder:(NSString *)folderPathName
 {
     OCnetworking *ocNet;
-    
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-        
-        NSError *error;
+    NSError *error;
         
-        ocNet = [[OCnetworking alloc] initWithDelegate:self metadataNet:nil withUser:app.activeUser withPassword:app.activePassword withUrl:app.activeUrl withTypeCloud:app.typeCloud activityIndicator:NO isCryptoCloudMode:app.isCryptoCloudMode];
+    ocNet = [[OCnetworking alloc] initWithDelegate:self metadataNet:nil withUser:app.activeUser withPassword:app.activePassword withUrl:app.activeUrl activityIndicator:NO isCryptoCloudMode:app.isCryptoCloudMode];
     
-        error = [ocNet readFileSync:folderPathName];
-        if(!error)
-            return YES;
+    error = [ocNet readFileSync:folderPathName];
+    if(!error)
+        return YES;
         
-        error = [ocNet createFolderSync:folderPathName];
-        if (!error) {
+    error = [ocNet createFolderSync:folderPathName];
+    if (!error) {
         
-            [CCCoreData clearDateReadDirectory:[CCUtility deletingLastPathComponentFromServerUrl:folderPathName] activeAccount:app.activeAccount];
-            return YES;
-        }
+        [CCCoreData clearDateReadDirectory:[CCUtility deletingLastPathComponentFromServerUrl:folderPathName] activeAccount:app.activeAccount];
+        return YES;
     }
     
     return NO;

iOSClient/Settings/CCManageAccount.m

@@ -170,14 +170,11 @@
     [app cancelAllOperations];
     [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
     
-    if ([app.typeCloud isEqualToString:typeCloudNextcloud] || [app.typeCloud isEqualToString:typeCloudOwnCloud]) {
-        
-        CCLogin *loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier: @"CCLoginNextcloud"];
-        loginVC.delegate = self;
-        loginVC.loginType = loginModifyPasswordUser;
+    CCLogin *loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier: @"CCLoginNextcloud"];
+    loginVC.delegate = self;
+    loginVC.loginType = loginModifyPasswordUser;
         
-        [self presentViewController:loginVC animated:YES completion:nil];
-    }
+    [self presentViewController:loginVC animated:YES completion:nil];
     
     [self UpdateForm];
 }
@@ -204,7 +201,7 @@
         [self deleteAccount:accountNow];
         
         // Clear active user
-        [app settingActiveAccount:nil activeUrl:nil activeUser:nil activePassword:nil activeUID:nil activeAccessToken:nil typeCloud:nil];
+        [app settingActiveAccount:nil activeUrl:nil activeUser:nil activePassword:nil];
         
         listAccount = [CCCoreData getAllAccount];
         
@@ -262,7 +259,7 @@
     // change account
     TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
     if (tableAccount)
-        [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password activeUID:tableAccount.uid activeAccessToken:tableAccount.token typeCloud:tableAccount.typeCloud];
+        [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password];
  
     // Init home
     [[NSNotificationCenter defaultCenter] postNotificationName:@"initializeMain" object:nil];

iOSClient/Settings/CCManageCameraUpload.m

@@ -209,14 +209,14 @@
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
                         
             // Create Folder cameraUpload
-            if (([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) && app.activeMain)
+            if (app.activeMain)
                 [app.activeMain createFolderCameraUpload];
             
             [CCCoreData setCameraUpload:YES activeAccount:app.activeAccount];
             
             // Default
             [CCCoreData setCameraUploadFolderName:nil activeAccount:app.activeAccount];
-            [CCCoreData setCameraUploadFolderPath:nil activeUrl:app.activeUrl typeCloud:app.typeCloud activeAccount:app.activeAccount];
+            [CCCoreData setCameraUploadFolderPath:nil activeUrl:app.activeUrl activeAccount:app.activeAccount];
             
             // verifichiamo che almeno uno dei servizi (foto video) siano attivi, in caso contrario attiviamo le foto
             if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount] == NO && [CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount] == NO)

iOSClient/Settings/CCSettings.m

@@ -367,9 +367,7 @@
     if ([CCUtility getSimplyBlockCode]) [rowSimplyPasscode setValue:@1]; else [rowSimplyPasscode setValue:@0];
     if ([CCUtility getOnlyLockDir]) [rowOnlyLockDir setValue:@1]; else [rowOnlyLockDir setValue:@0];
     
-    if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
-        rowVersionServer.value =  [CCNetworking sharedNetworking].sharedOCCommunication.getCurrentServerVersion;
-    
+    rowVersionServer.value =  [CCNetworking sharedNetworking].sharedOCCommunication.getCurrentServerVersion;
     rowUrlCloud.value = app.activeUrl;
     rowUserNameCloud.value = app.activeUser;
     

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -41,7 +41,7 @@
     self.navigationItem.rightBarButtonItem.title = NSLocalizedString(@"_cancel_", nil);
     self.title = [CCUtility localizableBrand:@"_crypto_cloud_upload_" table:nil];
     
-    serverUrlLocal= [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud];
+    serverUrlLocal= [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
     destinationTitle = NSLocalizedString(@"_home_", nil);
 }
 

iOSClient/Utility/CCUtility.h

@@ -123,7 +123,7 @@
 
 // ===== Varius =====
 
-+ (NSString *)getUserAgent:(NSString *)typeCloud;
++ (NSString *)getUserAgent;
 
 + (NSString *)dateDiff:(NSDate *) convertedDate;
 + (NSString *)transformedSize:(double)value;
@@ -134,7 +134,7 @@
 + (NSString *)createID;
 + (NSString *)createFileNameFromAsset:(PHAsset *)asset key:(NSString *)key;
 
-+ (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
++ (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl;
 + (NSString *)getDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;
 + (NSString *)getOLDDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;
 + (NSString *)getDirectoryLocal;
@@ -147,7 +147,7 @@
 + (void)removeAllFileID_UPLOAD_ActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;
 
 + (NSString *)deletingLastPathComponentFromServerUrl:(NSString *)serverUrl;
-+ (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
++ (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl;
 
 + (void)sendMailEncryptPass:(NSString *)recipient validateEmail:(BOOL)validateEmail form:(id)form;
 
@@ -157,7 +157,7 @@
 
 // ===== CCMetadata =====
 
-+ (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser typeCloud:(NSString *)typeCloud;
++ (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser;
 
 + (void)insertTypeFileIconName:(CCMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
 + (void)insertInformationPlist:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser;

iOSClient/Utility/CCUtility.m

@@ -378,16 +378,10 @@
 #pragma mark ===== Varius =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (NSString *)getUserAgent:(NSString *)typeCloud
++ (NSString *)getUserAgent
 {
     NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
     
-    if ([typeCloud isEqualToString:typeCloudOwnCloud])
-        return [NSString stringWithFormat:@"%@%@",@"Mozilla/5.0 (iOS) CryptoCloud-iOS/",appVersion];
-    
-    if ([typeCloud isEqualToString:typeCloudNextcloud])
-        return [NSString stringWithFormat:@"%@%@",@"Mozilla/5.0 (iOS) Nextcloud-iOS/",appVersion];
-    
     return [NSString stringWithFormat:@"%@%@",@"Mozilla/5.0 (iOS) Nextcloud-iOS/",appVersion];
 }
 
@@ -525,16 +519,11 @@
     return fileName;
 }
 
-+ (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
++ (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl
 {
-    if (activeUrl == nil || typeCloud == nil) return nil;
-    
-    NSString *home;
-        
-    if ([typeCloud isEqualToString:typeCloudOwnCloud] || [typeCloud isEqualToString:typeCloudNextcloud])
-        home = [activeUrl stringByAppendingString:webDAV];
+    if (activeUrl == nil) return nil;
     
-    return home;
+    return [activeUrl stringByAppendingString:webDAV];
 }
 
 // Return path of User Crypto Cloud / <user dir>
@@ -677,9 +666,9 @@
     return [pather substringToIndex: [pather length] - 1];
 }
 
-+ (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
++ (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl
 {
-    NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:activeUrl typeCloud:typeCloud] withString:@""], metadataFileName];
+    NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:activeUrl] withString:@""], metadataFileName];
     
     if ([fileName hasPrefix:@"/"]) fileName = [fileName substringFromIndex:1];
     
@@ -770,7 +759,7 @@
 #pragma mark ===== CCMetadata =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser typeCloud:(NSString *)typeCloud
++ (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser
 {
     CCMetadata *metadata = [[CCMetadata alloc] init];
     
@@ -796,7 +785,6 @@
     metadata.title = @"";
     metadata.type = k_metadataType_file;
     metadata.typeFile = @"";
-    metadata.typeCloud = typeCloud;
     metadata.uuid = [CCUtility getUUID];
     
     switch ([self getTypeFileName:metadata.fileName]) {
@@ -837,15 +825,13 @@
         NSString *ext = (__bridge NSString *)fileExtension;
         ext = ext.uppercaseString;
         
-        // thumbnailExists for typeCloudOwnCloud
-        if ([metadata.typeCloud isEqualToString:typeCloudOwnCloud] || [metadata.typeCloud isEqualToString:typeCloudNextcloud]) {
+        // thumbnailExists
             
-            
-            if([ext isEqualToString:@"JPG"] || [ext isEqualToString:@"PNG"] || [ext isEqualToString:@"JPEG"] || [ext isEqualToString:@"GIF"] || [ext isEqualToString:@"BMP"] || [ext isEqualToString:@"MP3"]  || [ext isEqualToString:@"MOV"]  || [ext isEqualToString:@"MP4"]  || [ext isEqualToString:@"M4V"] || [ext isEqualToString:@"3GP"])
-                metadata.thumbnailExists = YES;
-            else
-                metadata.thumbnailExists = NO;
-        }
+        if([ext isEqualToString:@"JPG"] || [ext isEqualToString:@"PNG"] || [ext isEqualToString:@"JPEG"] || [ext isEqualToString:@"GIF"] || [ext isEqualToString:@"BMP"] || [ext isEqualToString:@"MP3"]  || [ext isEqualToString:@"MOV"]  || [ext isEqualToString:@"MP4"]  || [ext isEqualToString:@"M4V"] || [ext isEqualToString:@"3GP"])
+            metadata.thumbnailExists = YES;
+        else
+            metadata.thumbnailExists = NO;
+        
         // if wrong code, icon protect
         if (metadata.errorPasscode) {
             metadata.typeFile = k_metadataTypeFile_unknown;

iOSClient/cryptocloud.xcdatamodeld/cryptocloud 7.xcdatamodel/contents

@@ -21,9 +21,6 @@
         <attribute name="dateRecord" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="optimization" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="password" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="token" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="typeCloud" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="uid" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="url" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="user" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
@@ -113,7 +110,6 @@
         <attribute name="thumbnailExists" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="type" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="typeCloud" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="typeFile" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
@@ -126,13 +122,13 @@
         <attribute name="shareUserAndGroup" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
     <elements>
-        <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="420"/>
+        <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="373"/>
         <element name="TableAutomaticUpload" positionX="-6597" positionY="801" width="128" height="180"/>
         <element name="TableCertificates" positionX="-6597" positionY="711" width="128" height="75"/>
         <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="240"/>
         <element name="TableGPS" positionX="-6597" positionY="990" width="128" height="180"/>
         <element name="TableLocalFile" positionX="-6138" positionY="111" width="162" height="240"/>
-        <element name="TableMetadata" positionX="-6138" positionY="402" width="162" height="525"/>
+        <element name="TableMetadata" positionX="-6138" positionY="402" width="162" height="508"/>
         <element name="TableShare" positionX="-6597" positionY="558" width="128" height="135"/>
     </elements>
 </model>