From cfeef3651f375fe9d6f15d32dff576a8fcc89e80 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Wed, 23 Dec 2020 19:25:42 -0600
Subject: [PATCH] Remove ModelObservable from EntryList

---
 .../common/dialogs/HistoryEditorDialog.java     | 17 +----------------
 .../isoron/uhabits/core/models/EntryList.java   |  3 ---
 .../core/models/memory/MemoryEntryList.java     |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
index 15adcf154..8becd7969 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.*;
 import static org.isoron.uhabits.utils.InterfaceUtils.*;
 
 public class HistoryEditorDialog extends AppCompatDialogFragment
-    implements DialogInterface.OnClickListener, ModelObservable.Listener
+    implements DialogInterface.OnClickListener
 {
     @Nullable
     private Habit habit;
@@ -115,19 +115,6 @@ public class HistoryEditorDialog extends AppCompatDialogFragment
         return builder.create();
     }
 
-    @Override
-    public void onModelChange()
-    {
-        refreshData();
-    }
-
-    @Override
-    public void onPause()
-    {
-        habit.getComputedEntries().observable.removeListener(this);
-        super.onPause();
-    }
-
     @Override
     public void onResume()
     {
@@ -140,9 +127,7 @@ public class HistoryEditorDialog extends AppCompatDialogFragment
         int height = Math.min(metrics.heightPixels, maxHeight);
 
         getDialog().getWindow().setLayout(width, height);
-
         refreshData();
-        habit.getComputedEntries().observable.addListener(this);
     }
 
     @Override
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.java
index b3c236c09..f34b87d66 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.java
@@ -41,12 +41,9 @@ public abstract class EntryList
 {
     protected final Habit habit;
 
-    public final ModelObservable observable;
-
     public EntryList(Habit habit)
     {
         this.habit = habit;
-        this.observable = new ModelObservable();
     }
 
     @NonNull
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryEntryList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryEntryList.java
index ad9c5cb50..f77dd7374 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryEntryList.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryEntryList.java
@@ -80,7 +80,6 @@ public class MemoryEntryList extends EntryList
     public void invalidateNewerThan(Timestamp timestamp)
     {
         list.clear();
-        observable.notifyListeners();
     }
 
     @Override