change function utility

iOSClient/FileSystem/CCCoreData.h

@@ -211,6 +211,7 @@
 // ===== Activity =====
 
 + (void)addActivity:(OCActivity *)activity account:(NSString *)account;
++ (void)addActivityFile:(NSString *)file subject:(NSString *)subject session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account;
 + (NSArray *)getAllTableActivityWithPredicate:(NSPredicate *)predicate;
 
 // ===== File System =====

iOSClient/FileSystem/CCCoreData.m

@@ -882,7 +882,7 @@
         TableDirectory *record = [TableDirectory MR_createEntityInContext:context];
         
         record.account = activeAccount;
-        record.directoryID = [CCUtility createID];
+        record.directoryID = [CCUtility createRandomString:16];
         directoryID = record.directoryID;
         if (permissions) record.permissions = permissions;
         record.serverUrl = serverUrl;
@@ -1871,7 +1871,7 @@
     }];
 }
 
-+ (void)addActivityFile:(NSString *)file subject:(NSString *)subject type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
++ (void)addActivityFile:(NSString *)file subject:(NSString *)subject session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
@@ -1881,11 +1881,10 @@
         record.idActivity = 0;
         record.date = [NSDate date];
         record.file = file;
+        record.session = session;
         record.subject = subject;
         record.type = type;
         record.verbose = [NSNumber numberWithInteger:verbose];
-
-        
    }];
 }
 

iOSClient/Networking/CCNetworking.m

@@ -832,7 +832,7 @@
     CCMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     
     //fileID
-    NSString *uploadID =  [k_uploadSessionID stringByAppendingString:[CCUtility createID]];
+    NSString *uploadID =  [k_uploadSessionID stringByAppendingString:[CCUtility createRandomString:16]];
     
     //add delegate
     if (delegate)

iOSClient/Utility/CCUtility.h

@@ -133,7 +133,7 @@
 + (NSString *)removeForbiddenCharacters:(NSString *)fileName hasServerForbiddenCharactersSupport:(BOOL)hasServerForbiddenCharactersSupport;
 + (NSString *)stringAppendServerUrl:(NSString *)serverUrl addFileName:(NSString *)addFileName;
 
-+ (NSString *)createID;
++ (NSString *)createRandomString:(int)numChars;
 + (NSString *)createFileNameFromAsset:(PHAsset *)asset key:(NSString *)key;
 
 + (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl;

iOSClient/Utility/CCUtility.m

@@ -456,14 +456,12 @@
     return result;
 }
 
-+ (NSString *)createID
++ (NSString *)createRandomString:(int)numChars
 {
-    int numeroCaratteri = 16;
-    
     NSString *letters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-    NSMutableString *randomString = [NSMutableString stringWithCapacity: numeroCaratteri];
+    NSMutableString *randomString = [NSMutableString stringWithCapacity: numChars];
     
-    for (int i=0; i < numeroCaratteri; i++) {
+    for (int i=0; i < numChars; i++) {
         [randomString appendFormat: @"%C", [letters characterAtIndex: arc4random_uniform((unsigned int)[letters length]) % [letters length]]];
     }