Merge branch 'hotfix/1.7.6'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.7.6 (July 18, 2017)
+
+* Fix bug that caused widgets not to render sometimes
+* Fix other minor bugs
+* Update translations
+
 ### 1.7.3 (May 30, 2017)
 
 * Improve performance of 'sort by score'

app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java

@@ -171,13 +171,13 @@ public void testArchiveHabits()
         clickMenuItem(R.string.archive);
         assertHabitsDontExist(names);
 
-        clickMenuItem(R.string.show_archived);
+        clickMenuItem(R.string.hide_archived);
 
         assertHabitsExist(names);
         selectHabits(names);
         clickMenuItem(R.string.unarchive);
 
-        clickMenuItem(R.string.show_archived);
+        clickMenuItem(R.string.hide_archived);
 
         assertHabitsExist(names);
         deleteHabits(names);

app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java

@@ -115,6 +115,41 @@ public void testInvalidateNewerThan()
         assertThat(records.get(0).timestamp, equalTo(today - 21 * day));
     }
 
+    @Test
+    public void testFixRecords() throws Exception
+    {
+        long day = DateUtils.millisecondsInOneDay;
+        long from = DateUtils.getStartOfToday();
+        long to = from + 5 * day;
+
+        List<CheckmarkRecord> original, actual, expected;
+        HabitRecord habit = new HabitRecord();
+
+        original = new ArrayList<>();
+        original.add(new CheckmarkRecord(habit, from + 8*day, 2));
+        original.add(new CheckmarkRecord(habit, from + 5*day, 0));
+        original.add(new CheckmarkRecord(habit, from + 4*day, 0));
+        original.add(new CheckmarkRecord(habit, from + 4*day, 2));
+        original.add(new CheckmarkRecord(habit, from + 3*day, 2));
+        original.add(new CheckmarkRecord(habit, from + 2*day, 1));
+        original.add(new CheckmarkRecord(habit, from + 2*day + 100, 1));
+        original.add(new CheckmarkRecord(habit, from, 0));
+        original.add(new CheckmarkRecord(habit, from, 2));
+        original.add(new CheckmarkRecord(habit, from - day, 2));
+
+        actual = SQLiteCheckmarkList.fixRecords(original, habit, from, to);
+
+        expected = new ArrayList<>();
+        expected.add(new CheckmarkRecord(habit, from + 5*day, 0));
+        expected.add(new CheckmarkRecord(habit, from + 4*day, 2));
+        expected.add(new CheckmarkRecord(habit, from + 3*day, 2));
+        expected.add(new CheckmarkRecord(habit, from + 2*day, 1));
+        expected.add(new CheckmarkRecord(habit, from + day, 0));
+        expected.add(new CheckmarkRecord(habit, from, 2));
+
+        assertThat(actual, equalTo(expected));
+    }
+
     private List<CheckmarkRecord> getAllRecords()
     {
         return new Select()

app/src/main/AndroidManifest.xml

@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="32"
-    android:versionName="1.7.5">
+    android:versionCode="33"
+    android:versionName="1.7.6">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java

@@ -32,7 +32,8 @@
 import java.text.*;
 import java.util.*;
 
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.models.Checkmark.CHECKED_EXPLICITLY;
+import static org.isoron.uhabits.models.Checkmark.UNCHECKED;
 
 public class HistoryChart extends ScrollableChart
 {
@@ -112,10 +113,21 @@ public boolean onSingleTapUp(MotionEvent e)
         if (!isEditable) return false;
 
         performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+        float x, y;
 
-        int pointerId = e.getPointerId(0);
-        float x = e.getX(pointerId);
-        float y = e.getY(pointerId);
+        try
+        {
+            int pointerId = e.getPointerId(0);
+            x = e.getX(pointerId);
+            y = e.getY(pointerId);
+        }
+        catch (RuntimeException ex)
+        {
+            // Android often throws IllegalArgumentException here. Apparently,
+            // the pointer id may become invalid shortly after calling
+            // e.getPointerId.
+            return false;
+        }
 
         final Long timestamp = positionToTimestamp(x, y);
         if (timestamp == null) return false;

app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java

@@ -105,11 +105,10 @@ public void clearSelection()
      * Returns the item that occupies a certain position on the list
      *
      * @param position position of the item
-     * @return the item at given position
-     * @throws IndexOutOfBoundsException if position is not valid
+     * @return the item at given position or null if position is invalid
      */
     @Deprecated
-    @NonNull
+    @Nullable
     public Habit getItem(int position)
     {
         return cache.getHabitByPosition(position);
@@ -314,6 +313,8 @@ public void setOrder(HabitList.Order order)
     public void toggleSelection(int position)
     {
         Habit h = getItem(position);
+        if (h == null) return;
+
         int k = selected.indexOf(h);
         if (k < 0) selected.add(h);
         else selected.remove(h);

app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java

@@ -93,12 +93,12 @@ public int[] getCheckmarks(long habitId)
      * Returns the habits that occupies a certain position on the list.
      *
      * @param position the position of the habit
-     * @return the habit at given position
-     * @throws IndexOutOfBoundsException if position is not valid
+     * @return the habit at given position or null if position is invalid
      */
-    @NonNull
-    public Habit getHabitByPosition(int position)
+    @Nullable
+    public synchronized Habit getHabitByPosition(int position)
     {
+        if(position < 0 || position >= data.habits.size()) return null;
         return data.habits.get(position);
     }
 

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java

@@ -143,12 +143,13 @@ public void setSelected(boolean isSelected)
         updateBackground(isSelected);
     }
 
-    public void triggerRipple(long timestamp)
+    public synchronized void triggerRipple(long timestamp)
     {
         long today = DateUtils.getStartOfToday();
         long day = DateUtils.millisecondsInOneDay;
         int offset = (int) ((today - timestamp) / day) - dataOffset;
         CheckmarkButtonView button = checkmarkPanel.indexToButton(offset);
+        if (button == null) return;
 
         float y = button.getHeight() / 2.0f;
         float x = checkmarkPanel.getX() + button.getX() + button.getWidth() / 2;

app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java

@@ -53,38 +53,27 @@ public class SQLiteCheckmarkList extends CheckmarkList
     @Nullable
     private CachedData cache;
 
-    @NonNull
-    private final SQLiteStatement invalidateStatement;
-
-    @NonNull
-    private final SQLiteStatement addStatement;
-
-    @NonNull
-    private final SQLiteDatabase db;
-
     public SQLiteCheckmarkList(Habit habit)
     {
         super(habit);
         sqlite = new SQLiteUtils<>(CheckmarkRecord.class);
-
-        db = Cache.openDatabase();
-        addStatement = db.compileStatement(ADD_QUERY);
-        invalidateStatement = db.compileStatement(INVALIDATE_QUERY);
     }
 
     @Override
     public void add(List<Checkmark> checkmarks)
     {
         check(habit.getId());
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(ADD_QUERY);
         db.beginTransaction();
         try
         {
             for (Checkmark c : checkmarks)
             {
-                addStatement.bindLong(1, habit.getId());
-                addStatement.bindLong(2, c.getTimestamp());
-                addStatement.bindLong(3, c.getValue());
-                addStatement.execute();
+                statement.bindLong(1, habit.getId());
+                statement.bindLong(2, c.getTimestamp());
+                statement.bindLong(3, c.getValue());
+                statement.execute();
             }
 
             db.setTransactionSuccessful();
@@ -115,14 +104,7 @@ public List<Checkmark> getByInterval(long fromTimestamp, long toTimestamp)
         List<CheckmarkRecord> records = sqlite.query(query, params);
         for (CheckmarkRecord record : records) record.habit = habitRecord;
 
-        int nDays = DateUtils.getDaysBetween(fromTimestamp, toTimestamp) + 1;
-        if (records.size() != nDays)
-        {
-            throw new InconsistentDatabaseException(
-                String.format("habit=%s, %d expected, %d found",
-                    habit.getName(), nDays, records.size()));
-        }
-
+        records = fixRecords(records, habitRecord, fromTimestamp, toTimestamp);
         return toCheckmarks(records);
     }
 
@@ -139,9 +121,11 @@ public int getTodayValue()
     public void invalidateNewerThan(long timestamp)
     {
         cache = null;
-        invalidateStatement.bindLong(1, habit.getId());
-        invalidateStatement.bindLong(2, timestamp);
-        invalidateStatement.execute();
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(INVALIDATE_QUERY);
+        statement.bindLong(1, habit.getId());
+        statement.bindLong(2, timestamp);
+        statement.execute();
         observable.notifyListeners();
     }
 
@@ -198,6 +182,28 @@ private List<Checkmark> toCheckmarks(@NonNull List<CheckmarkRecord> records)
         return checkmarks;
     }
 
+    public static List<CheckmarkRecord> fixRecords(List<CheckmarkRecord> original,
+                                                   HabitRecord habit,
+                                                   long fromTimestamp,
+                                                   long toTimestamp)
+    {
+        long day = DateUtils.millisecondsInOneDay;
+        ArrayList<CheckmarkRecord> records = new ArrayList<>();
+
+        for (long t = toTimestamp; t >= fromTimestamp; t -= day)
+            records.add(new CheckmarkRecord(habit, t, Checkmark.UNCHECKED));
+
+        for (CheckmarkRecord record : original)
+        {
+            if ((toTimestamp - record.timestamp) % day != 0) continue;
+            int offset = (int) ((toTimestamp - record.timestamp) / day);
+            if (offset < 0 || offset >= records.size()) continue;
+            records.set(offset, record);
+        }
+
+        return records;
+    }
+
     private static class CachedData
     {
         int todayValue;

app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java

@@ -49,14 +49,6 @@ public class SQLiteScoreList extends ScoreList
     @NonNull
     private final SQLiteUtils<ScoreRecord> sqlite;
 
-    @NonNull
-    private final SQLiteStatement invalidateStatement;
-
-    @NonNull
-    private final SQLiteStatement addStatement;
-
-    private final SQLiteDatabase db;
-
     @Nullable
     private CachedData cache = null;
 
@@ -69,25 +61,23 @@ public SQLiteScoreList(@NonNull Habit habit)
     {
         super(habit);
         sqlite = new SQLiteUtils<>(ScoreRecord.class);
-
-        db = Cache.openDatabase();
-        addStatement = db.compileStatement(ADD_QUERY);
-        invalidateStatement = db.compileStatement(INVALIDATE_QUERY);
     }
 
     @Override
     public void add(List<Score> scores)
     {
         check(habit.getId());
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(ADD_QUERY);
         db.beginTransaction();
         try
         {
             for (Score s : scores)
             {
-                addStatement.bindLong(1, habit.getId());
-                addStatement.bindLong(2, s.getTimestamp());
-                addStatement.bindLong(3, s.getValue());
-                addStatement.execute();
+                statement.bindLong(1, habit.getId());
+                statement.bindLong(2, s.getTimestamp());
+                statement.bindLong(3, s.getValue());
+                statement.execute();
             }
 
             db.setTransactionSuccessful();
@@ -150,9 +140,11 @@ public synchronized int getTodayValue()
     public synchronized void invalidateNewerThan(long timestamp)
     {
         cache = null;
-        invalidateStatement.bindLong(1, habit.getId());
-        invalidateStatement.bindLong(2, timestamp);
-        invalidateStatement.execute();
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(INVALIDATE_QUERY);
+        statement.bindLong(1, habit.getId());
+        statement.bindLong(2, timestamp);
+        statement.execute();
         getObservable().notifyListeners();
     }
 

app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java

@@ -37,22 +37,19 @@
  */
 public class SQLiteStreakList extends StreakList
 {
+
+    private static final String INVALIDATE_QUERY =
+        "delete from Streak where habit = ? and end >= ?";
+
     private HabitRecord habitRecord;
 
     @NonNull
     private final SQLiteUtils<StreakRecord> sqlite;
 
-    private final SQLiteStatement invalidateStatement;
-
     public SQLiteStreakList(Habit habit)
     {
         super(habit);
         sqlite = new SQLiteUtils<>(StreakRecord.class);
-
-        SQLiteDatabase db = Cache.openDatabase();
-        String invalidateQuery = "delete from Streak where habit = ? " +
-                                 "and end >= ?";
-        invalidateStatement = db.compileStatement(invalidateQuery);
     }
 
     @Override
@@ -81,9 +78,11 @@ public Streak getNewestComputed()
     @Override
     public void invalidateNewerThan(long timestamp)
     {
-        invalidateStatement.bindLong(1, habit.getId());
-        invalidateStatement.bindLong(2, timestamp - DateUtils.millisecondsInOneDay);
-        invalidateStatement.execute();
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(INVALIDATE_QUERY);
+        statement.bindLong(1, habit.getId());
+        statement.bindLong(2, timestamp - DateUtils.millisecondsInOneDay);
+        statement.execute();
         observable.notifyListeners();
     }