Browse Source

fix previews NC < 15

Marino Faggiana 6 years ago
parent
commit
3cd6769776

+ 1 - 1
iOSClient/Activity/NCActivity.swift

@@ -284,7 +284,7 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
     
     @objc func loadActivity() {
         
-        OCNetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, since: Int(NCManageDatabase.sharedInstance.getActivityLastIdActivity(account: self.appDelegate.activeAccount)), limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
+        OCNetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, since: 0, limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
             
             self.refreshControl.endRefreshing()
             

+ 2 - 0
iOSClient/CCGlobal.h

@@ -293,6 +293,8 @@
 
 // Nextcloud version
 #define k_nextcloud_version_12_0                        12
+#define k_nextcloud_version_13_0                        13
+#define k_nextcloud_version_14_0                        14
 #define k_nextcloud_version_15_0                        15
 
 // -----------------------------------------------------------------------------------------------------------

+ 1 - 4
iOSClient/Networking/NCService.swift

@@ -204,12 +204,9 @@ class NCService: NSObject {
                 
                 if (capabilities!.isActivityV2Enabled) {
                     
-                    OCNetworking.sharedManager().getActivityWithAccount(account!, since: Int(NCManageDatabase.sharedInstance.getActivityLastIdActivity(account: self.appDelegate.activeAccount)), limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
+                    OCNetworking.sharedManager().getActivityWithAccount(account!, since: 0, limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
                         if errorCode == 0 && account == self.appDelegate.activeAccount {
                             NCManageDatabase.sharedInstance.addActivity(listOfActivity as! [OCActivity], account: account!)
-                            //if (self.appDelegate.activeActivity != nil) {
-                            //    self.appDelegate.activeActivity.reloadDatasource()
-                            //}
                         } 
                     })
                 }

+ 1 - 1
iOSClient/Networking/OCNetworking.m

@@ -1367,7 +1367,7 @@
     [communication setUserAgent:[CCUtility getUserAgent]];
     
     tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:account];
-    if (capabilities != nil && capabilities.versionMajor >= k_nextcloud_version_12_0) {
+    if (capabilities != nil && capabilities.versionMajor >= k_nextcloud_version_15_0) {
         previews = true;
     }