From 1fbd12a947289af899f269027e76396085dcd46e Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 4 Mar 2016 06:39:30 -0500
Subject: [PATCH] Fix incorrect streaks

---
 app/src/main/AndroidManifest.xml                      |  2 +-
 app/src/main/assets/migrations/12.sql                 |  3 +++
 .../java/org/isoron/uhabits/models/StreakList.java    | 11 +++++------
 3 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/assets/migrations/12.sql

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 276fb6be6..22ca97b1e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
         <meta-data
             android:name="AA_DB_VERSION"
-            android:value="11"/>
+            android:value="12"/>
 
         <meta-data
             android:name="com.google.android.backup.api_key"
diff --git a/app/src/main/assets/migrations/12.sql b/app/src/main/assets/migrations/12.sql
new file mode 100644
index 000000000..e13df67f7
--- /dev/null
+++ b/app/src/main/assets/migrations/12.sql
@@ -0,0 +1,3 @@
+delete from Score;
+delete from Streak;
+delete from Checkmarks;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/models/StreakList.java b/app/src/main/java/org/isoron/uhabits/models/StreakList.java
index 9459acab0..d83a29d85 100644
--- a/app/src/main/java/org/isoron/uhabits/models/StreakList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/StreakList.java
@@ -60,16 +60,13 @@ public class StreakList
         long day = DateHelper.millisecondsInOneDay;
 
         Streak newestStreak = getNewest();
-        if (newestStreak == null)
+        if (newestStreak != null)
         {
-            Repetition oldestRep = habit.repetitions.getOldest();
-            if (oldestRep == null) return;
-
-            beginning = oldestRep.timestamp;
+            beginning = newestStreak.start;
         }
         else
         {
-            Repetition oldestRep = habit.repetitions.getOldestNewerThan(newestStreak.end);
+            Repetition oldestRep = habit.repetitions.getOldest();
             if (oldestRep == null) return;
 
             beginning = oldestRep.timestamp;
@@ -96,6 +93,8 @@ public class StreakList
 
         ActiveAndroid.beginTransaction();
 
+        if(newestStreak != null) newestStreak.delete();
+
         try
         {
             for (int i = 0; i < list.size(); i += 2)