isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/custom-snooze

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-11-14 22:20:32 -06:00
parent a201273781 9d48b4bcdb
commit e91f1c3fa4
12 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

3
uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
View File

@@ -48,14 +48,15 @@ public class WidgetBehavior
public void onAddRepetition(@NonNull Habit habit, Timestamp timestamp)
{
notificationTray.cancel(habit);
Repetition rep = habit.getRepetitions().getByTimestamp(timestamp);
if (rep != null) return;
performToggle(habit, timestamp);
notificationTray.cancel(habit);
}
public void onRemoveRepetition(@NonNull Habit habit, Timestamp timestamp)
{
notificationTray.cancel(habit);
Repetition rep = habit.getRepetitions().getByTimestamp(timestamp);
if (rep == null) return;
performToggle(habit, timestamp);