Marino Faggiana 8 年之前
父節點
當前提交
8e76272668

+ 1 - 1
iOSClient/FileSystem/NCDatabase.m

@@ -33,7 +33,7 @@
 }
 
 + (NSDictionary *)defaultPropertyValues {
-    return @{@"action" : @"", @"date" : [NSDate date], @"file" : @"", @"fileID" : @"", @"idActivity" : @0, @"link" : @"", @"note" : @"", @"selector" : @"", @"type" : @"", @"verbose" : @NO};
+    return @{@"date" : [NSDate date], @"idActivity" : @0, @"verbose" : @NO};
 }
 
 @end

+ 1 - 1
iOSClient/FileSystem/NCManageDatabase.h

@@ -15,6 +15,6 @@
 + (NCManageDatabase *)sharedManageDatabase;
 
 //
-- (void)addActivityServer:(OCActivity *)activity account:(NSString *)account;
+- (void)addActivityServer:(NSArray *)listOfActivity account:(NSString *)account;
 
 @end

+ 19 - 14
iOSClient/FileSystem/NCManageDatabase.m

@@ -38,24 +38,29 @@
     return self;
 }
 
-- (void)addActivityServer:(OCActivity *)activity account:(NSString *)account
+- (void)addActivityServer:(NSArray *)listOfActivity account:(NSString *)account
 {
-    DBActivity *dbActivity = [DBActivity new];
-    
-    dbActivity.account = account;
-    dbActivity.action = @"Activity";
-    dbActivity.date = activity.date;
-    dbActivity.file = activity.file;
-    dbActivity.idActivity = activity.idActivity;
-    dbActivity.link = activity.link;
-    dbActivity.note = activity.subject;
-    dbActivity.type = k_activityTypeInfo;
-    dbActivity.verbose = k_activityVerboseDefault;
-
     RLMRealm *realm = [RLMRealm defaultRealm];
     
     [realm beginWriteTransaction];
-    [realm addObject:dbActivity];
+    
+    for (OCActivity *activity in listOfActivity) {
+        
+        DBActivity *dbActivity = [DBActivity new];
+        
+        dbActivity.account = account;
+        dbActivity.action = @"Activity";
+        dbActivity.date = activity.date;
+        dbActivity.file = activity.file;
+        dbActivity.idActivity = activity.idActivity;
+        dbActivity.link = activity.link;
+        dbActivity.note = activity.subject;
+        dbActivity.type = k_activityTypeInfo;
+        dbActivity.verbose = k_activityVerboseDefault;
+        
+        [realm addObject:dbActivity];
+    }
+    
     [realm commitWriteTransaction];
 }
 

+ 2 - 4
iOSClient/Main/CCMain.m

@@ -1104,12 +1104,10 @@
 {
     for (OCActivity *activity in listOfActivity) {
         [CCCoreData addActivityServer:activity account:app.activeAccount];
-        
-        // New Realm DB Test
-        [[NCManageDatabase sharedManageDatabase] addActivityServer:activity account:app.activeAccount];
     }
     
-    
+    // New Realm DB Test
+    [[NCManageDatabase sharedManageDatabase] addActivityServer:listOfActivity account:app.activeAccount];
     
     // Reload Activity Data Source
     [app.activeActivity reloadDatasource];