From e8f04a218ea28d8443f23ac30315ea5e77a4d5e9 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Fri, 7 Apr 2017 11:07:40 -0600
Subject: [PATCH] Added isDue field support

---
 Habitica/assets/migrations/Habitica/35.sql             |  3 ++-
 Habitica/assets/migrations/Habitica/37.sql             |  1 +
 .../com/habitrpg/android/habitica/HabitDatabase.java   |  2 +-
 .../android/habitica/NotificationPublisher.java        |  2 +-
 .../habitrpg/android/habitica/models/tasks/Task.java   | 10 ++++++++--
 5 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 Habitica/assets/migrations/Habitica/37.sql

diff --git a/Habitica/assets/migrations/Habitica/35.sql b/Habitica/assets/migrations/Habitica/35.sql
index 34786fcee..993400ee6 100644
--- a/Habitica/assets/migrations/Habitica/35.sql
+++ b/Habitica/assets/migrations/Habitica/35.sql
@@ -1 +1,2 @@
-ALTER TABLE Preferences ADD COLUMN dailyDueDefaultView bool;
\ No newline at end of file
+ALTER TABLE Preferences ADD COLUMN dailyDueDefaultView bool;
+
diff --git a/Habitica/assets/migrations/Habitica/37.sql b/Habitica/assets/migrations/Habitica/37.sql
new file mode 100644
index 000000000..ef6218a57
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/37.sql
@@ -0,0 +1 @@
+ALTER TABLE Task ADD COLUMN isDue BOOLEAN;
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
index 56ed150b8..51c56ecae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -7,7 +7,7 @@ public class HabitDatabase {
 
     public static final String NAME = "Habitica";
 
-    public static final int VERSION = 36;
+    public static final int VERSION = 37;
 
     public HabitDatabase() {
         super();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
index dacd96fc0..fdc01b633 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
@@ -42,7 +42,7 @@ public class NotificationPublisher extends BroadcastReceiver {
                     .queryList();
             show_notification = false;
             for (Task task : dailies) {
-                if (task.isDue(0)) {
+                if (task.checkIfDue(0)) {
                     show_notification = true;
                     break;
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 4324e6f80..e2d0da4ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -107,6 +107,9 @@ public class Task extends BaseModel {
     @SerializedName("_id")
     String id;
 
+    @Column
+    public Boolean isDue;
+
     /**
      * @return the id
      */
@@ -568,7 +571,7 @@ public class Task extends BaseModel {
         return R.color.best_10;
     }
 
-    public Boolean isDue(int offset) {
+    public Boolean checkIfDue(int offset) {
         if (this.getCompleted()) {
             return true;
         }
@@ -608,7 +611,10 @@ public class Task extends BaseModel {
     }
 
     public Boolean isDisplayedActive(int offset) {
-        return this.isDue(offset) && !this.completed;
+        if (this.isDue != null) {
+            return this.isDue;
+        }
+        return this.checkIfDue(offset) && !this.completed;
     }
 
     public Boolean isChecklistDisplayActive(int offset) {