Merge branch 'hotfix/1.1.3' into main

mouredev · Aug 17, 2021 · 659ef9b · 659ef9b
2 parents 4977418 + 0e9f84f
commit 659ef9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.mouredev.twitimer"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 7
-        versionName "1.1.2"
+        versionCode 8
+        versionName "1.1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/mouredev/twitimer/util/extension/DateExtension.kt b/app/src/main/java/com/mouredev/twitimer/util/extension/DateExtension.kt
@@ -43,9 +43,9 @@ fun Date.next(weekday: Weekday, considerToday: Boolean = false, referenceDate: D
     if (considerToday && dayOfWeek == searchWeekdayIndex) {
         if (referenceDate != null && duration != null && Date(referenceDate.time + (1000 * 60 * 60 * duration)) > this) {
             return referenceDate
-        } else if (Date(this.time + (1000 * 60 * 60 * (duration ?: 0))) <= Date()) {
-            return this
-        } else if (save && this > Date()) {
+        } else if (Date() <= Date(this.time + (1000 * 60 * 60 * (duration ?: 0)))
+            || Date(this.time + (1000 * 60 * 60 * (duration ?: 0))) <= Date()
+            || save && this > Date()) {
             return this
         }
     }