activity protocol

Libraries external/OCCommunicationLib/OCCommunicationLib/OCActivity.h

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

Libraries external/OCCommunicationLib/OCCommunicationLib/OCActivity.m

@@ -35,10 +35,7 @@
         self.file = @"";
         self.link = @"";
         self.message = @"";
-        self.session = @"";
         self.subject = @"";
-        self.type = @"";
-        self.verbose = 0;
     }
     
     return self;

iOSClient/FileSystem/CCCoreData.m

@@ -1864,8 +1864,7 @@
         record.date = activity.date;
         record.file = activity.file;
         record.link = activity.link;
-        record.message = activity.message;
-        record.subject = activity.subject;
+        record.note = activity.subject;
     }];
 }
 
@@ -1879,9 +1878,7 @@
         record.idActivity = 0;
         record.date = [NSDate date];
         record.file = file;
-        record.message = message;
         record.session = session;
-        record.subject = subject;
         record.type = type;
         record.verbose = [NSNumber numberWithInteger:verbose];
    }];

iOSClient/FileSystem/TableActivity+CoreDataProperties.h

@@ -16,13 +16,13 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSFetchRequest<TableActivity *> *)fetchRequest;
 
 @property (nullable, nonatomic, copy) NSString *account;
-@property (nullable, nonatomic, copy) NSNumber *idActivity;
+@property (nullable, nonatomic, copy) NSString *action;
 @property (nullable, nonatomic, copy) NSDate *date;
 @property (nullable, nonatomic, copy) NSString *file;
+@property (nullable, nonatomic, copy) NSNumber *idActivity;
 @property (nullable, nonatomic, copy) NSString *link;
-@property (nullable, nonatomic, copy) NSString *message;
+@property (nullable, nonatomic, copy) NSString *note;
 @property (nullable, nonatomic, copy) NSString *session;
-@property (nullable, nonatomic, copy) NSString *subject;
 @property (nullable, nonatomic, copy) NSString *type;
 @property (nullable, nonatomic, copy) NSNumber *verbose;
 

iOSClient/FileSystem/TableActivity+CoreDataProperties.m

@@ -15,13 +15,13 @@
 }
 
 @dynamic account;
-@dynamic idActivity;
+@dynamic action;
 @dynamic date;
 @dynamic file;
+@dynamic idActivity;
 @dynamic link;
-@dynamic message;
+@dynamic note;
 @dynamic session;
-@dynamic subject;
 @dynamic type;
 @dynamic verbose;
 

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -129,7 +129,7 @@
     UILabel *subjectLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, collectionView.frame.size.width , CGFLOAT_MAX)];
     subjectLabel.numberOfLines = 0;
     [subjectLabel setFont:fontSizeSubject];
-    subjectLabel.text = activity.subject;
+    subjectLabel.text = activity.note;
     subjectLabel.lineBreakMode = NSLineBreakByWordWrapping;
     
     int heightView = 50 + [self getLabelHeight:subjectLabel];
@@ -169,7 +169,7 @@
     subjectLabel.textColor = COLOR_TEXT_ANTHRACITE;
     subjectLabel.numberOfLines = 0;
     [subjectLabel setFont:fontSizeSubject];
-    subjectLabel.text = activity.subject;
+    subjectLabel.text = activity.note;
     subjectLabel.lineBreakMode = NSLineBreakByWordWrapping;
     
     //headerView.backgroundColor = [UIColor blueColor];

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

@@ -40,13 +40,13 @@
     </entity>
     <entity name="TableActivity" representedClassName="TableActivity" syncable="YES">
         <attribute name="account" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="action" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="file" optional="YES" attributeType="String" syncable="YES"/>
         <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="message" 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="subject" 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>