From 4d2e166620ab7f5623c0c883efa9da7f525eb970 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 13 Jun 2018 10:41:15 +0200 Subject: [PATCH 1/3] try to fix crash --- .../androidaps/plugins/Overview/OverviewFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index fadb30420c..46471e999b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -590,6 +590,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, String units = MainApp.getConfigBuilder().getProfileUnits(); FragmentManager manager = getFragmentManager(); + // try to fix https://fabric.io/nightscout3/android/apps/info.nightscout.androidaps/issues/5aca7a1536c7b23527eb4be7?time=last-seven-days + // https://stackoverflow.com/questions/14860239/checking-if-state-is-saved-before-committing-a-fragmenttransaction + if (manager.isStateSaved()) + return; switch (v.getId()) { case R.id.overview_accepttempbutton: onClickAcceptTemp(); From f82240a724ac2f897e57b2a324f91c9ad6df9b13 Mon Sep 17 00:00:00 2001 From: Nico Schmitz Date: Thu, 14 Jun 2018 12:34:42 +0200 Subject: [PATCH 2/3] Fix bug in getHoursFromStart() --- .../java/info/nightscout/androidaps/db/CareportalEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java index d5a1c90100..25c6cdce13 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java +++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java @@ -87,7 +87,7 @@ public class CareportalEvent implements DataPointWithLabelInterface { } public long getHoursFromStart() { - return (System.currentTimeMillis() - date) / (60 * 1000); + return (System.currentTimeMillis() - date) / (60 * 60 * 1000); } public String age() { From 43d787ff88b063696dabd34a570a63a34b3db990 Mon Sep 17 00:00:00 2001 From: Nico Schmitz Date: Thu, 14 Jun 2018 12:38:15 +0200 Subject: [PATCH 3/3] Simplify isOlderThan() --- .../info/nightscout/androidaps/db/CareportalEvent.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java index 25c6cdce13..72ff1ddab0 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java +++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java @@ -98,13 +98,7 @@ public class CareportalEvent implements DataPointWithLabelInterface { return diff.get(TimeUnit.DAYS) + " " + MainApp.gs(R.string.days) + " " + diff.get(TimeUnit.HOURS) + " " + MainApp.gs(R.string.hours); } - public boolean isOlderThan(double hours) { - Map diff = computeDiff(date, System.currentTimeMillis()); - if(diff.get(TimeUnit.DAYS)*24 + diff.get(TimeUnit.HOURS) > hours) - return true; - else - return false; - } + public boolean isOlderThan(double hours) { return getHoursFromStart() > hours; } public String log() { return "CareportalEvent{" +