refactor: small changes

Author: PhilippThaler

opencloudApp/src/main/java/eu/opencloud/android/workers/AutomaticUploadsWorker.kt

@@ -181,21 +181,27 @@ class AutomaticUploadsWorker(
         val pathBuilder = StringBuilder(folderBackUpConfiguration.uploadPath.plus(File.separator))
 
         val lastModifiedDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(documentFile.lastModified()), ZoneId.systemDefault())
-        val yearStr = lastModifiedDateTime.format(DateTimeFormatter.ofPattern("YYYY"))
+        val yearStr = lastModifiedDateTime.format(DateTimeFormatter.ofPattern("yyyy"))
         val monthStr = lastModifiedDateTime.format(DateTimeFormatter.ofPattern("MM"))
         val dayStr = lastModifiedDateTime.format(DateTimeFormatter.ofPattern("dd"))
 
-        if (folderBackUpConfiguration.useSubfoldersBehaviour == UseSubfoldersBehaviour.YEAR) {
-            pathBuilder.append(yearStr).append(File.separator)
-        }
-        if (folderBackUpConfiguration.useSubfoldersBehaviour == UseSubfoldersBehaviour.YEAR_MONTH) {
-            pathBuilder.append(yearStr).append(File.separator)
-            pathBuilder.append(monthStr).append(File.separator)
-        }
-        if (folderBackUpConfiguration.useSubfoldersBehaviour == UseSubfoldersBehaviour.YEAR_MONTH_DAY) {
-            pathBuilder.append(yearStr).append(File.separator)
-            pathBuilder.append(monthStr).append(File.separator)
-            pathBuilder.append(dayStr).append(File.separator)
+        when (folderBackUpConfiguration.useSubfoldersBehaviour) {
+            UseSubfoldersBehaviour.YEAR_MONTH_DAY -> {
+                pathBuilder.append(yearStr).append(File.separator)
+                pathBuilder.append(monthStr).append(File.separator)
+                pathBuilder.append(dayStr).append(File.separator)
+            }
+
+            UseSubfoldersBehaviour.YEAR_MONTH -> {
+                pathBuilder.append(yearStr).append(File.separator)
+                pathBuilder.append(monthStr).append(File.separator)
+            }
+
+            UseSubfoldersBehaviour.YEAR -> {
+                pathBuilder.append(yearStr).append(File.separator)
+            }
+
+            else -> {}
         }
         return pathBuilder.append(documentFile.name).toString()
     }

opencloudData/src/main/java/eu/opencloud/android/data/folderbackup/db/FolderBackUpEntity.kt

@@ -30,7 +30,7 @@ data class FolderBackUpEntity(
     val sourcePath: String,
     val uploadPath: String,
     val wifiOnly: Boolean,
-    @ColumnInfo(name = "useSubfoldersBehaviour", defaultValue = "YEAR")
+    @ColumnInfo(name = "useSubfoldersBehaviour", defaultValue = "NONE")
     val useSubfoldersBehaviour: String,
     val chargingOnly: Boolean,
     val name: String,

opencloudDomain/src/main/java/eu/opencloud/android/domain/automaticuploads/model/FolderBackUpConfiguration.kt

@@ -75,14 +75,11 @@ enum class UseSubfoldersBehaviour {
 
     companion object {
         fun fromString(string: String): UseSubfoldersBehaviour =
-            if (string.equals(YEAR.name, ignoreCase = true)) {
-                YEAR
-            } else if (string.equals(YEAR_MONTH.name, ignoreCase = true)) {
-                YEAR_MONTH
-            } else if (string.equals(YEAR_MONTH_DAY.name, ignoreCase = true)) {
-                YEAR_MONTH_DAY
-            } else {
-                NONE
+            when (string.uppercase()) {
+                YEAR.name -> YEAR
+                YEAR_MONTH.name -> YEAR_MONTH
+                YEAR_MONTH_DAY.name -> YEAR_MONTH_DAY
+                else -> NONE
             }
     }
 }

opencloudTestUtil/src/main/java/eu/opencloud/android/testutil/OCFolderBackUpConfiguration.kt

@@ -20,10 +20,11 @@
 
 package eu.opencloud.android.testutil
 
-import eu.opencloud.android.domain.automaticuploads.model.FolderBackUpConfiguration
-import eu.opencloud.android.domain.automaticuploads.model.UploadBehavior
 import eu.opencloud.android.data.folderbackup.db.FolderBackUpEntity
 import eu.opencloud.android.domain.automaticuploads.model.AutomaticUploadsConfiguration
+import eu.opencloud.android.domain.automaticuploads.model.FolderBackUpConfiguration
+import eu.opencloud.android.domain.automaticuploads.model.UploadBehavior
+import eu.opencloud.android.domain.automaticuploads.model.UseSubfoldersBehaviour
 
 val OC_BACKUP = FolderBackUpConfiguration(
     accountName = "",
@@ -33,6 +34,7 @@ val OC_BACKUP = FolderBackUpConfiguration(
     wifiOnly = true,
     chargingOnly = true,
     lastSyncTimestamp = 1542628397,
+    useSubfoldersBehaviour = UseSubfoldersBehaviour.YEAR,
     name = "",
     spaceId = null,
 )
@@ -45,6 +47,7 @@ val OC_BACKUP_ENTITY = FolderBackUpEntity(
     wifiOnly = true,
     chargingOnly = true,
     lastSyncTimestamp = 1542628397,
+    useSubfoldersBehaviour = UseSubfoldersBehaviour.YEAR.name,
     name = "",
     spaceId = null,
 )