From 468b645486e42e8a6f5ebaa6be51745b13c0c4e2 Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Thu, 28 Jun 2018 22:36:08 +0200 Subject: [PATCH 1/2] Do calculations in a central place --- .../androidaps/plugins/Overview/OverviewFragment.java | 8 ++++---- app/src/main/java/info/nightscout/utils/DateUtil.java | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) 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 eb13cf5ef8..d1cbf71c05 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 @@ -839,7 +839,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, if (wizard.superBolus) { final LoopPlugin loopPlugin = LoopPlugin.getPlugin(); if (loopPlugin.isEnabled(PluginType.LOOP)) { - loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000); + loopPlugin.superBolusTo(System.currentTimeMillis() + DateUtil.hourToMs(2)); MainApp.bus().post(new EventRefreshOverview("WizardDialog")); } ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() { @@ -1426,12 +1426,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, predHours = Math.max(0, predHours); hoursToFetch = rangeToDisplay - predHours; toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific - fromTime = toTime - hoursToFetch * 60 * 60 * 1000L; - endTime = toTime + predHours * 60 * 60 * 1000L; + fromTime = toTime - DateUtil.hourToMs(hoursToFetch); + endTime = toTime + DateUtil.hourToMs(predHours); } else { hoursToFetch = rangeToDisplay; toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific - fromTime = toTime - hoursToFetch * 60 * 60 * 1000L; + fromTime = toTime - DateUtil.hourToMs(hoursToFetch); endTime = toTime; } diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java index 7d7db3f5a7..ca13381e37 100644 --- a/app/src/main/java/info/nightscout/utils/DateUtil.java +++ b/app/src/main/java/info/nightscout/utils/DateUtil.java @@ -180,4 +180,8 @@ public class DateUtil { return date - date % 1000; } + public static long hourToMs(long hour) { + return hour * 60 * 60 * 1000L; + } + } From 6bc60cd8a850fe0911d2b1479beea953216be3a4 Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Sun, 1 Jul 2018 13:50:37 +0200 Subject: [PATCH 2/2] Rework to use already existing method --- .../androidaps/plugins/Overview/OverviewFragment.java | 9 +++++---- app/src/main/java/info/nightscout/utils/DateUtil.java | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-) 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 d1cbf71c05..c1f6f5b82d 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 @@ -119,6 +119,7 @@ import info.nightscout.utils.OKDialog; import info.nightscout.utils.Profiler; import info.nightscout.utils.SP; import info.nightscout.utils.SingleClickButton; +import info.nightscout.utils.T; import info.nightscout.utils.ToastUtils; import static info.nightscout.utils.DateUtil.now; @@ -839,7 +840,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, if (wizard.superBolus) { final LoopPlugin loopPlugin = LoopPlugin.getPlugin(); if (loopPlugin.isEnabled(PluginType.LOOP)) { - loopPlugin.superBolusTo(System.currentTimeMillis() + DateUtil.hourToMs(2)); + loopPlugin.superBolusTo(System.currentTimeMillis() + T.hours(2).msecs()); MainApp.bus().post(new EventRefreshOverview("WizardDialog")); } ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() { @@ -1426,12 +1427,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, predHours = Math.max(0, predHours); hoursToFetch = rangeToDisplay - predHours; toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific - fromTime = toTime - DateUtil.hourToMs(hoursToFetch); - endTime = toTime + DateUtil.hourToMs(predHours); + fromTime = toTime - T.hours(hoursToFetch).msecs(); + endTime = toTime + T.hours(predHours).msecs(); } else { hoursToFetch = rangeToDisplay; toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific - fromTime = toTime - DateUtil.hourToMs(hoursToFetch); + fromTime = toTime - T.hours(hoursToFetch).msecs(); endTime = toTime; } diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java index ca13381e37..c2164fd40e 100644 --- a/app/src/main/java/info/nightscout/utils/DateUtil.java +++ b/app/src/main/java/info/nightscout/utils/DateUtil.java @@ -179,9 +179,4 @@ public class DateUtil { public static long roundDateToSec(long date) { return date - date % 1000; } - - public static long hourToMs(long hour) { - return hour * 60 * 60 * 1000L; - } - }