fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle leap years properly

Browse Source
This commit is contained in:
tibbi
2016-09-11 15:50:32 +02:00
parent 88adcb1d9e
commit ffc6d3535e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/simplemobiletools/calendar/DBHelper.java
View File

@@ -11,6 +11,7 @@ import android.text.TextUtils;
import com.simplemobiletools.calendar.models.Event; import com.simplemobiletools.calendar.models.Event;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -170,7 +171,17 @@ public class DBHelper extends SQLiteOpenHelper {
final List<Event> newEvents = fillEvents(cursor); final List<Event> newEvents = fillEvents(cursor);
for (Event e : newEvents) { for (Event e : newEvents) {
final int periods = (ts - e.getStartTS()) / e.getRepeatInterval(); final int periods = (ts - e.getStartTS()) / e.getRepeatInterval();
final int newStartTS = e.getStartTS() + periods * e.getRepeatInterval(); DateTime currStart = new DateTime(e.getStartTS() * 1000L, DateTimeZone.getDefault());
DateTime newStart;
if (e.getRepeatInterval() == Constants.DAY) {
newStart = currStart.plusDays(periods);
} else if (e.getRepeatInterval() == Constants.WEEK) {
newStart = currStart.plusWeeks(periods);
} else {
newStart = currStart.plusYears(periods);
}
final int newStartTS = (int) (newStart.getMillis() / 1000);
final int newEndTS = newStartTS + (e.getEndTS() - e.getStartTS()); final int newEndTS = newStartTS + (e.getEndTS() - e.getStartTS());
e.setStartTS(newStartTS); e.setStartTS(newStartTS);
e.setEndTS(newEndTS); e.setEndTS(newEndTS);