#673

iOSClient/Main/CCCreateCloud.swift

@@ -158,8 +158,8 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         section.addFormRow(row)
         
-        // User folder Media
-        row = XLFormRowDescriptor(tag: "useFolderMedia", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_use_folder_media_", comment: ""))
+        // User folder Autoupload
+        row = XLFormRowDescriptor(tag: "useFolderAutoUpload", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_use_folder_auto_upload_", comment: ""))
         row.value = 0
         
         row.cellConfig["textLabel.font"] = UIFont.systemFont(ofSize: 15.0)
@@ -174,7 +174,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         } else {
             row.value = 0
         }
-        row.hidden = "$\("useFolderMedia") == 0"
+        row.hidden = "$\("useFolderAutoUpload") == 0"
 
         row.cellConfig["textLabel.font"] = UIFont.systemFont(ofSize: 15.0)
 
@@ -241,7 +241,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         super.formRowDescriptorValueHasChanged(formRow, oldValue: oldValue, newValue: newValue)
         
-        if formRow.tag == "useFolderMedia" {
+        if formRow.tag == "useFolderAutoUpload" {
             
             if (formRow.value! as AnyObject).boolValue  == true {
                 
@@ -366,7 +366,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         self.dismiss(animated: true, completion: {
             
-            let useFolderPhotoRow : XLFormRowDescriptor  = self.form.formRow(withTag: "useFolderMedia")!
+            let useFolderPhotoRow : XLFormRowDescriptor  = self.form.formRow(withTag: "useFolderAutoUpload")!
             let useSubFolderRow : XLFormRowDescriptor  = self.form.formRow(withTag: "useSubFolder")!
             var useSubFolder : Bool = false
             

iOSClient/Media/CCMedia.m

@@ -51,7 +51,7 @@
     // Remenu
     REMenu *menu;
     REMenuItem *menuSelectMediaFolder;
-    REMenuItem *menuSelectAutomaticUploadFolder;
+//    REMenuItem *menuSelectAutomaticUploadFolder;
     REMenuItem *menuFilterImage;
     REMenuItem *menuFilterVideo;
     REMenuItem *menuSelectItems;
@@ -248,13 +248,15 @@
         }
     }];
     
-    menuSelectAutomaticUploadFolder = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_media_folder_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderMedia"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+    menuSelectMediaFolder = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_media_folder_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderMedia"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
         [self selectStartDirectoryPhotosTab];
     }];
     
-    menuSelectMediaFolder = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_automatic_upload_folder_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderAutomaticUpload"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+    /*
+    menuSelectAutomaticUploadFolder = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_automatic_upload_folder_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderAutomaticUpload"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
         [self selectAutomaticUploadFolder];
     }];
+    */
     
     if (filterTypeFileImage) {
         menuFilterImage = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_media_viewimage_show_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"imageno"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
@@ -282,7 +284,7 @@
     
     // REMENU --------------------------------------------------------------------------------------------------------------
     
-    menu = [[REMenu alloc] initWithItems:@[menuSelectItems, menuSelectMediaFolder, menuSelectAutomaticUploadFolder, menuFilterImage, menuFilterVideo]];
+    menu = [[REMenu alloc] initWithItems:@[menuSelectItems, menuSelectMediaFolder, menuFilterImage, menuFilterVideo]];
     
     menu.imageOffset = CGSizeMake(5, -1);
     
@@ -625,7 +627,7 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Change Start directory && Automatic upload directory ====
+#pragma mark ==== Change Start directory ====
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title type:(NSString *)type
@@ -644,6 +646,7 @@
         }
     }
     
+    /*
     if ([type isEqualToString:@"automaticUploadFolder"]) {
         
         if (title == nil) {
@@ -665,6 +668,7 @@
         // Clear data new Auto Upload
         [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
     }
+    */
 }
 
 - (void)selectStartDirectoryPhotosTab
@@ -691,6 +695,7 @@
     [self presentViewController:navigationController animated:YES completion:nil];
 }
 
+/*
 - (void)selectAutomaticUploadFolder
 {
     UINavigationController* navigationController = [[UIStoryboard storyboardWithName:@"CCMove" bundle:nil] instantiateViewControllerWithIdentifier:@"CCMove"];
@@ -714,6 +719,7 @@
     [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
     [self presentViewController:navigationController animated:YES completion:nil];
 }
+*/
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Search Photo/Video ====

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -507,6 +507,7 @@
 
 "_destination_folder_"              = "Destination folder";
 "_use_folder_media_"                = "Use the Media folder as destination";
+"_use_folder_auto_upload_"          = "Use the Auto Upload folder as destination";
 "_rename_filename_"                 = "Rename";
 "_filename_"                        = "Filename";
 "_preview_filename_"                = "Example preview of filename. You can use the mask %@ for date/time";