change Activity protocol

Libraries external/OCCommunicationLib/OCCommunicationLib/OCActivity.h

@@ -32,7 +32,7 @@
 @property (nonatomic, strong) NSString *message;
 @property (nonatomic, strong) NSString *session;
 @property (nonatomic, strong) NSString *subject;
-@property (nonatomic, strong) NSString *type;
+@property NSInteger type;
 @property NSInteger verbose;
 
 @end

Libraries external/OCCommunicationLib/OCCommunicationLib/OCActivity.m

@@ -37,7 +37,7 @@
         self.message = @"";
         self.session = @"";
         self.subject = @"";
-        self.type = @"";
+        self.type = 0;
         self.verbose = 0;
     }
     

iOSClient/CCGlobal.h

@@ -243,6 +243,14 @@ extern NSString *const urlBaseUploadDB;
 // Search
 #define k_minCharsSearch                                2
 
+// Activity
+#define k_activityVerboseServer                         0
+#define k_activityVerboseClient                         1
+#define k_activityVerboseClientDebug                    2
+#define k_activityTypeInfo                              @"info"
+#define k_activityTypeSucces                            @"success"
+#define k_activityTypeFailure                           @"error"
+
 // -----------------------------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------
 

iOSClient/FileSystem/CCCoreData.h

@@ -211,7 +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;
++ (void)addActivityFile:(NSString *)file subject:(NSString *)subject message:(NSString *)message session:(NSString *)session type:(NSInteger)type verbose:(NSInteger)verbose account:(NSString *)account;
 + (NSArray *)getAllTableActivityWithPredicate:(NSPredicate *)predicate;
 
 // ===== File System =====

iOSClient/FileSystem/CCCoreData.m

@@ -1866,12 +1866,10 @@
         record.link = activity.link;
         record.message = activity.message;
         record.subject = activity.subject;
-        record.type = activity.type;
-        record.verbose = [NSNumber numberWithInteger:activity.verbose];
     }];
 }
 
-+ (void)addActivityFile:(NSString *)file subject:(NSString *)subject session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
++ (void)addActivityFile:(NSString *)file subject:(NSString *)subject message:(NSString *)message session:(NSString *)session type:(NSInteger)type verbose:(NSInteger)verbose account:(NSString *)account
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
@@ -1881,9 +1879,10 @@
         record.idActivity = 0;
         record.date = [NSDate date];
         record.file = file;
+        record.message = message;
         record.session = session;
         record.subject = subject;
-        record.type = type;
+        record.type = [NSNumber numberWithInteger:type];
         record.verbose = [NSNumber numberWithInteger:verbose];
    }];
 }

iOSClient/FileSystem/TableActivity+CoreDataProperties.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy) NSString *message;
 @property (nullable, nonatomic, copy) NSString *session;
 @property (nullable, nonatomic, copy) NSString *subject;
-@property (nullable, nonatomic, copy) NSString *type;
+@property (nullable, nonatomic, copy) NSNumber *type;
 @property (nullable, nonatomic, copy) NSNumber *verbose;
 
 @end

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -157,7 +157,7 @@
     dataLabel.text =  [CCUtility getTitleSectionDate:date];
     [dataLabel setFont:fontSizeData];
         
-    if ([activity.type length] == 0 )
+    if (activity.type == 0)
         typeImage.image = [UIImage imageNamed:image_user];
         
     subjectLabel.textColor = COLOR_TEXT_ANTHRACITE;

iOSClient/Networking/OCNetworking.m

@@ -41,6 +41,10 @@
     
     BOOL _isCryptoCloudMode;
     BOOL _hasServerForbiddenCharactersSupport;
+    
+    NSString *_fileActivityLog;
+    NSString *_messageActivityLog;
+    NSString *_subjectActivityLog;
 }
 @end
 
@@ -129,32 +133,20 @@
     if([self respondsToSelector:NSSelectorFromString(_metadataNet.action)])
         [self performSelector:NSSelectorFromString(_metadataNet.action)];
     
-    // Add Activity LOG
+    // Activity LOG
     if ([_metadataNet.selector length] > 0) {
         
-        OCActivity *activity = [OCActivity new];
-        NSString *file, *subject;
-        
         if ([_metadataNet.fileName length] > 0) {
             
-            file = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
-            subject = [CCUtility returnFileNamePathFromFileName:_metadataNet.fileName serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
+            _fileActivityLog = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
+            _messageActivityLog = [CCUtility returnFileNamePathFromFileName:_metadataNet.fileName serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
 
         } else {
             
-            file = _metadataNet.serverUrl;
-            subject = [CCUtility returnFileNamePathFromFileName:@"" serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
+            _fileActivityLog = _metadataNet.serverUrl;
+            _messageActivityLog = [CCUtility returnFileNamePathFromFileName:@"" serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
         }
-        
-        activity.idActivity = 0;
-        activity.date = [NSDate date];
-        activity.file = file;
-        activity.subject = [NSString stringWithFormat:@"%@ : %@",_metadataNet.selector, subject] ;
-        activity.type = _metadataNet.action;
-        
-        [CCCoreData addActivity:activity account:_metadataNet.account];
     }
-
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -170,6 +162,15 @@
 #endif
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Activity LOG =====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)createActivityType:(NSInteger)type Verbose:(NSInteger)verbose
+{
+    [CCCoreData addActivityFile:_fileActivityLog subject:[NSString stringWithFormat:@"%@ : %@",_metadataNet.selector, _subjectActivityLog] message:_metadataNet.action session:[CCUtility createRandomString:16] type:type verbose:verbose account:_metadataNet.account];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== downloadFile =====
 #pragma --------------------------------------------------------------------------------------------

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

@@ -47,7 +47,7 @@
         <attribute name="message" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="session" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="subject" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="type" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="type" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="verbose" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <entity name="TableAutomaticUpload" representedClassName="TableAutomaticUpload" syncable="YES">