Resolving codacy stuff

Signed-off-by: Leo Berman <leograntberman@gmail.com>

Author: Leo-Berman

app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt

@@ -60,6 +60,7 @@ class GalleryAdapter(
 
     companion object {
         private const val TAG = "GalleryAdapter"
+        private const val FIRST_DAY_OF_MONTH = 1
         // Pattern to extract YYYY/MM or YYYY/MM/DD from file path (requires zero-padded month/day)
         private val FOLDER_DATE_PATTERN: Pattern = Pattern.compile("/(\\d{4})/(\\d{2})(?:/(\\d{2}))?/")
 
@@ -69,13 +70,15 @@ class GalleryAdapter(
          */
         @VisibleForTesting
         fun extractFolderDate(path: String?): Long? {
-            if (path == null) return null
-            val matcher = FOLDER_DATE_PATTERN.matcher(path)
-            if (matcher.find()) {
-                val year = matcher.group(1)?.toIntOrNull() ?: return null
-                val month = matcher.group(2)?.toIntOrNull() ?: return null
-                val day = matcher.group(3)?.toIntOrNull() ?: 1
-                return Calendar.getInstance().apply {
+            val matcher = path?.let { FOLDER_DATE_PATTERN.matcher(it) } ?: return null
+            if (!matcher.find()) return null
+
+            val year = matcher.group(1)?.toIntOrNull()
+            val month = matcher.group(2)?.toIntOrNull()
+            val day = matcher.group(3)?.toIntOrNull() ?: FIRST_DAY_OF_MONTH
+
+            return if (year != null && month != null) {
+                Calendar.getInstance().apply {
                     set(Calendar.YEAR, year)
                     set(Calendar.MONTH, month - 1)
                     set(Calendar.DAY_OF_MONTH, day)
@@ -84,8 +87,9 @@ class GalleryAdapter(
                     set(Calendar.SECOND, 0)
                     set(Calendar.MILLISECOND, 0)
                 }.timeInMillis
+            } else {
+                null
             }
-            return null
         }
     }