From cd7bc0ecfeb87ca094e0775016d6424582e669ab Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 24 Feb 2021 08:56:39 -0600
Subject: [PATCH] Fix repeat calculation for utc+13

---
 .../astrid/repeats/RepeatTaskHelper.kt        |  2 +-
 .../astrid/repeats/RepeatDailyTests.kt        | 97 +++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt
index 8984f5b0f..6fa89679f 100644
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt
@@ -204,7 +204,7 @@ class RepeatTaskHelper @Inject constructor(
             return if (task.hasDueTime()) {
                 startDate.toDateTime()
             } else {
-                startDate.toDate()
+                Date(startDate.millis + startDate.offset)
             }
         }
 
diff --git a/app/src/test/java/com/todoroo/astrid/repeats/RepeatDailyTests.kt b/app/src/test/java/com/todoroo/astrid/repeats/RepeatDailyTests.kt
index e6eef17fe..db35eb331 100644
--- a/app/src/test/java/com/todoroo/astrid/repeats/RepeatDailyTests.kt
+++ b/app/src/test/java/com/todoroo/astrid/repeats/RepeatDailyTests.kt
@@ -3,8 +3,13 @@ package com.todoroo.astrid.repeats
 import com.natpryce.makeiteasy.MakeItEasy.with
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.tasks.TestUtilities.withTZ
 import org.tasks.makers.TaskMaker.COMPLETION_TIME
+import org.tasks.makers.TaskMaker.DUE_DATE
+import org.tasks.makers.TaskMaker.RECUR
+import org.tasks.makers.TaskMaker.newTask
 import org.tasks.time.DateTime
+import java.util.*
 
 class RepeatDailyTests : RepeatTests() {
     @Test
@@ -43,4 +48,96 @@ class RepeatDailyTests : RepeatTests() {
 
         assertEquals(newDayTime(2016, 8, 30, 0, 4), next)
     }
+
+    @Test
+    fun allDayRepeatNewYork() = withTZ(NEW_YORK) {
+        val task = newTask(
+            with(DUE_DATE, newDay(2021, 2, 24)),
+            with(RECUR, "FREQ=DAILY;INTERVAL=1")
+        )
+
+        val next = calculateNextDueDate(task)
+
+        assertEquals(newDay(2021, 2, 25), next)
+    }
+
+    @Test
+    fun dueTimeRepeatNewYork() = withTZ(NEW_YORK) {
+        val next = calculateNextDueDate(
+            newFromDue("FREQ=DAILY;INTERVAL=1", newDayTime(2021, 2, 24, 13, 30))
+        )
+
+        assertEquals(newDayTime(2021, 2, 25, 13, 30), next)
+    }
+
+    @Test
+    fun allDayRepeatLondon() = withTZ(LONDON) {
+
+        val next = calculateNextDueDate(
+            newTask(
+                with(DUE_DATE, newDay(2021, 2, 24)),
+                with(RECUR, "FREQ=DAILY;INTERVAL=1")
+            )
+        )
+
+        assertEquals(newDay(2021, 2, 25), next)
+    }
+
+    @Test
+    fun dueTimeRepeatLondon() = withTZ(LONDON) {
+        val next = calculateNextDueDate(
+            newFromDue("FREQ=DAILY;INTERVAL=1", newDayTime(2021, 2, 24, 13, 30))
+        )
+
+        assertEquals(newDayTime(2021, 2, 25, 13, 30), next)
+    }
+
+    @Test
+    fun allDayRepeatBerlin() = withTZ(BERLIN) {
+        val next = calculateNextDueDate(
+            newTask(
+                with(DUE_DATE, newDay(2021, 2, 24)),
+                with(RECUR, "FREQ=DAILY;INTERVAL=1")
+            )
+        )
+
+        assertEquals(newDay(2021, 2, 25), next)
+    }
+
+    @Test
+    fun dueTimeRepeatBerlin() = withTZ(BERLIN) {
+        val next = calculateNextDueDate(
+            newFromDue("FREQ=DAILY;INTERVAL=1", newDayTime(2021, 2, 24, 13, 30))
+        )
+
+        assertEquals(newDayTime(2021, 2, 25, 13, 30), next)
+    }
+
+    @Test
+    fun allDayRepeatUtcPlus13() = withTZ(APIA) {
+        val next = calculateNextDueDate(
+            newTask(
+                with(DUE_DATE, newDay(2021, 2, 24)),
+                with(RECUR, "FREQ=DAILY;INTERVAL=1")
+            )
+        )
+
+        assertEquals(newDay(2021, 2, 25), next)
+    }
+
+    @Test
+    fun dueTimeRepeatUtcPlus13() = withTZ(APIA) {
+        val next = calculateNextDueDate(
+            newFromDue("FREQ=DAILY;INTERVAL=1", newDayTime(2021, 2, 24, 13, 30))
+        )
+
+        assertEquals(newDayTime(2021, 2, 25, 13, 30), next)
+    }
+
+    companion object {
+        private val BERLIN = TimeZone.getTimeZone("Europe/Berlin")
+        private val LONDON = TimeZone.getTimeZone("Europe/London")
+        private val NEW_YORK = TimeZone.getTimeZone("America/New_York")
+        private val APIA = TimeZone.getTimeZone("Pacific/Apia")
+    }
 }
\ No newline at end of file