fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1170 Contact birthday not correct on changing timezone 

The birthday was captured in DB with current time zone. While retrieving the date was parsed based on the current time zone. Modified that logic to parse date based on the timezone at which it was originally captured
This commit is contained in:
Varsha-29 2020-07-31 08:02:41 +05:30
parent bbc7ac1a29
commit 0afea3ac39
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Formatter.kt
View File

@ -85,6 +85,8 @@ object Formatter {
fun getDateTimeFromTS(ts: Long) = DateTime(ts * 1000L, DateTimeZone.getDefault())
fun getDateTimeFromTSForATimeZone(ts: Long, timeZoneId: String) = DateTime(ts * 1000L, DateTimeZone.forID(timeZoneId))
fun getUTCDateTimeFromTS(ts: Long) = DateTime(ts * 1000L, DateTimeZone.UTC)
// use manually translated month names, as DateFormat and Joda have issues with a lot of languages

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MonthlyCalendarImpl.kt
View File

@ -84,8 +84,8 @@ class MonthlyCalendarImpl(val callback: MonthlyCalendar, val context: Context) {
private fun markDaysWithEvents(days: ArrayList<DayMonthly>) {
val dayEvents = HashMap<String, ArrayList<Event>>()
mEvents.forEach {
val startDateTime = Formatter.getDateTimeFromTS(it.startTS)
val endDateTime = Formatter.getDateTimeFromTS(it.endTS)
val startDateTime = Formatter.getDateTimeFromTSForATimeZone(it.startTS, it.timeZone)
val endDateTime = Formatter.getDateTimeFromTSForATimeZone(it.endTS, it.timeZone)
val endCode = Formatter.getDayCodeFromDateTime(endDateTime)
var currDay = startDateTime