remove session

Picker/DocumentPickerViewController.swift

@@ -400,7 +400,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud.hideHud()
         
         // Activity
-        CCCoreData.addActivityFile(fileID, action: "Download File Document Picker", note: "Selector : \(selector) Error : \(message)", session: CCUtility.createRandomString(16), type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: self.activeAccount)
+        CCCoreData.addActivityFile(fileID, action: "Download File Document Picker", note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: self.activeAccount)
 
         if selector == selectorLoadFileView && errorCode != -999 {
             
@@ -420,7 +420,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         let metadata = CCCoreData.getMetadataWithPreficate(NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID!)')"), context: nil)
         
         // Activity
-        CCCoreData.addActivityFile(metadata!.fileName, action: "Download File Document Picker", note: "Selector : \(selector)", session: CCUtility.createRandomString(16), type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadata!.account)
+        CCCoreData.addActivityFile(metadata!.fileName, action: "Download File Document Picker", note: "Selector : \(selector)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadata!.account)
         
         switch selector {
             
@@ -466,7 +466,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud.hideHud()
         
         // Activity
-        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector) Error : \(message)", session: CCUtility.createRandomString(16), type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
+        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
         
         // remove file
         CCCoreData.deleteMetadata(with: NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID)')"))
@@ -488,7 +488,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud.hideHud()
         
         // Activity
-        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector)", session: CCUtility.createRandomString(16), type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
+        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
         
         dismissGrantingAccess(to: self.destinationURL)
     }

Share Ext/ShareViewController.m

@@ -304,7 +304,7 @@
     [self.hud hideHud];
     
     // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
     
     // remove file 
     [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount]];
@@ -335,7 +335,7 @@
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:nil];
     
     // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
     
     [self.filesName removeObject:metadata.fileNamePrint];
     [self.shareTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];

iOSClient/FileSystem/CCCoreData.h

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

iOSClient/FileSystem/CCCoreData.m

@@ -1866,13 +1866,12 @@
         record.idActivity = [NSNumber numberWithInteger:activity.idActivity];
         record.link = activity.link;
         record.note = activity.subject;
-        record.session = @"";
         record.type = k_activityTypeInfo;
         record.verbose = [NSNumber numberWithInteger:k_activityVerboseDefault];
     }];
 }
 
-+ (void)addActivityFile:(NSString *)file action:(NSString *)action note:(NSString *)note session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
++ (void)addActivityFile:(NSString *)file action:(NSString *)action note:(NSString *)note type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
@@ -1885,7 +1884,6 @@
         record.idActivity = 0;
         record.link = @"";
         record.note = note;
-        record.session = session;
         record.type = type;
         record.verbose = [NSNumber numberWithInteger:verbose];
         

iOSClient/FileSystem/TableActivity+CoreDataProperties.h

@@ -22,7 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy) NSNumber *idActivity;
 @property (nullable, nonatomic, copy) NSString *link;
 @property (nullable, nonatomic, copy) NSString *note;
-@property (nullable, nonatomic, copy) NSString *session;
 @property (nullable, nonatomic, copy) NSString *type;
 @property (nullable, nonatomic, copy) NSNumber *verbose;
 

iOSClient/FileSystem/TableActivity+CoreDataProperties.m

@@ -21,7 +21,6 @@
 @dynamic idActivity;
 @dynamic link;
 @dynamic note;
-@dynamic session;
 @dynamic type;
 @dynamic verbose;
 

iOSClient/Main/CCMain.m

@@ -1255,7 +1255,7 @@
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
 
     // File do not exists on server, remove in local
     if (errorCode == kOCErrorServerPathNotFound || errorCode == kCFURLErrorBadServerResponse) {
@@ -1291,7 +1291,7 @@
     if (metadata == nil) return;
     
     // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadata.account];
 
     // Download
     if ([selector isEqualToString:selectorDownloadFile]) {
@@ -1531,7 +1531,7 @@
 - (void)uploadFileFailure:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
 
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
@@ -1559,7 +1559,7 @@
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
     // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
     
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])

iOSClient/Networking/OCNetworking.m

@@ -286,7 +286,7 @@
             [self.delegate downloadThumbnailFailure:_metadataNet message:[CCError manageErrorOC:response.statusCode error:error] errorCode:errorCode];
         
         // Activity
-        [CCCoreData addActivityFile:_metadataNet.fileName action:@"Get Thumbnail" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_metadataNet.fileName action:@"Get Thumbnail" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];
@@ -405,7 +405,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_metadataNet.serverUrl action:@"Read Folder" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_metadataNet.serverUrl action:@"Read Folder" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];
@@ -1172,7 +1172,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Get Notification Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:@"Get Notification Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];
@@ -1236,7 +1236,7 @@
         [communication subscribingPushProxy:k_pushNotificationServer pushToken:pushToken deviceIdentifier:deviceIdentifier deviceIdentifierSignature:signature userPublicKey:devicePublicKey onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *publicKey, NSString *deviceIdentifier, NSString *signature, NSString *redirectedServer) {
             
             // Activity
-            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:@"Service registered." session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadataNet.account];
+            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:@"Service registered." type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadataNet.account];
             
             [self complete];
             
@@ -1251,7 +1251,7 @@
                 [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
 
             // Activity
-            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
 
             [self complete];
         }];
@@ -1267,7 +1267,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Subscribing Server Push" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:@"Subscribing Server Push" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
 
         [self complete];
     }];
@@ -1374,7 +1374,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Features Supported By Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:@"Features Supported By Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
 
         [self complete];
     }];
@@ -1410,7 +1410,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
 
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Capabilities Of Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:@"Capabilities Of Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];

iOSClient/Offline/CCOfflinePageContent.m

@@ -238,7 +238,7 @@
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@ - Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@ - Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
     
     [app messageNotification:@"_download_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     
@@ -250,7 +250,7 @@
     _metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     // Activity
-    [CCCoreData addActivityFile:_metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadata.account];
+    [CCCoreData addActivityFile:_metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadata.account];
     
     // File exists
     if ([self shouldPerformSegue])

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

@@ -46,7 +46,6 @@
         <attribute name="idActivity" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="link" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="note" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="session" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="type" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="verbose" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
     </entity>
@@ -143,7 +142,7 @@
     </entity>
     <elements>
         <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="585"/>
-        <element name="TableActivity" positionX="-6399" positionY="252" width="128" height="195"/>
+        <element name="TableActivity" positionX="-6399" positionY="252" width="128" height="180"/>
         <element name="TableAutomaticUpload" positionX="-6597" positionY="801" width="128" height="180"/>
         <element name="TableCertificates" positionX="-6597" positionY="711" width="128" height="60"/>
         <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="210"/>