From 4007049118a145e0f11a381c1032e0dc7a0743e1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 21 Nov 2017 22:29:50 +0100
Subject: [PATCH 1/4] use MIN_DIA instead of DEFAULT_DIA

---
 .../androidaps/plugins/Insulin/InsulinOrefBasePlugin.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
index b37e3b5c85..33fab171d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
@@ -61,7 +61,7 @@ public abstract class InsulinOrefBasePlugin implements PluginBase, InsulinInterf
     }
 
     public double getUserDefinedDia() {
-        return MainApp.getConfigBuilder().getProfile() != null ? MainApp.getConfigBuilder().getProfile().getDia() : Constants.defaultDIA;
+        return MainApp.getConfigBuilder().getProfile() != null ? MainApp.getConfigBuilder().getProfile().getDia() : MIN_DIA;
     }
 
     @Override

From ca44ae9a0b7f7342f338db4fc656e63822c05132 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 21 Nov 2017 22:31:02 +0100
Subject: [PATCH 2/4] fix RU translation

---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1492740232..e78328e5cf 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -590,7 +590,7 @@
     <string name="danarv2pump">DanaRv2</string>
     <string name="date">дата</string>
     <string name="device">устройство</string>
-    <string name="dia_too_short">pначение длительности работы инс %s слишком мало - применено $s</string>
+    <string name="dia_too_short" formatted="false">pначение длительности работы инс %s слишком мало - применено %s</string>
     <string name="do_not_track_profile_switch">не отслеживать смены профиля</string>
     <string name="do_not_track_profile_switch_summary">все смены профиля игнорируются; используется только активный профиль</string>
     <string name="extendedbolus">расширенный болюс</string>

From b49a4c57ba17f006e87a8edab8236ba17fff0ceb Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Thu, 16 Nov 2017 00:23:37 +0100
Subject: [PATCH 3/4] BolusProgressDialog: hide stop button once pressed.

---
 .../androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
index 192bffba3c..1471c23969 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
@@ -96,6 +96,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
             case R.id.overview_bolusprogress_stop:
                 log.debug("Stop bolus delivery button pressed");
                 stopPressedView.setVisibility(View.VISIBLE);
+                stopButton.setVisibility(View.INVISIBLE);
                 PumpInterface pump = MainApp.getConfigBuilder();
                 pump.stopBolusDelivering();
                 break;

From a8a7d47da20f7d4c53c999dcb93e944a23ddde9d Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Fri, 10 Nov 2017 01:26:17 +0100
Subject: [PATCH 4/4] ConfigBuilder.applyAPSRequest: set new TBR if current TBR
 expires before next loop iteration.

---
 .../androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
index 51021f150d..66c3774859 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
@@ -584,7 +584,9 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
                 if (Config.logCongigBuilderActions)
                     log.debug("applyAPSRequest: Basal set correctly");
             }
-        } else if (isTempBasalInProgress() && Math.abs(request.rate - getTempBasalAbsoluteRateHistory()) < getPumpDescription().basalStep) {
+        } else if (isTempBasalInProgress()
+                && getTempBasalRemainingMinutesFromHistory() > 5
+                && Math.abs(request.rate - getTempBasalAbsoluteRateHistory()) < getPumpDescription().basalStep) {
             result = new PumpEnactResult();
             result.absolute = getTempBasalAbsoluteRateHistory();
             result.duration = getTempBasalFromHistory(System.currentTimeMillis()).getPlannedRemainingMinutes();