lint

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 268
+let databaseSchemaVersion: UInt64   = 269

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -71,7 +71,6 @@ class NCUploadAssets: NSObject, ObservableObject, NCCreateFormUploadConflictDele
         self.assets = assets
         self.serverUrl = serverUrl
         self.userBaseUrl = userBaseUrl
-        
     }
 
     func loadImages() {
@@ -252,7 +251,6 @@ struct UploadAssetsView: View {
         var serverUrl = uploadAssets.isUseAutoUploadFolder ? autoUploadPath : uploadAssets.serverUrl
         let autoUploadSubfolderGranularity = NCManageDatabase.shared.getAccountAutoUploadSubfolderGranularity()
 
-
         for tlAsset in uploadAssets.assets {
             guard let asset = tlAsset.phAsset,
                   let previewStore = uploadAssets.previewStore.first(where: { $0.id == asset.localIdentifier }),
@@ -284,13 +282,11 @@ struct UploadAssetsView: View {
                 let monthString = dateFormatter.string(from: creationDate)
                 dateFormatter.dateFormat = "dd"
                 let dayString = dateFormatter.string(from: creationDate)
-                if (autoUploadSubfolderGranularity == 0) {
+                if autoUploadSubfolderGranularity == 0 {
                     serverUrl = autoUploadPath + "/" + yearString
-                }
-                else if (autoUploadSubfolderGranularity == 2) {
+                } else if autoUploadSubfolderGranularity == 2 {
                     serverUrl = autoUploadPath + "/" + yearString + "/" + monthString + "/" + dayString
-                }
-                else {  // Month Granularity is default
+                } else {  // Month Granularity is default
                     serverUrl = autoUploadPath + "/" + yearString + "/" + monthString
                 }
             }

iOSClient/Networking/NCNetworking.swift

@@ -1128,13 +1128,11 @@ class NCNetworking: NSObject, NKCommonDelegate {
                 let month = dateFormatter.string(from: date)
                 dateFormatter.dateFormat = "dd"
                 let day = dateFormatter.string(from: date)
-                if (autoUploadSubfolderGranularity == 0) {
+                if autoUploadSubfolderGranularity == 0 {
                     datesSubFolder.append("\(year)")
-                }
-                else if (autoUploadSubfolderGranularity == 2) {
+                } else if autoUploadSubfolderGranularity == 2 {
                     datesSubFolder.append("\(year)/\(month)/\(day)")
-                }
-                else {  // Month Granularity is default
+                } else {  // Month Granularity is default
                     datesSubFolder.append("\(year)/\(month)")
                 }
             }
@@ -1150,11 +1148,11 @@ class NCNetworking: NSObject, NKCommonDelegate {
                 let year = subfolderArray[0]
                 let serverUrlYear = autoUploadPath
                 result = createFolder(fileName: String(year), serverUrl: serverUrlYear)  // Year always present independently of preference value
-                if result && (autoUploadSubfolderGranularity >= 1) {
+                if result && autoUploadSubfolderGranularity >= 1 {
                     let month = subfolderArray[1]
                     let serverUrlMonth = autoUploadPath + "/" + year
                     result = createFolder(fileName: String(month), serverUrl: serverUrlMonth)
-                    if result && (autoUploadSubfolderGranularity == 2) {
+                    if result && autoUploadSubfolderGranularity == 2 {
                         let day = subfolderArray[2]
                         let serverUrlDay = autoUploadPath + "/" + year + "/" + month
                         result = createFolder(fileName: String(day), serverUrl: serverUrlDay)

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

@@ -389,7 +389,7 @@
 "_autoupload_fullphotos_"           = "Upload the whole camera roll";
 "_autoupload_fullphotos_footer_"    = "Adjust the options above before uploading";
 "_autoupload_create_subfolder_"     = "Use subfolders";
-"_autoupload_create_subfolder_footer_" = "Store in subfolders based on year and month";
+"_autoupload_create_subfolder_footer_" = "Store in subfolders based on year, month or daily";
 "_autoupload_subfolder_granularity_" = "Subfolder Granularity";
 "_autoupload_filenamemask_"         = "Change filename mask";
 "_autoupload_filenamemask_footer_"  = "Change the automatic filename mask";