From 0e5b84a4f295a1161bf07c692a70951d1d9eb4a8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 21 Feb 2021 16:54:59 +0100 Subject: [PATCH] fix #1281, properly handle far time zones at the weekly view --- .../calendar/pro/activities/MainActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 26bae4518..adcd7453a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -790,7 +790,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun getThisWeekDateTime(): String { - var thisweek = DateTime().withZone(DateTimeZone.UTC).withDayOfWeek(1).withHourOfDay(12).minusDays(if (config.isSundayFirst) 1 else 0) + val currentOffsetHours = TimeZone.getDefault().rawOffset / 1000 / 60 / 60 + + // not great, not terrible + val useHours = if (currentOffsetHours >= 10) 8 else 12 + var thisweek = DateTime().withZone(DateTimeZone.UTC).withDayOfWeek(1).withHourOfDay(useHours).minusDays(if (config.isSundayFirst) 1 else 0) if (DateTime().minusDays(7).seconds() > thisweek.seconds()) { thisweek = thisweek.plusDays(7) }