isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes timezone bug and arithmetic overflow

Browse Source
This commit is contained in:
Alinson S. Xavier
2014-11-11 04:40:05 -05:00
parent 477eb80109
commit d8343105ec
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/isoron/uhabits/dialogs/ShowHabitsFragment.java
View File

@@ -231,8 +231,8 @@ public class ShowHabitsFragment extends Fragment implements OnSavedListener, OnI
listView.setOnTouchListener(controller); listView.setOnTouchListener(controller);
listView.setDragEnabled(true); listView.setDragEnabled(true);
GregorianCalendar day = new GregorianCalendar(); GregorianCalendar day = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
day.setTimeInMillis(DateHelper.getLocalTime()); day.setTimeInMillis(DateHelper.getStartOfDay(DateHelper.getLocalTime()));
for (int i = 0; i < button_count; i++) for (int i = 0; i < button_count; i++)
{ {

3
src/org/isoron/uhabits/models/Habit.java
View File

@@ -9,6 +9,7 @@ import org.isoron.uhabits.R;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.Color; import android.graphics.Color;
import android.util.Log;
import com.activeandroid.Model; import com.activeandroid.Model;
import com.activeandroid.annotation.Column; import com.activeandroid.annotation.Column;
@@ -258,7 +259,7 @@ public class Habit extends Model
public int[] getReps(long timeFrom, long timeTo) public int[] getReps(long timeFrom, long timeTo)
{ {
long timeFromExtended = timeFrom - freq_den * DateHelper.millisecondsInOneDay; long timeFromExtended = timeFrom - (long)(freq_den) * DateHelper.millisecondsInOneDay;
List<Repetition> reps = selectRepsFromTo(timeFromExtended, timeTo).execute(); List<Repetition> reps = selectRepsFromTo(timeFromExtended, timeTo).execute();
int nDaysExtended = (int) ((timeTo - timeFromExtended) / DateHelper.millisecondsInOneDay); int nDaysExtended = (int) ((timeTo - timeFromExtended) / DateHelper.millisecondsInOneDay);