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

Perform additional checks to avoid negative lengths

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-02-28 15:23:20 -05:00
parent 88455acc76
commit 4def8f0409
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
View File

@@ -267,7 +267,7 @@ public class ListHabitsFragment extends Fragment
{ {
DisplayMetrics dm = getResources().getDisplayMetrics(); DisplayMetrics dm = getResources().getDisplayMetrics();
int width = (int) (dm.widthPixels / dm.density); int width = (int) (dm.widthPixels / dm.density);
buttonCount = (int) ((width - 160) / 42.0); buttonCount = Math.max(0, (int) ((width - 160) / 42.0));
tvNameWidth = (int) ((width - 30 - buttonCount * 42) * dm.density); tvNameWidth = (int) ((width - 30 - buttonCount * 42) * dm.density);
loader = new HabitListLoader(); loader = new HabitListLoader();
@@ -719,7 +719,8 @@ public class ListHabitsFragment extends Fragment
TextView tvCheck = (TextView) llButtons.getChildAt(i); TextView tvCheck = (TextView) llButtons.getChildAt(i);
tvCheck.setTag(R.string.habit_key, habitId); tvCheck.setTag(R.string.habit_key, habitId);
tvCheck.setTag(R.string.offset_key, i); tvCheck.setTag(R.string.offset_key, i);
updateCheckmark(activeColor, tvCheck, isChecked[i]); if(isChecked.length > i)
updateCheckmark(activeColor, tvCheck, isChecked[i]);
} }
} }

2
app/src/main/java/org/isoron/uhabits/models/Habit.java
View File

@@ -269,6 +269,8 @@ public class Habit extends Model
{ {
updateCheckmarks(); updateCheckmarks();
if(fromTimestamp > toTimestamp) return new int[0];
String query = "select value, timestamp from Checkmarks where " + String query = "select value, timestamp from Checkmarks where " +
"habit = ? and timestamp >= ? and timestamp <= ?"; "habit = ? and timestamp >= ? and timestamp <= ?";