Browse Source

refresh main after Create

Marino Faggiana 7 years ago
parent
commit
1b10cda252
2 changed files with 22 additions and 3 deletions
  1. 15 1
      iOSClient/Create/CCCreateCloud.swift
  2. 7 2
      iOSClient/Main/CCMain.m

+ 15 - 1
iOSClient/Create/CCCreateCloud.swift

@@ -208,6 +208,11 @@ class CreateMenuAdd: NSObject {
 
 // MARK: - CreateFormUploadAssets
 
+@objc protocol createFormUploadAssetsDelegate {
+    
+    func dismissFormUploadAssets()
+}
+
 class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
     
     var serverUrl : String = ""
@@ -215,10 +220,11 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
     var assets: NSMutableArray = []
     var cryptated : Bool = false
     var session : String = ""
+    weak var delegate: createFormUploadAssetsDelegate?
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
 
-    convenience init(_ titleServerUrl : String?, serverUrl : String, assets : NSMutableArray, cryptated : Bool, session : String) {
+    convenience init(_ titleServerUrl : String?, serverUrl : String, assets : NSMutableArray, cryptated : Bool, session : String, delegate: createFormUploadAssetsDelegate) {
         
         self.init()
         
@@ -232,6 +238,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         self.assets = assets
         self.cryptated = cryptated
         self.session = session
+        self.delegate = delegate
         
         self.initializeForm()
     }
@@ -385,6 +392,13 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         self.reloadForm()
     }
+    
+    override func viewWillDisappear(_ animated: Bool)
+    {
+        self.delegate?.dismissFormUploadAssets()
+        
+        super.viewWillDisappear(animated)
+    }
 
     func reloadForm() {
         

+ 7 - 2
iOSClient/Main/CCMain.m

@@ -35,7 +35,7 @@
 #import "NCAutoUpload.h"
 #import "NCBridgeSwift.h"
 
-@interface CCMain () <CCActionsDeleteDelegate, CCActionsRenameDelegate, CCActionsSearchDelegate, CCActionsDownloadThumbnailDelegate, CCActionsSettingFavoriteDelegate, UITextViewDelegate>
+@interface CCMain () <CCActionsDeleteDelegate, CCActionsRenameDelegate, CCActionsSearchDelegate, CCActionsDownloadThumbnailDelegate, CCActionsSettingFavoriteDelegate, UITextViewDelegate, createFormUploadAssetsDelegate>
 {
     tableMetadata *_metadata;
     
@@ -704,6 +704,11 @@
 #pragma mark ===== Assets Picker =====
 #pragma --------------------------------------------------------------------------------------------
 
+-(void)dismissFormUploadAssets
+{
+    [self reloadDatasource];
+}
+
 - (void)openAssetsPickerController
 {
     CTAssetCheckmark *checkmark = [CTAssetCheckmark appearance];
@@ -739,7 +744,7 @@
 {
     [picker dismissViewControllerAnimated:YES completion:^{
         
-        CreateFormUploadAssets *form = [[CreateFormUploadAssets alloc] init:_titleMain serverUrl:_serverUrl assets:assets cryptated:_isPickerCriptate session:k_upload_session];
+        CreateFormUploadAssets *form = [[CreateFormUploadAssets alloc] init:_titleMain serverUrl:_serverUrl assets:assets cryptated:_isPickerCriptate session:k_upload_session delegate:self];
         form.title = NSLocalizedString(@"_upload_photos_videos_", nil);
         
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:form];