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

---
 .../isoron/uhabits/core/models/RepetitionList.java | 10 ----------
 .../core/models/memory/MemoryRepetitionList.java   |  3 ---
 .../core/models/sqlite/SQLiteRepetitionList.java   |  2 --
 .../uhabits/core/models/RepetitionListTest.java    | 14 --------------
 4 files changed, 29 deletions(-)

diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
index 0af9bd63f..45a988426 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
@@ -30,13 +30,9 @@ public abstract class RepetitionList
     @NonNull
     protected final Habit habit;
 
-    @NonNull
-    protected final ModelObservable observable;
-
     public RepetitionList(@NonNull Habit habit)
     {
         this.habit = habit;
-        this.observable = new ModelObservable();
     }
 
     /**
@@ -86,12 +82,6 @@ public abstract class RepetitionList
         return check.getValue();
     }
 
-    @NonNull
-    public ModelObservable getObservable()
-    {
-        return observable;
-    }
-
     /**
      * Returns the oldest checkmark in the list.
      * <p>
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
index f9ee5ebe1..6980f85dd 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
@@ -42,7 +42,6 @@ public class MemoryRepetitionList extends RepetitionList
     public void add(Entry repetition)
     {
         list.add(repetition);
-        observable.notifyListeners();
     }
 
     @Override
@@ -115,7 +114,6 @@ public class MemoryRepetitionList extends RepetitionList
     public void remove(@NonNull Entry repetition)
     {
         list.remove(repetition);
-        observable.notifyListeners();
     }
 
     @Override
@@ -132,6 +130,5 @@ public class MemoryRepetitionList extends RepetitionList
     public void removeAll()
     {
         list.clear();
-        getObservable().notifyListeners();
     }
 }
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
index fcad5c7c9..68ffaf11a 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
@@ -75,7 +75,6 @@ public class SQLiteRepetitionList extends RepetitionList
         record.habit_id = habit.getId();
         record.copyFrom(entry);
         repository.save(record);
-        observable.notifyListeners();
     }
 
     @Override
@@ -116,7 +115,6 @@ public class SQLiteRepetitionList extends RepetitionList
         repository.execSQL(
             "delete from repetitions where habit = ? and timestamp = ?",
             habit.getId(), entry.getTimestamp().getUnixTime());
-        observable.notifyListeners();
     }
 
     public void removeAll()
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
index c96b4ff35..e33a07dc8 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
@@ -31,7 +31,6 @@ import static java.util.Calendar.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
 import static org.isoron.uhabits.core.models.Entry.*;
-import static org.mockito.Mockito.*;
 
 public class RepetitionListTest extends BaseUnitTest
 {
@@ -45,9 +44,6 @@ public class RepetitionListTest extends BaseUnitTest
 
     private long day;
 
-    @NonNull
-    private ModelObservable.Listener listener;
-
     @Override
     @Before
     public void setUp() throws Exception
@@ -63,10 +59,6 @@ public class RepetitionListTest extends BaseUnitTest
         reps.setValue(today, YES_MANUAL);
         reps.setValue(today.minus(7), YES_MANUAL);
         reps.setValue(today.minus(5), YES_MANUAL);
-
-        listener = mock(ModelObservable.Listener.class);
-        reps.getObservable().addListener(listener);
-        reset(listener);
     }
 
     @Override
@@ -147,18 +139,12 @@ public class RepetitionListTest extends BaseUnitTest
         assertThat(reps.getValue(today), equalTo(YES_MANUAL));
         reps.setValue(today, NO);
         assertThat(reps.getValue(today), equalTo(NO));
-        verify(listener, times(2)).onModelChange();
-        reset(listener);
 
         habit.setType(Habit.NUMBER_HABIT);
         reps.setValue(today, 100);
         assertThat(reps.getValue(today), equalTo(100));
-        verify(listener, times(2)).onModelChange();
-        reset(listener);
 
         reps.setValue(today, 500);
         assertThat(reps.getValue(today), equalTo(500));
-        verify(listener, times(2)).onModelChange();
-        reset(listener);
     }
 }
\ No newline at end of file