Browse Source

Improved directory, cache, remove account

marinofaggiana 5 years ago
parent
commit
fadfc86a93
1 changed files with 8 additions and 34 deletions
  1. 8 34
      iOSClient/Utility/CCUtility.m

+ 8 - 34
iOSClient/Utility/CCUtility.m

@@ -1109,33 +1109,24 @@
 
 + (void)emptyGroupApplicationSupport
 {
-    NSString *file;
     NSURL *dirGroup = [CCUtility getDirectoryGroup];
-    NSString *dirIniziale = [[dirGroup URLByAppendingPathComponent:k_appApplicationSupport] path];
+    NSString *path = [[dirGroup URLByAppendingPathComponent:k_appApplicationSupport] path];
     
-    NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
-    
-    while (file = [enumerator nextObject])
-        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", dirIniziale, file] error:nil];
+    [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
 }
 
 + (void)emptyGroupCaches
 {
-    NSString *file;
     NSURL *dirGroup = [CCUtility getDirectoryGroup];
-    NSString *dirIniziale = [[dirGroup URLByAppendingPathComponent:k_appCaches] path];
-    
-    NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
+    NSString *path = [[dirGroup URLByAppendingPathComponent:k_appCaches] path];
     
-    while (file = [enumerator nextObject])
-        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", dirIniziale, file] error:nil];
+    [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
 }
 
 + (void)emptyGroupLibraryDirectory
 {
     [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryScan] error:nil];
     [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryUserData] error:nil];
-    [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryUserData] error:nil];
 }
 
 + (void)emptyGroupDirectoryProviderStorage
@@ -1145,35 +1136,18 @@
 
 + (void)emptyDocumentsDirectory
 {
-    NSString *file;
-    NSString *dirIniziale = [CCUtility getDirectoryDocuments];
-    
-    NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
-    
-    while (file = [enumerator nextObject])
-        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", dirIniziale, file] error:nil];
+    [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryDocuments] error:nil];
 }
 
 + (void)emptyTemporaryDirectory
 {
-    NSString *file;
-    NSString *dirIniziale = NSTemporaryDirectory();
-    
-    NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
-    
-    while (file = [enumerator nextObject])
-        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", dirIniziale, file] error:NULL];
+    [[NSFileManager defaultManager] removeItemAtPath:NSTemporaryDirectory() error:nil];
 }
 
 + (void)emptyLibraryDirectory
 {
-    NSString *file;
-    NSString *dirIniziale = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)[0];
-    
-    NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
-    
-    while (file = [enumerator nextObject])
-        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", dirIniziale, file] error:NULL];
+    NSString *path = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)[0];
+    [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
 }
 
 + (NSString *)getTitleSectionDate:(NSDate *)date