浏览代码

clear code

Marino Faggiana 6 年之前
父节点
当前提交
24e78c0ce6
共有 1 个文件被更改,包括 10 次插入9 次删除
  1. 10 9
      iOSClient/Activity/NCActivity.swift

+ 10 - 9
iOSClient/Activity/NCActivity.swift

@@ -36,7 +36,7 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
     var activities = [tableActivity]()
     var sectionDate = [Date]()
     
-    var loadingIdActivity: Int = 0
+    var loadingActivity = false
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -157,8 +157,6 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
     
     func tableView(_ tableView: UITableView, prefetchRowsAt indexPaths: [IndexPath]) {
         
-        print("prefetchRowsAt \(indexPaths)")
-        
         let section = indexPaths.last?.section ?? 0
         let row = indexPaths.last?.row ?? 0
         
@@ -304,25 +302,28 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
 
     @objc func loadActivity(idActivity: Int) {
         
-        if loadingIdActivity > 0 {
+        if loadingActivity {
             return
         } else {
-            loadingIdActivity = idActivity
+            loadingActivity = true
+        }
+        
+        if idActivity > 0 {
             NCUtility.sharedInstance.startActivityIndicator(view: self.view, bottom: 50)
         }
         
         OCNetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, since: idActivity, limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
             
-            self.refreshControl.endRefreshing()
-            NCUtility.sharedInstance.stopActivityIndicator()
-            
             if errorCode == 0 && account == self.appDelegate.activeAccount {
                 NCManageDatabase.sharedInstance.addActivity(listOfActivity as! [OCActivity], account: account!)
                 
                 self.loadDataSource()
             }
             
-            self.loadingIdActivity = 0
+            self.refreshControl.endRefreshing()
+            NCUtility.sharedInstance.stopActivityIndicator()
+            
+            self.loadingActivity = false
         })
     }
 }