From add08d605471a20032556a03731c80918bd4b16c Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Wed, 15 Jun 2016 10:12:33 -0400 Subject: [PATCH] Fix reordering --- .../org/isoron/uhabits/models/sqlite/SQLiteHabitList.java | 2 ++ .../uhabits/ui/habits/list/model/HabitCardListAdapter.java | 2 -- .../uhabits/ui/habits/list/model/HabitCardListCache.java | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java index 9abd9213b..18b44421b 100644 --- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java +++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java @@ -205,6 +205,8 @@ public class SQLiteHabitList extends HabitList record.save(); update(from); + + getObservable().notifyListeners(); } @Override diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java index 8f3a9d925..1d2750316 100644 --- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java +++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java @@ -178,8 +178,6 @@ public class HabitCardListAdapter extends BaseAdapter public void reorder(int from, int to) { cache.reorder(from, to); - cache.refreshAllHabits(false); - notifyDataSetChanged(); } /** diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java index 74fd7e980..2cc1a108b 100644 --- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java +++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java @@ -144,12 +144,9 @@ public class HabitCardListCache implements CommandRunner.Listener public void reorder(int from, int to) { Habit fromHabit = data.habitsList.get(from); - Habit toHabit = data.habitsList.get(to); - data.habitsList.remove(from); data.habitsList.add(to, fromHabit); - - allHabits.reorder(fromHabit, toHabit); + if(listener != null) listener.onCacheRefresh(); } public void setCheckmarkCount(int checkmarkCount)