diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml index ac3389550..9e8e8ae48 100644 --- a/uhabits-android/src/main/AndroidManifest.xml +++ b/uhabits-android/src/main/AndroidManifest.xml @@ -20,8 +20,8 @@ + android:versionCode="31" + android:versionName="1.7.4"> diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java index cfceec388..43eed3ce4 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java @@ -267,9 +267,7 @@ public class SQLiteHabitList extends HabitList for (HabitRecord record : recordList) { Habit habit = getById(record.getId()); - if (habit == null) - throw new RuntimeException("habit not in database"); - + if (habit == null) continue; if (!filter.matches(habit)) continue; habits.add(habit); } diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java index fc1fc4cd5..0f9c19145 100644 --- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java +++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java @@ -81,7 +81,7 @@ public abstract class ScoreList implements Iterable * @param timestamp the timestamp of a day * @return score value for that day */ - public final double getValue(long timestamp) + public final synchronized double getValue(long timestamp) { compute(timestamp, timestamp); Score s = getComputedByTimestamp(timestamp);