dev

iOSClient/Main/CCMain.m

@@ -34,7 +34,7 @@
 #import "NCNetworkingEndToEnd.h"
 #import "PKDownloadButton.h"
 
-@interface CCMain () <UITextViewDelegate, createFormUploadAssetsDelegate, MGSwipeTableCellDelegate, NCSelectDelegate, UITextFieldDelegate, UIAdaptivePresentationControllerDelegate>
+@interface CCMain () <UITextViewDelegate, createFormUploadAssetsDelegate, MGSwipeTableCellDelegate, NCSelectDelegate, UITextFieldDelegate, UIAdaptivePresentationControllerDelegate, NCCreateFormUploadConflictDelegate>
 {
     AppDelegate *appDelegate;
         
@@ -1138,6 +1138,7 @@
     if (metadatasConflict.count > 0) {
         
         NCCreateFormUploadConflict *conflict = [[UIStoryboard storyboardWithName:@"NCCreateFormUploadConflict" bundle:nil] instantiateInitialViewController];
+        conflict.delegate = self;
         conflict.metadatas = metadatas;
         conflict.metadatasMOV = metadatasMOV;
         conflict.metadatasConflict = metadatasConflict;
@@ -1154,6 +1155,20 @@
     }
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ==== NCCreateFormUploadConflictDelegate ====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)dismissCreateFormUploadConflictWithMetadatas:(NSArray *)metadatas
+{
+    if (metadatas.count > 0) {
+        [[NCManageDatabase sharedInstance] addMetadatas:metadatas];
+        
+        [appDelegate startLoadAutoDownloadUpload];
+        [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl ocId:nil action:k_action_NULL];
+    }
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Read File ====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -23,6 +23,10 @@
 
 import Foundation
 
+@objc protocol NCCreateFormUploadConflictDelegate {
+    @objc func dismissCreateFormUploadConflict(metadatas: [tableMetadata])
+}
+
 @objc class NCCreateFormUploadConflict: UIViewController {
 
     @IBOutlet weak var labelTitle: UILabel!
@@ -44,6 +48,7 @@ import Foundation
     @objc var metadatas: [tableMetadata]
     @objc var metadatasMOV: [tableMetadata]
     @objc var metadatasConflict: [tableMetadata]
+    @objc weak var delegate: NCCreateFormUploadConflictDelegate?
     
     var metadatasConflictNewFiles = [String]()
     var metadatasConflictAlreadyExistingFiles = [String]()
@@ -180,14 +185,9 @@ import Foundation
             }
         }
         
-        if metadatas.count > 0 {
-            NCManageDatabase.sharedInstance.addMetadatas(metadatas)
-        }
-        if metadatasMOV.count > 0 {
-            NCManageDatabase.sharedInstance.addMetadatas(metadatasMOV)
-        }
+        metadatas.append(contentsOf: metadatasMOV)
         
-        appDelegate.startLoadAutoDownloadUpload()
+        delegate?.dismissCreateFormUploadConflict(metadatas: metadatas)
         
         dismiss(animated: true)
     }

iOSClient/Main/Create cloud/NCCreateFormUploadFileText.swift

@@ -231,9 +231,7 @@ class NCCreateFormUploadFileText: XLFormViewController, NCSelectDelegate {
                 NCManageDatabase.sharedInstance.addMetadata(metadataForUpload)
                 NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: self.serverUrl, ocId: nil, action: Int32(k_action_NULL))
 
-                self.appDelegate.startLoadAutoDownloadUpload()
-                
-                
+                self.appDelegate.startLoadAutoDownloadUpload()                
             
             } else {