marinofaggiana 4 rokov pred
rodič
commit
e51f5631cc

+ 1 - 1
Share/CCloadItemData.swift

@@ -31,7 +31,7 @@ class CCloadItemData: NSObject {
         var filesName: [String] = []
         var conuter = 0
         
-        CCUtility.clearTmpDirectory()
+        CCUtility.emptyTemporaryDirectory()
                 
         if let inputItems : [NSExtensionItem] = extensionContext.inputItems as? [NSExtensionItem] {
             

+ 1 - 0
iOSClient/AppDelegate.m

@@ -50,6 +50,7 @@
     }
     
     [CCUtility createDirectoryStandard];
+    [CCUtility emptyTemporaryDirectory];
     
     // Networking
     [[NCCommunicationCommon sharedInstance] setupWithUserAgent:[CCUtility getUserAgent] capabilitiesGroup:[NCBrandOptions sharedInstance].capabilitiesGroups delegate:[NCNetworking sharedInstance]];

+ 8 - 8
iOSClient/Settings/CCAdvanced.m

@@ -241,11 +241,11 @@
     
     [[NCManageDatabase sharedInstance] clearDatabaseWithAccount:appDelegate.activeAccount removeAccount:false];
     
-    [CCUtility emptyGroupDirectoryProviderStorage];
-    [CCUtility emptyGroupLibraryDirectory];
+    [CCUtility removeGroupDirectoryProviderStorage];
+    [CCUtility removeGroupLibraryDirectory];
     
-    [CCUtility emptyDocumentsDirectory];
-    [CCUtility emptyTemporaryDirectory];
+    [CCUtility removeDocumentsDirectory];
+    [CCUtility removeTemporaryDirectory];
     
     [CCUtility createDirectoryStandard];
 
@@ -298,11 +298,11 @@
         [[NSURLCache sharedURLCache] setDiskCapacity:0];
         [KTVHTTPCache cacheDeleteAllCaches];
 
-        [CCUtility emptyGroupDirectoryProviderStorage];
-        [CCUtility emptyGroupApplicationSupport];
+        [CCUtility removeGroupDirectoryProviderStorage];
+        [CCUtility removeGroupApplicationSupport];
         
-        [CCUtility emptyDocumentsDirectory];
-        [CCUtility emptyTemporaryDirectory];
+        [CCUtility removeDocumentsDirectory];
+        [CCUtility removeTemporaryDirectory];
         
         [CCUtility deleteAllChainStore];
         

+ 5 - 5
iOSClient/Utility/CCUtility.h

@@ -215,12 +215,12 @@
 + (double)fileProviderStorageSize:(NSString *)ocId fileNameView:(NSString *)fileNameView;
 + (BOOL)fileProviderStorageIconExists:(NSString *)ocId fileNameView:(NSString *)fileNameView;
 
-+ (void)emptyGroupApplicationSupport;
-+ (void)emptyGroupLibraryDirectory;
-+ (void)emptyGroupDirectoryProviderStorage;
-+ (void)emptyDocumentsDirectory;
++ (void)removeGroupApplicationSupport;
++ (void)removeGroupLibraryDirectory;
++ (void)removeGroupDirectoryProviderStorage;
++ (void)removeDocumentsDirectory;
++ (void)removeTemporaryDirectory;
 + (void)emptyTemporaryDirectory;
-+ (void)clearTmpDirectory;
 
 + (NSString *)getTitleSectionDate:(NSDate *)date;
 

+ 6 - 6
iOSClient/Utility/CCUtility.m

@@ -1189,7 +1189,7 @@
     else return false;
 }
 
-+ (void)emptyGroupApplicationSupport
++ (void)removeGroupApplicationSupport
 {
     NSURL *dirGroup = [CCUtility getDirectoryGroup];
     NSString *path = [[dirGroup URLByAppendingPathComponent:k_appApplicationSupport] path];
@@ -1197,28 +1197,28 @@
     [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
 }
 
-+ (void)emptyGroupLibraryDirectory
++ (void)removeGroupLibraryDirectory
 {
     [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryScan] error:nil];
     [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryUserData] error:nil];
 }
 
-+ (void)emptyGroupDirectoryProviderStorage
++ (void)removeGroupDirectoryProviderStorage
 {
     [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorage] error:nil];
 }
 
-+ (void)emptyDocumentsDirectory
++ (void)removeDocumentsDirectory
 {
     [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryDocuments] error:nil];
 }
 
-+ (void)emptyTemporaryDirectory
++ (void)removeTemporaryDirectory
 {
     [[NSFileManager defaultManager] removeItemAtPath:NSTemporaryDirectory() error:nil];
 }
 
-+ (void)clearTmpDirectory
++ (void)emptyTemporaryDirectory
 {
     NSArray* tmpDirectory = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:NSTemporaryDirectory() error:NULL];
     for (NSString *file in tmpDirectory) {

+ 4 - 4
iOSClient/Utility/NCUtility.swift

@@ -379,11 +379,11 @@ class NCUtility: NSObject {
         
         NCManageDatabase.sharedInstance.clearDatabase(account: nil, removeAccount: true)
         
-        CCUtility.emptyGroupDirectoryProviderStorage()
-        CCUtility.emptyGroupLibraryDirectory()
+        CCUtility.removeGroupDirectoryProviderStorage()
+        CCUtility.removeGroupLibraryDirectory()
         
-        CCUtility.emptyDocumentsDirectory()
-        CCUtility.emptyTemporaryDirectory()
+        CCUtility.removeDocumentsDirectory()
+        CCUtility.removeTemporaryDirectory()
         
         CCUtility.createDirectoryStandard()