auto upload filename

iOSClient/Settings/CCManageAutoUpload.m

@@ -157,6 +157,14 @@
 
     // Auto Upload file name
     
+    section = [XLFormSectionDescriptor formSection];
+    [form addFormSection:section];
+    
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"filename" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_autoupload_filenamemask_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    row.action.viewControllerClass = [NCManageAutoUploadFileName class];
+    [section addFormRow:row];
+    
     // end
     
     section = [XLFormSectionDescriptor formSection];

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -12,17 +12,19 @@ class NCManageAutoUploadFileName: XLFormViewController {
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
-    convenience init() {
-        
-        self.init()
+    required init(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
         self.initializeForm()
     }
     
-    //MARK: XLFormDescriptorDelegate
-    
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        self.initializeForm()
+    }
+        
     func initializeForm() {
         
-        let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+        let form : XLFormDescriptor = XLFormDescriptor(title: NSLocalizedString("_autoupload_filename_title_", comment: "")) as XLFormDescriptor
         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
         
         var section : XLFormSectionDescriptor

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

@@ -248,6 +248,7 @@
 "_create_full_upload_"                      = "Creating archive… May take a long time, please wait.";
 "_error_createsubfolders_upload_"           = "Error creating subfolders";
 "_activate_autoupload_"                     = "Enable auto upload";
+"_autoupload_filenamemask_"                 = "Change filename mask";
 
 // Template
 
@@ -554,3 +555,8 @@
 "photos"                            = "photos";
 "of"                                = "of";
 "%i of %i"                          = "%1$i of %2$i";
+
+// Manage Auto Upload FileName
+
+"_autoupload_filename_title_"       = "Auto upload filename";
+