|
|
@ -60,16 +60,13 @@ public class StreakList
|
|
|
|
long day = DateHelper.millisecondsInOneDay;
|
|
|
|
long day = DateHelper.millisecondsInOneDay;
|
|
|
|
|
|
|
|
|
|
|
|
Streak newestStreak = getNewest();
|
|
|
|
Streak newestStreak = getNewest();
|
|
|
|
if (newestStreak == null)
|
|
|
|
if (newestStreak != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Repetition oldestRep = habit.repetitions.getOldest();
|
|
|
|
beginning = newestStreak.start;
|
|
|
|
if (oldestRep == null) return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
beginning = oldestRep.timestamp;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Repetition oldestRep = habit.repetitions.getOldestNewerThan(newestStreak.end);
|
|
|
|
Repetition oldestRep = habit.repetitions.getOldest();
|
|
|
|
if (oldestRep == null) return;
|
|
|
|
if (oldestRep == null) return;
|
|
|
|
|
|
|
|
|
|
|
|
beginning = oldestRep.timestamp;
|
|
|
|
beginning = oldestRep.timestamp;
|
|
|
@ -96,6 +93,8 @@ public class StreakList
|
|
|
|
|
|
|
|
|
|
|
|
ActiveAndroid.beginTransaction();
|
|
|
|
ActiveAndroid.beginTransaction();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(newestStreak != null) newestStreak.delete();
|
|
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
for (int i = 0; i < list.size(); i += 2)
|
|
|
|
for (int i = 0; i < list.size(); i += 2)
|
|
|
|