Browse Source

Improved Activity (fetch)

marinofaggiana 5 years ago
parent
commit
fd1133f879
2 changed files with 6 additions and 13 deletions
  1. 6 1
      iOSClient/Activity/NCActivity.swift
  2. 0 12
      iOSClient/Networking/NCService.swift

+ 6 - 1
iOSClient/Activity/NCActivity.swift

@@ -544,9 +544,14 @@ extension NCActivity {
                 sectionDate.append(date)
             }
         }
+        
+        // test activity no record
         if filterFileId != nil && filterActivities.count == 0 && allActivities.count > 0 {
             loadActivity(idActivity: allActivities[allActivities.count-1].idActivity)
         }
+        if filterFileId == nil && filterActivities.count == 0 {
+            loadActivity(idActivity: 0)
+        }
         
         tableView.reloadData()
     }
@@ -576,7 +581,7 @@ extension NCActivity {
             NCUtility.sharedInstance.startActivityIndicator(view: self.view, bottom: 50)
         }
         
-        OCNetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, since: idActivity, limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
+        OCNetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, since: idActivity, limit: 200, link: "", completion: { (account, listOfActivity, message, errorCode) in
             
             if errorCode == 0 && account == self.appDelegate.activeAccount {
                 NCManageDatabase.sharedInstance.addActivity(listOfActivity as! [OCActivity], account: account!)

+ 0 - 12
iOSClient/Networking/NCService.swift

@@ -279,18 +279,6 @@ class NCService: NSObject {
                     })
                 }
                 
-                // Get Activity
-                if (capabilities!.isActivityV2Enabled) {
-                    
-                    OCNetworking.sharedManager().getActivityWithAccount(account!, since: 0, limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
-                        DispatchQueue.global().async {
-                            if errorCode == 0 && account == self.appDelegate.activeAccount {
-                                NCManageDatabase.sharedInstance.addActivity(listOfActivity as! [OCActivity], account: account!)
-                            }
-                        }
-                    })
-                }
-                
                 // Get Handwerkcloud
                 if (capabilities!.isHandwerkcloudEnabled) {
                     self.requestHC()