Add hub for new upload image

iOSClient/Create/CCCreateCloud.swift

@@ -379,14 +379,16 @@ class CreateFormUpload: XLFormViewController, CCMoveDelegate {
         
         self.dismiss(animated: true, completion: {
             
-            let useFolderPhoto : XLFormRowDescriptor  = self.form.formRow(withTag: "useFolderPhoto")!
-            let useSubfolder : XLFormRowDescriptor  = self.form.formRow(withTag: "useSubFolder")!
+            let useFolderPhotoRow : XLFormRowDescriptor  = self.form.formRow(withTag: "useFolderPhoto")!
+            let useSubFolderRow : XLFormRowDescriptor  = self.form.formRow(withTag: "useSubFolder")!
+            var useSubFolder : Bool = false
             
-            if (useFolderPhoto.value! as AnyObject).boolValue == true {
+            if (useFolderPhotoRow.value! as AnyObject).boolValue == true {
                 self.localServerUrl = CCCoreData.getCameraUploadFolderNamePathActiveAccount(self.appDelegate.activeAccount, activeUrl: self.appDelegate.activeUrl, typeCloud: self.appDelegate.typeCloud)
+                useSubFolder = (useSubFolderRow.value! as AnyObject).boolValue
             }
             
-            self.appDelegate.activeMain.uploadFileAsset(self.assets, serverUrl: self.localServerUrl, cryptated: self.cryptated!, useSubFolder: (useSubfolder.value! as AnyObject).boolValue, session: self.session)
+            self.appDelegate.activeMain.uploadFileAsset(self.assets, serverUrl: self.localServerUrl, cryptated: self.cryptated!, useSubFolder: useSubFolder, session: self.session)
         })
     }
 

iOSClient/Main/CCMain.m

@@ -1409,7 +1409,11 @@
 //
 - (void)uploadFileAsset:(NSMutableArray *)assets serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated useSubFolder:(BOOL)useSubFolder session:(NSString *)session
 {
-    [self performSelectorOnMainThread:@selector(uploadFileAssetBridge:) withObject:@[assets, serverUrl, [NSNumber numberWithBool:cryptated], [NSNumber numberWithBool:useSubFolder], session] waitUntilDone:NO];
+    [_hud visibleHudTitle:nil mode:MBProgressHUDModeIndeterminate color:nil];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void){
+        [self performSelectorOnMainThread:@selector(uploadFileAssetBridge:) withObject:@[assets, serverUrl, [NSNumber numberWithBool:cryptated], [NSNumber numberWithBool:useSubFolder], session] waitUntilDone:NO];
+    });
 }
 
 - (void)uploadFileAssetBridge:(NSArray *)arguments
@@ -1431,6 +1435,8 @@
         
         if(![app.activePhotosCameraUpload createFolder:folderPhotos]) {
             
+            [_hud hideHud];
+            
             [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
             
             return;
@@ -1444,6 +1450,8 @@
                 
             if(![app.activePhotosCameraUpload createFolder:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder]]) {
                 
+                [_hud hideHud];
+                
                 [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
                     
                 return;
@@ -1507,6 +1515,8 @@
             }
         }
     }
+    
+    [_hud hideHud];
 }
 
 #pragma --------------------------------------------------------------------------------------------