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 branch 'dev' into stack_checkmark_widget

Browse Source
This commit is contained in:
Victor Yu
2017-11-08 21:04:45 -05:00
parent 8feb07ff1b 7613e6e1cb
commit def71d8141
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -6,7 +6,7 @@ TARGET_SDK_VERSION = 25
COMPILE_SDK_VERSION = 25 COMPILE_SDK_VERSION = 25
DAGGER_VERSION = 2.9 DAGGER_VERSION = 2.9
BUILD_TOOLS_VERSION = 26.0.0 BUILD_TOOLS_VERSION = 26.0.2
KOTLIN_VERSION = 1.1.2-4 KOTLIN_VERSION = 1.1.2-4
SUPPORT_LIBRARY_VERSION = 25.3.1 SUPPORT_LIBRARY_VERSION = 25.3.1

8
uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
View File

@@ -155,14 +155,14 @@ public class MemoryHabitList extends HabitList
} }
@Override @Override
public int indexOf(@NonNull Habit h) public synchronized int indexOf(@NonNull Habit h)
{ {
return list.indexOf(h); return list.indexOf(h);
} }
@NonNull @NonNull
@Override @Override
public Iterator<Habit> iterator() public synchronized Iterator<Habit> iterator()
{ {
return Collections.unmodifiableCollection(list).iterator(); return Collections.unmodifiableCollection(list).iterator();
} }
@@ -200,13 +200,13 @@ public class MemoryHabitList extends HabitList
} }
@Override @Override
public int size() public synchronized int size()
{ {
return list.size(); return list.size();
} }
@Override @Override
public void update(List<Habit> habits) public synchronized void update(List<Habit> habits)
{ {
resort(); resort();
getObservable().notifyListeners(); getObservable().notifyListeners();

18
uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
View File

@@ -91,7 +91,7 @@ public class SQLiteHabitList extends HabitList
@Override @Override
@Nullable @Nullable
public Habit getById(long id) public synchronized Habit getById(long id)
{ {
loadRecords(); loadRecords();
return list.getById(id); return list.getById(id);
@@ -99,7 +99,7 @@ public class SQLiteHabitList extends HabitList
@Override @Override
@NonNull @NonNull
public Habit getByPosition(int position) public synchronized Habit getByPosition(int position)
{ {
loadRecords(); loadRecords();
return list.getByPosition(position); return list.getByPosition(position);
@@ -107,7 +107,7 @@ public class SQLiteHabitList extends HabitList
@NonNull @NonNull
@Override @Override
public HabitList getFiltered(HabitMatcher filter) public synchronized HabitList getFiltered(HabitMatcher filter)
{ {
loadRecords(); loadRecords();
return list.getFiltered(filter); return list.getFiltered(filter);
@@ -121,21 +121,21 @@ public class SQLiteHabitList extends HabitList
} }
@Override @Override
public void setOrder(@NonNull Order order) public synchronized void setOrder(@NonNull Order order)
{ {
list.setOrder(order); list.setOrder(order);
getObservable().notifyListeners(); getObservable().notifyListeners();
} }
@Override @Override
public int indexOf(@NonNull Habit h) public synchronized int indexOf(@NonNull Habit h)
{ {
loadRecords(); loadRecords();
return list.indexOf(h); return list.indexOf(h);
} }
@Override @Override
public Iterator<Habit> iterator() public synchronized Iterator<Habit> iterator()
{ {
loadRecords(); loadRecords();
return list.iterator(); return list.iterator();
@@ -214,7 +214,7 @@ public class SQLiteHabitList extends HabitList
} }
@Override @Override
public void repair() public synchronized void repair()
{ {
loadRecords(); loadRecords();
rebuildOrder(); rebuildOrder();
@@ -222,7 +222,7 @@ public class SQLiteHabitList extends HabitList
} }
@Override @Override
public int size() public synchronized int size()
{ {
loadRecords(); loadRecords();
return list.size(); return list.size();
@@ -245,7 +245,7 @@ public class SQLiteHabitList extends HabitList
getObservable().notifyListeners(); getObservable().notifyListeners();
} }
public void reload() public synchronized void reload()
{ {
loaded = false; loaded = false;
} }