From 6bc13d9cc086ad9ee8e7dbf671dde64fac48fd0c Mon Sep 17 00:00:00 2001 From: TebbeUbben Date: Sat, 9 Jun 2018 23:10:54 +0200 Subject: [PATCH] Don't return false in isStarted if objective has been accomplished --- .../plugins/ConstraintsObjectives/ObjectivesFragment.java | 2 +- .../plugins/ConstraintsObjectives/objectives/Objective.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java index 86f312e1df..75aa6b6922 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java @@ -82,7 +82,7 @@ public class ObjectivesFragment extends SubscriberFragment { holder.gate.setVisibility(View.VISIBLE); holder.gate.setText(MainApp.gs(objective.getGate())); } else holder.gate.setVisibility(View.GONE); - if (!objective.isStarted() && !objective.isAccomplished()) { + if (!objective.isStarted()) { holder.gate.setTextColor(0xFFFFFFFF); holder.verify.setVisibility(View.GONE); holder.progress.setVisibility(View.GONE); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java index 6443e0d3f1..e5642c1bbf 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java @@ -45,7 +45,7 @@ public abstract class Objective { } public boolean isStarted() { - return startedOn != null && accomplishedOn == null; + return startedOn != null; } public Date getStartedOn() {