mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-06 09:08:52 -06:00
Fix incorrect streaks
This commit is contained in:
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="AA_DB_VERSION"
|
android:name="AA_DB_VERSION"
|
||||||
android:value="11"/>
|
android:value="12"/>
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.google.android.backup.api_key"
|
android:name="com.google.android.backup.api_key"
|
||||||
|
|||||||
3
app/src/main/assets/migrations/12.sql
Normal file
3
app/src/main/assets/migrations/12.sql
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
delete from Score;
|
||||||
|
delete from Streak;
|
||||||
|
delete from Checkmarks;
|
||||||
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user