From e17d10f25854165fe778e282cf0251df5e04a34b Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 15 Apr 2020 00:02:50 +0200
Subject: [PATCH 1/3] InsightAlertservice: handle nullable intent.

---
 .../plugins/pump/insight/InsightAlertService.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 4a543f27c5..53636ef88f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -104,8 +104,10 @@ public class InsightAlertService extends Service implements InsightConnectionSer
     }
 
     @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if ("mute".equals(intent.getStringExtra("command"))) {
+    public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
+        if (intent == null) {
+            // service is being restarted
+        } else if ("mute".equals(intent.getStringExtra("command"))) {
             mute();
         } else if ("confirm".equals(intent.getStringExtra("command"))) {
             dismissNotification();

From 7479218e31c89bb53c7e214ed4ff0ae01ce26a53 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 19 Apr 2020 13:06:02 +0200
Subject: [PATCH 2/3] New Crowdin translations (#2556)

* New translations strings.xml (Swedish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)
---
 app/src/main/res/values-nl-rNL/strings.xml | 3 ++-
 app/src/main/res/values-pt-rPT/strings.xml | 2 +-
 app/src/main/res/values-sv-rSE/strings.xml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index b7b391a804..1b5471220e 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -544,7 +544,7 @@
     <string name="ns_logappstartedevent">Log app start naar NS</string>
     <string name="restartingapp">Sluiten van applicatie om instellingen bij te werken.</string>
     <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insuline curve</string>
+    <string name="configbuilder_insulin">Insuline</string>
     <string name="configbuilder_insulin_description">Welk soort insuline gebruik je?</string>
     <string name="fastactinginsulin">Snel werkende insuline</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -1453,4 +1453,5 @@
     <string name="loop_smbexecution_time_label">SMB uitvoeringstijd</string>
     <string name="loop_tbrrequest_time_label">Tijdelijk basaal aanvraag tijd</string>
     <string name="loop_tbrexecution_time_label">Tijdelijke basaal uitvoering tijd</string>
+    <string name="insight_alert_notification_channel">Insight pomp waarschuwingen</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1990230176..d43b4d2e8d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -315,7 +315,7 @@
     <string name="overview_bolusprogress_stop">Parar</string>
     <string name="overview_bolusprogress_stoppressed">STOP PRESSIONADO</string>
     <string name="waitingforpump">À espera da bomba</string>
-    <string name="overview_bolusprogress_goingtodeliver">Vão ser administradas %1$.2fU</string>
+    <string name="overview_bolusprogress_goingtodeliver">Vai ser administrada %1$.2fU</string>
     <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="noprofileselected">Nenhum perfil seleccionado</string>
     <string name="smscommunicator_loophasbeendisabled">Loop foi desactivado</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 4fada83e89..54daf00aad 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -319,7 +319,7 @@ Eversense-appen.</string>
     <string name="overview_bolusprogress_goingtodeliver">Kommer att leverera %1$.2f enheter</string>
     <string name="youareonallowedlimit">Du har nått din tillåtna gräns</string>
     <string name="noprofileselected">Ingen profil vald</string>
-    <string name="smscommunicator_loophasbeendisabled">Loop stängdes av</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop stängdes av. </string>
     <string name="smscommunicator_loophasbeenenabled">Loop aktiverades</string>
     <string name="smscommunicator_loopisdisabled">Loop är avstängd</string>
     <string name="smscommunicator_loopisenabled">Loop är aktiverad</string>
@@ -537,7 +537,7 @@ Eversense-appen.</string>
     <string name="resume">Återuppta</string>
     <string name="reconnect">Återanslut Pump</string>
     <string name="smscommunicator_wrongduration">Fel duration</string>
-    <string name="smscommunicator_loopsuspended">Loop pausad</string>
+    <string name="smscommunicator_loopsuspended">Loop pausad. </string>
     <string name="smscommunicator_loopresumed">Loop återupptagen</string>
     <string name="treatments_wizard_bgtrend_label">15 min trend</string>
     <string name="treatments_wizard_cob_label">COB</string>

From 023992fc9a6677514fdfd71c68c878644dab939a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 19 Apr 2020 13:07:51 +0200
Subject: [PATCH 3/3] bump 2.6.1.2

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9add15b6d6..38457916a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6.1-dev"
+        version "2.6.1.2"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'