replace numbers

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   = 298
+let databaseSchemaVersion: UInt64   = 299

iOSClient/Data/NCManageDatabase+Account.swift

@@ -33,7 +33,7 @@ class tableAccount: Object, NCUserBaseUrl {
     @objc dynamic var alias = ""
     @objc dynamic var autoUpload: Bool = false
     @objc dynamic var autoUploadCreateSubfolder: Bool = false
-    @objc dynamic var autoUploadSubfolderGranularity: Int64 = 1
+    @objc dynamic var autoUploadSubfolderGranularity: Int = NCGlobal.shared.subfolderGranularityMonthly
     @objc dynamic var autoUploadDirectory = ""
     @objc dynamic var autoUploadFileName = ""
     @objc dynamic var autoUploadFull: Bool = false
@@ -262,17 +262,17 @@ extension NCManageDatabase {
         return folderPhotos
     }
 
-    @objc func getAccountAutoUploadSubfolderGranularity() -> Int64 {
+    @objc func getAccountAutoUploadSubfolderGranularity() -> Int {
 
         do {
             let realm = try Realm()
-            guard let result = realm.objects(tableAccount.self).filter("active == true").first else { return 1 }
+            guard let result = realm.objects(tableAccount.self).filter("active == true").first else { return NCGlobal.shared.subfolderGranularityMonthly }
             return result.autoUploadSubfolderGranularity
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("Could not write to database: \(error)")
         }
 
-        return 1
+        return NCGlobal.shared.subfolderGranularityMonthly
     }
 
     @discardableResult
@@ -333,7 +333,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAutoUploadGranularity(_ property: String, state: Int64) {
+    @objc func setAccountAutoUploadGranularity(_ property: String, state: Int) {
 
         do {
             let realm = try Realm()

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -243,9 +243,9 @@ struct UploadAssetsView: View {
                 let monthString = dateFormatter.string(from: creationDate)
                 dateFormatter.dateFormat = "dd"
                 let dayString = dateFormatter.string(from: creationDate)
-                if autoUploadSubfolderGranularity == 0 {
+                if autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityYearly {
                     serverUrl = autoUploadPath + "/" + yearString
-                } else if autoUploadSubfolderGranularity == 2 {
+                } else if autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityDaily {
                     serverUrl = autoUploadPath + "/" + yearString + "/" + monthString + "/" + dayString
                 } else {  // Month Granularity is default
                     serverUrl = autoUploadPath + "/" + yearString + "/" + monthString

iOSClient/NCGlobal.swift

@@ -310,6 +310,12 @@ class NCGlobal: NSObject {
     //
     let includeHiddenFiles: [String]                = [".LivePhoto"]
 
+    // Auto upload subfolder granularity
+    //
+    @objc let subfolderGranularityDaily             = 2
+    @objc let subfolderGranularityMonthly           = 1
+    @objc let subfolderGranularityYearly            = 0
+
     // Notification Center
     //
     @objc let notificationCenterApplicationDidEnterBackground   = "applicationDidEnterBackground"

iOSClient/Networking/NCAutoUpload.swift

@@ -139,10 +139,10 @@ class NCAutoUpload: NSObject {
                 }
 
                 if account.autoUploadCreateSubfolder {
-                    if (autoUploadSubfolderGranularity == 0) {
+                    if (autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityYearly) {
                         serverUrl = autoUploadPath + "/" + year
                     }
-                    else if (autoUploadSubfolderGranularity == 2) {
+                    else if (autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityDaily) {
                         serverUrl = autoUploadPath + "/" + year + "/" + month + "/" + day
                     }
                     else {  // Month Granularity is default

iOSClient/Networking/NCNetworking.swift

@@ -1120,9 +1120,9 @@ class NCNetworking: NSObject, NKCommonDelegate {
                 let month = dateFormatter.string(from: date)
                 dateFormatter.dateFormat = "dd"
                 let day = dateFormatter.string(from: date)
-                if autoUploadSubfolderGranularity == 0 {
+                if autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityYearly {
                     datesSubFolder.append("\(year)")
-                } else if autoUploadSubfolderGranularity == 2 {
+                } else if autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityDaily {
                     datesSubFolder.append("\(year)/\(month)/\(day)")
                 } else {  // Month Granularity is default
                     datesSubFolder.append("\(year)/\(month)")
@@ -1140,11 +1140,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 >= NCGlobal.shared.subfolderGranularityMonthly {
                     let month = subfolderArray[1]
                     let serverUrlMonth = autoUploadPath + "/" + year
                     result = createFolder(fileName: String(month), serverUrl: serverUrlMonth)
-                    if result && autoUploadSubfolderGranularity == 2 {
+                    if result && autoUploadSubfolderGranularity == NCGlobal.shared.subfolderGranularityDaily {
                         let day = subfolderArray[2]
                         let serverUrlDay = autoUploadPath + "/" + year + "/" + month
                         result = createFolder(fileName: String(day), serverUrl: serverUrlDay)

iOSClient/Settings/CCManageAutoUpload.m

@@ -151,9 +151,9 @@
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     row.selectorOptions = @[
-        [XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:NSLocalizedString(@"_yearly_", nil)],
-        [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:NSLocalizedString(@"_monthly_", nil)],
-        [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:NSLocalizedString(@"_daily_", nil)]
+        [XLFormOptionsObject formOptionsObjectWithValue:@(NCGlobal.shared.subfolderGranularityYearly) displayText:NSLocalizedString(@"_yearly_", nil)],
+        [XLFormOptionsObject formOptionsObjectWithValue:@(NCGlobal.shared.subfolderGranularityMonthly) displayText:NSLocalizedString(@"_monthly_", nil)],
+        [XLFormOptionsObject formOptionsObjectWithValue:@(NCGlobal.shared.subfolderGranularityDaily) displayText:NSLocalizedString(@"_daily_", nil)]
         ];
     row.value = row.selectorOptions[activeAccount.autoUploadSubfolderGranularity];
     row.required = true;