mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Upstream biweekly patch

Browse source
This commit is contained in:
M66B 2023-10-29 08:03:13 +01:00
parent 1b3bfd2d96
commit 6b3c7078e1
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/biweekly/io/ICalTimeZone.java
View file

@ -416,25 +416,26 @@ public class ICalTimeZone extends TimeZone {
RecurrenceIterator it = createIterator(observance);
/*
* The "advanceTo()" method skips all dates that are less than the
* given date. I would have thought that we would have to call
* "next()" once because we want it to skip the date that is equal
* to the "last" date. But this causes all the unit tests to fail,
* so I guess not.
* Calling "it.advanceTo()" here causes problems.
*
* See: https://github.com/mangstadt/biweekly/issues/126
*/
//it.advanceTo(last);
//it.next();
DateValue prev = null, cur = null;
boolean stopped = false;
while (it.hasNext()) {
cur = it.next();
int curComparison = cur.compareTo(last);
if (curComparison < 0) continue;
if (curComparison > 0) {
int curCompareToLast = cur.compareTo(last);
if (curCompareToLast < 0) {
continue;
}
if (curCompareToLast > 0) {
dateCache.add(cur);
}
if (curCompareToLast == 0) {
//do nothing; don't add to dateCache
}
if (givenDate.compareTo(cur) < 0) {
//stop if we have passed the givenTime
@ -444,7 +445,8 @@ public class ICalTimeZone extends TimeZone {
prev = cur;
}
return after ? (stopped ? cur : null) : prev; }
return after ? (stopped ? cur : null) : prev;
}
/*
* The date is somewhere in the cached list, so find it.