activity

iOSClient/Database/NCDatabase.swift

@@ -62,6 +62,7 @@ class tableAccount: Object {
 class tableActivity: Object {
     
     @objc dynamic var account = ""
+    @objc dynamic var id = ""
     @objc dynamic var action = "Activity"
     @objc dynamic var date = NSDate()
     @objc dynamic var idActivity: Double = 0
@@ -76,34 +77,21 @@ class tableActivity: Object {
     @objc dynamic var objectType = ""
     @objc dynamic var objectID: Double = 0
     @objc dynamic var objectName = ""
-    @objc dynamic var previews = ""
-    let previewsItem = List<tableActivityPreviews>()
     @objc dynamic var note = ""
     @objc dynamic var selector = ""
     @objc dynamic var verbose: Bool = false
-}
-
-class tableActivitySubjectRich: Object {
-    
-    @objc dynamic var account = ""
-    @objc dynamic var idActivity: Double = 0
-    @objc dynamic var id = ""
-    @objc dynamic var key = ""
-    @objc dynamic var link = ""
-    @objc dynamic var name = ""
-    @objc dynamic var path = ""
-    @objc dynamic var type = ""
     
     override static func primaryKey() -> String {
         return "id"
     }
 }
 
-class tableActivityPreviews : Object {
+class tableActivitySubjectRich: Object {
     
     @objc dynamic var account = ""
     @objc dynamic var idActivity: Double = 0
     @objc dynamic var id = ""
+    @objc dynamic var key = ""
     @objc dynamic var link = ""
     @objc dynamic var name = ""
     @objc dynamic var path = ""

iOSClient/Database/NCManageDatabase.swift

@@ -577,59 +577,49 @@ class NCManageDatabase: NSObject {
             
                 for activity in listOfActivity {
                     
-                    if realm.objects(tableActivity.self).filter("idActivity = %d", activity.idActivity).first == nil {
-                        
-                        // Add new Activity
-                        let addObjectActivity = tableActivity()
-                        
-                        addObjectActivity.account = account
-                
-                        if let date = activity.date {
-                            addObjectActivity.date = date as NSDate
-                        }
-                        
-                        addObjectActivity.idActivity = Double(activity.idActivity)
-                        addObjectActivity.app = activity.app
-                        addObjectActivity.type = activity.type
-                        addObjectActivity.user = activity.user
-                        addObjectActivity.subject = activity.subject
-                        
-                        if activity.subject_rich.count > 0 {
-                            addObjectActivity.subjectRich = activity.subject_rich[0] as! String
-                            if activity.subject_rich.count > 1 {
-                                let dict = activity.subject_rich[1] as! [String:AnyObject]
-                                for (key, value) in dict {
-                                    
-                                    let addObjectActivitySubjectRich = tableActivitySubjectRich()
-                                    let record = value as! [String:AnyObject]
-                                    addObjectActivitySubjectRich.account = account
-                                    addObjectActivitySubjectRich.id = account + String(activity.idActivity) + key
-                                    addObjectActivitySubjectRich.key = key
-                                    addObjectActivitySubjectRich.idActivity = Double(activity.idActivity)
-                                    addObjectActivitySubjectRich.link = record["link"] as? String ?? ""
-                                    addObjectActivitySubjectRich.name = record["name"] as? String ?? ""
-                                    addObjectActivitySubjectRich.path = record["path"] as? String ?? ""
-                                    addObjectActivitySubjectRich.type = record["type"] as? String ?? ""
-
-                                    realm.add(addObjectActivitySubjectRich, update: true)
-                                }
+                    let addObjectActivity = tableActivity()
+                    
+                    addObjectActivity.account = account
+                    addObjectActivity.idActivity = Double(activity.idActivity)
+                    addObjectActivity.id = account + String(activity.idActivity)
+            
+                    if let date = activity.date {
+                        addObjectActivity.date = date as NSDate
+                    }
+                    
+                    addObjectActivity.app = activity.app
+                    addObjectActivity.type = activity.type
+                    addObjectActivity.user = activity.user
+                    addObjectActivity.subject = activity.subject
+                    
+                    if activity.subject_rich.count > 0 {
+                        addObjectActivity.subjectRich = activity.subject_rich[0] as! String
+                        if activity.subject_rich.count > 1 {
+                            let dict = activity.subject_rich[1] as! [String:AnyObject]
+                            for (key, value) in dict {
+                                let addObjectActivitySubjectRich = tableActivitySubjectRich()
+                                let dict = value as! [String:AnyObject]
+                                addObjectActivitySubjectRich.account = account
+                                addObjectActivitySubjectRich.id = account + String(activity.idActivity) + key
+                                addObjectActivitySubjectRich.key = key
+                                addObjectActivitySubjectRich.idActivity = Double(activity.idActivity)
+                                addObjectActivitySubjectRich.link = dict["link"] as? String ?? ""
+                                addObjectActivitySubjectRich.name = dict["name"] as? String ?? ""
+                                addObjectActivitySubjectRich.path = dict["path"] as? String ?? ""
+                                addObjectActivitySubjectRich.type = dict["type"] as? String ?? ""
+
+                                realm.add(addObjectActivitySubjectRich, update: true)
                             }
                         }
-                        
-                        addObjectActivity.icon = activity.icon
-                        addObjectActivity.link = activity.link
-                        addObjectActivity.objectType = activity.object_type
-                        addObjectActivity.objectID = Double(activity.object_id)
-                        addObjectActivity.objectName = activity.object_name
-                        
-                        /*
-                        for record in activity.previews {
-                            addObjectActivity.previews.append(record as! String)
-                        }
-                        */
-                        
-                        realm.add(addObjectActivity)
                     }
+                    
+                    addObjectActivity.icon = activity.icon
+                    addObjectActivity.link = activity.link
+                    addObjectActivity.objectType = activity.object_type
+                    addObjectActivity.objectID = Double(activity.object_id)
+                    addObjectActivity.objectName = activity.object_name
+                    
+                    realm.add(addObjectActivity, update: true)
                 }
             }
         } catch let error {

iOSClient/Library/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -930,7 +930,7 @@ NSString const *OCWebDAVModificationDateKey	= @"modificationdate";
     _requestMethod = @"GET";
     
     serverPath = [serverPath stringByAppendingString:[NSString stringWithFormat:@"?format=json"]];
-    serverPath = [serverPath stringByAppendingString:[NSString stringWithFormat:@"&previews=true"]];
+    //serverPath = [serverPath stringByAppendingString:[NSString stringWithFormat:@"&previews=true"]];
     
     NSMutableURLRequest *request = [self sharedRequestWithMethod:_requestMethod path:serverPath parameters:nil timeout:k_timeout_webdav];
     

iOSClient/Settings/CCAdvanced.m

@@ -351,7 +351,6 @@
             
             [[NCManageDatabase sharedInstance] clearTable:[tableActivity class] account:appDelegate.activeAccount];
             [[NCManageDatabase sharedInstance] clearTable:[tableActivitySubjectRich class] account:appDelegate.activeAccount];
-            [[NCManageDatabase sharedInstance] clearTable:[tableActivityPreviews class] account:appDelegate.activeAccount];
             [[NCManageDatabase sharedInstance] clearTable:[tableCapabilities class] account:appDelegate.activeAccount];
             [[NCManageDatabase sharedInstance] clearTable:[tableDirectory class] account:appDelegate.activeAccount];
             [[NCManageDatabase sharedInstance] clearTable:[tableE2eEncryption class] account:appDelegate.activeAccount];

iOSClient/Settings/CCManageAccount.m

@@ -240,7 +240,6 @@
     
     [[NCManageDatabase sharedInstance] clearTable:[tableAccount class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableActivity class] account:account];
-    [[NCManageDatabase sharedInstance] clearTable:[tableActivityPreviews class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableActivitySubjectRich class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableCapabilities class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableDirectory class] account:account];