Remove calls to Repetition.add and Repetition.remove

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java

@@ -128,8 +128,7 @@ public class HabitFixtures
         Timestamp timestamp = DateUtils.getToday();
         for (int value : LONG_NUMERICAL_HABIT_CHECKS)
         {
-            Repetition r = new Repetition(timestamp, value);
+            habit.getRepetitions().setValue(timestamp, value);
-            habit.getRepetitions().add(r);
             timestamp = timestamp.minus(1);
         }
 

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt

@@ -58,7 +58,7 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi
     }
 
     override fun onNumberPicked(newValue: Double) {
-        behavior.setNumericValue(data.habit, data.timestamp, (newValue * 1000).toInt())
+        behavior.setValue(data.habit, data.timestamp, (newValue * 1000).toInt())
         widgetUpdater.updateWidgets()
         finish()
     }

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java

@@ -23,6 +23,8 @@ import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 
+import java.util.*;
+
 /**
  * Command to toggle a repetition.
  */
@@ -31,20 +33,19 @@ public class CreateRepetitionCommand extends Command
     @NonNull
     final Habit habit;
 
-    private HabitList habitList;
+    @NonNull
+    final HabitList habitList;
+
+    @NonNull
     final Timestamp timestamp;
 
     final int value;
 
-    @Nullable
+    int previousValue;
-    Repetition previousRep;
-
-    @Nullable
-    Repetition newRep;
 
     public CreateRepetitionCommand(@NonNull HabitList habitList,
                                    @NonNull Habit habit,
-                                   Timestamp timestamp,
+                                   @NonNull Timestamp timestamp,
                                    int value)
     {
         this.habitList = habitList;
@@ -57,18 +58,8 @@ public class CreateRepetitionCommand extends Command
     public void execute()
     {
         RepetitionList reps = habit.getRepetitions();
-
+        previousValue = reps.getValue(timestamp);
-        previousRep = reps.getByTimestamp(timestamp);
+        reps.setValue(timestamp, value);
-        if (previousRep != null) reps.remove(previousRep);
-
-        if (value > 0)
-        {
-            newRep = new Repetition(timestamp, value);
-            reps.add(newRep);
-        }
-
-        habit.invalidateNewerThan(timestamp);
-        habitList.update(habit);
     }
 
     @NonNull
@@ -87,9 +78,7 @@ public class CreateRepetitionCommand extends Command
     @Override
     public void undo()
     {
-        if(newRep != null) habit.getRepetitions().remove(newRep);
+        habit.getRepetitions().setValue(timestamp, previousValue);
-        if (previousRep != null) habit.getRepetitions().add(previousRep);
-        habit.invalidateNewerThan(timestamp);
     }
 
     public static class Record
@@ -129,4 +118,34 @@ public class CreateRepetitionCommand extends Command
             return command;
         }
     }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CreateRepetitionCommand that = (CreateRepetitionCommand) o;
+        return value == that.value &&
+                habit.equals(that.habit) &&
+                habitList.equals(that.habitList) &&
+                timestamp.equals(that.timestamp);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(habit, habitList, timestamp, value);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "CreateRepetitionCommand{" +
+                "habit=" + habit +
+                ", habitList=" + habitList +
+                ", timestamp=" + timestamp +
+                ", value=" + value +
+                ", previousValue=" + previousValue +
+                '}';
+    }
 }

android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java

@@ -89,7 +89,7 @@ public class HabitFixtures
         for (int i = 0; i < times.length; i++)
         {
             Timestamp timestamp = today.minus(times[i]);
-            habit.getRepetitions().add(new Repetition(timestamp, values[i]));
+            habit.getRepetitions().setValue(timestamp, values[i]);
         }
 
         return habit;
@@ -125,7 +125,7 @@ public class HabitFixtures
         for (int i = 0; i < times.length; i++)
         {
             Timestamp timestamp = reference.minus(times[i]);
-            habit.getRepetitions().add(new Repetition(timestamp, values[i]));
+            habit.getRepetitions().setValue(timestamp, values[i]);
         }
 
         return habit;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java

@@ -114,7 +114,7 @@ public class ShowHabitMenuBehavior
             if (habit.isNumerical())
                 value = (int) (1000 + 250 * random.nextGaussian() * strength / 100) * 1000;
 
-            habit.getRepetitions().add(new Repetition(DateUtils.getToday().minus(i), value));
+            habit.getRepetitions().setValue(DateUtils.getToday().minus(i), value);
         }
 
         habit.invalidateNewerThan(Timestamp.ZERO);