Forráskód Böngészése

addActivityServer

Marino Faggiana 6 éve
szülő
commit
ccff315e08

+ 1 - 1
iOSClient/Activity/CCActivity.m

@@ -150,7 +150,7 @@
     OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:appDelegate.activeUser withUserID:appDelegate.activeUserID withPassword:appDelegate.activePassword withUrl:appDelegate.activeUrl];
     [ocNetworking getActivityServer:^(NSArray *listOfActivity) {
         
-        [[NCManageDatabase sharedInstance] addActivityServer:listOfActivity];
+        [[NCManageDatabase sharedInstance] addActivityServer:listOfActivity account:appDelegate.activeAccount];
         [self reloadDatasource];
         
     } failure:^(NSString *message, NSInteger errorCode) {

+ 2 - 6
iOSClient/Database/NCManageDatabase.swift

@@ -550,12 +550,8 @@ class NCManageDatabase: NSObject {
         return Array(results.map { tableActivity.init(value:$0) })
     }
 
-    @objc func addActivityServer(_ listOfActivity: [OCActivity]) {
+    @objc func addActivityServer(_ listOfActivity: [OCActivity], account: String) {
     
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
-        
         let realm = try! Realm()
 
         do {
@@ -568,7 +564,7 @@ class NCManageDatabase: NSObject {
                         // Add new Activity
                         let addObject = tableActivity()
                 
-                        addObject.account = tableAccount.account
+                        addObject.account = account
                 
                         if let date = activity.date {
                             addObject.date = date as NSDate

+ 1 - 1
iOSClient/Networking/NCService.swift

@@ -345,7 +345,7 @@ class NCService: NSObject, OCNetworkingDelegate {
         
         if (errorCode == 0) {
             
-            NCManageDatabase.sharedInstance.addActivityServer(listOfActivity as! [OCActivity])
+            NCManageDatabase.sharedInstance.addActivityServer(listOfActivity as! [OCActivity], account: metadataNet.account)
             if (appDelegate.activeActivity != nil) {
                 appDelegate.activeActivity.reloadDatasource()
             }