clear code

PickerFileProvider/FileProviderData.swift

@@ -36,7 +36,6 @@ class FileProviderData: NSObject {
     var directoryUser = ""
     
     // Directory
-    var groupURL: URL?
     var fileProviderStorageURL: URL?
     
     // metadata Selector Post

PickerFileProvider/FileProviderExtension.swift

@@ -70,8 +70,8 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         super.init()
         
         // Get group directiry
-        providerData.groupURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.sharedInstance.capabilitiesGroups)
-        providerData.fileProviderStorageURL = providerData.groupURL!.appendingPathComponent(k_assetLocalIdentifierFileProviderStorage)
+        let groupURL = CCUtility.getDirectoryGroup()!
+        providerData.fileProviderStorageURL = groupURL.appendingPathComponent(k_DirectoryProviderStorage)
         
         // Create directory File Provider Storage
         do {

iOSClient/AppDelegate.m

@@ -101,7 +101,7 @@
     }
 
     NSString *dir;
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
+    NSURL *dirGroup = [CCUtility getDirectoryGroup];
     
     NSLog(@"[LOG] Start program group -----------------");
     NSLog(@"%@", dirGroup);    

iOSClient/CCGlobal.h

@@ -285,7 +285,7 @@ extern NSString *const flowEndpoint;
 #define k_flow_version_available                        12
 
 //
-#define k_assetLocalIdentifierFileProviderStorage       @"File Provider Storage"
+#define k_DirectoryProviderStorage                      @"File Provider Storage"
 
 
 // -----------------------------------------------------------------------------------------------------------

iOSClient/Settings/CCAdvanced.m

@@ -527,8 +527,7 @@
 - (void)emptyGroupFileProviderStorage
 {
     NSString *file;
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
-    NSString *dirIniziale = [[dirGroup URLByAppendingPathComponent:k_assetLocalIdentifierFileProviderStorage] path];
+    NSString *dirIniziale = [CCUtility getDirectoryProviderStorage];
     
     NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
     
@@ -539,7 +538,7 @@
 - (void)emptyGroupApplicationSupport
 {
     NSString *file;
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
+    NSURL *dirGroup = [CCUtility getDirectoryGroup];
     NSString *dirIniziale = [[dirGroup URLByAppendingPathComponent:appApplicationSupport] path];
     
     NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];

iOSClient/Utility/CCUtility.h

@@ -164,12 +164,14 @@
 + (NSString *)createRandomString:(int)numChars;
 + (NSString *)createFileName:fileName fileDate:(NSDate *)fileDate fileType:(PHAssetMediaType)fileType keyFileName:(NSString *)keyFileName keyFileNameType:(NSString *)keyFileNameType;
 
++ (NSURL *)getDirectoryGroup;
 + (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl;
 + (NSString *)getDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;
-+ (NSString *)getOLDDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;
 + (NSString *)getDirectoryDocuments;
 + (NSString *)getDirectoryAudio;
 + (NSString *)getDirectoryCerificates;
++ (NSString *)getDirectoryProviderStorage;
+
 + (NSString *)getTitleSectionDate:(NSDate *)date;
 
 + (void)moveFileAtPath:(NSString *)atPath toPath:(NSString *)toPath;

iOSClient/Utility/CCUtility.m

@@ -733,6 +733,12 @@
     return fileName;
 }
 
++ (NSURL *)getDirectoryGroup
+{
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
+    return dirGroup;
+}
+
 + (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl
 {
     if (activeUrl == nil) return nil;
@@ -743,7 +749,7 @@
 // Return path of User
 + (NSString *)getDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl
 {
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
+    NSURL *dirGroup = [CCUtility getDirectoryGroup];
     NSString *user = activeUser;
     NSString *baseUrl = [activeUrl lowercaseString];
     NSString *dirUserBaseUrl = nil;
@@ -768,27 +774,6 @@
     return dirUserBaseUrl;
 }
 
-+ (NSString *)getOLDDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl
-{
-    NSString *user = activeUser;
-    NSString *baseUrl = [activeUrl lowercaseString];
-    NSString *dirUserBaseUrl = nil;
-    
-    if ([user length] && [baseUrl length]) {
-        
-        if ([baseUrl hasPrefix:@"https://"]) baseUrl = [baseUrl substringFromIndex:8];
-        if ([baseUrl hasPrefix:@"http://"]) baseUrl = [baseUrl substringFromIndex:7];
-        
-        dirUserBaseUrl = [NSString stringWithFormat:@"%@-%@", user, baseUrl];
-        dirUserBaseUrl = [[self removeForbiddenCharactersFileSystem:dirUserBaseUrl] lowercaseString];
-    } else return @"";
-    
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-    dirUserBaseUrl = [NSString stringWithFormat:@"%@/%@", [paths objectAtIndex:0], dirUserBaseUrl];
-    
-    return dirUserBaseUrl;
-}
-
 // Return the path of directory Documents -> NSDocumentDirectory
 + (NSString *)getDirectoryDocuments
 {
@@ -808,7 +793,7 @@
 // Return the path of directory Cetificates
 + (NSString *)getDirectoryCerificates
 {
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
+    NSURL *dirGroup = [CCUtility getDirectoryGroup];
     
     NSString *dir = [[dirGroup URLByAppendingPathComponent:appCertificates] path];
     if (![[NSFileManager defaultManager] fileExistsAtPath:dir])
@@ -817,6 +802,14 @@
     return dir;
 }
 
++ (NSString *)getDirectoryProviderStorage
+{
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions sharedInstance].capabilitiesGroups];
+    NSString *dir = [[dirGroup URLByAppendingPathComponent:k_DirectoryProviderStorage] path];
+
+    return dir;
+}
+
 + (NSString *)getTitleSectionDate:(NSDate *)date
 {
     NSString * title;