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

Merge tag 'v1.7.4' into dev

Browse Source 
1.7.4

# Conflicts:
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
This commit is contained in:
Alinson S. Xavier
2017-06-05 09:20:47 -04:00
parent 277738f94d be3d7145ab
commit 382b52e5b2
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uhabits-android/src/main/AndroidManifest.xml
View File

@@ -20,8 +20,8 @@
<manifest
package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="30"
android:versionName="1.7.3">
android:versionCode="31"
android:versionName="1.7.4">
<uses-permission android:name="android.permission.VIBRATE"/>

4
uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
View File

@@ -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);
}

2
uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
View File

@@ -81,7 +81,7 @@ public abstract class ScoreList implements Iterable<Score>
* @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);