Marino Faggiana 7 years ago
parent
commit
354720339e
2 changed files with 18 additions and 7 deletions
  1. 17 2
      iOSClient/FileSystem/NCManageDatabase.swift
  2. 1 5
      iOSClient/Networking/CCNetworking.m

+ 17 - 2
iOSClient/FileSystem/NCManageDatabase.swift

@@ -1194,7 +1194,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func updateMetadata(_ metadata: tableMetadata, date: NSDate?, rev: String?, session: String?, sessionError: String?, sessionTaskIdentifier: Int, sessionTaskIdentifierPlist: Int, activeUrl: String) {
+    func updateMetadata(_ metadata: tableMetadata, date: NSDate?, fileID: String?, rev: String?, session: String?, sessionError: String?, sessionTaskIdentifier: Int, sessionTaskIdentifierPlist: Int, activeUrl: String) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1230,7 +1230,22 @@ class NCManageDatabase: NSObject {
                 metadata.sessionTaskIdentifierPlist = sessionTaskIdentifierPlist
             }
             
-            realm.add(metadataWithIcon!, update: true)
+            if fileID != nil {
+                
+                realm.delete(metadata)
+                
+                metadata.fileID = fileID!
+                realm.add(metadata, update: true)
+                
+                
+                
+                //let x =  realm.create(tableMetadata.self, value: metadata, update: false)
+                //x.fileID = fileID!
+                
+            } else {
+                
+                realm.add(metadataWithIcon!, update: true)
+            }
         }
     }
     

+ 1 - 5
iOSClient/Networking/CCNetworking.m

@@ -1562,9 +1562,6 @@
 
 - (void)verifyUploadInProgress
 {
-    //NSArray *dataSourceUpload = [CCCoreData getTableMetadataUploadAccount:_activeAccount];
-    //NSArray *dataSourceUploadWWan = [CCCoreData getTableMetadataUploadWWanAccount:_activeAccount];
-
     NSArray *dataSourceUpload = [[NCManageDatabase sharedInstance] getTableMetadataUpload];
     NSArray *dataSourceUploadWWan = [[NCManageDatabase sharedInstance] getTableMetadataUploadWWan];
     
@@ -1575,9 +1572,8 @@
     
     NSLog(@"[LOG] Verify upload file in progress n. %lu", (unsigned long)[dataSource count]);
     
-    for (TableMetadata *record in dataSource) {
+    for (tableMetadata *metadata in dataSource) {
         
-        __block tableMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
         __block NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:_activeAccount];
         
         NSURLSession *session = [self getSessionfromSessionDescription:metadata.session];