diff --git a/app/build.gradle b/app/build.gradle index 0ec531aeec..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.1" + version "2.6.1.2" buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"' buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"' 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(); 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 @@ Log app start naar NS Sluiten van applicatie om instellingen bij te werken. DanaRv2 - Insuline curve + Insuline Welk soort insuline gebruik je? Snel werkende insuline Novorapid, Novolog, Humalog @@ -1453,4 +1453,5 @@ SMB uitvoeringstijd Tijdelijk basaal aanvraag tijd Tijdelijke basaal uitvoering tijd + Insight pomp waarschuwingen 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 @@ Parar STOP PRESSIONADO À espera da bomba - Vão ser administradas %1$.2fU + Vai ser administrada %1$.2fU Atingiu o limite autorizado Nenhum perfil seleccionado Loop foi desactivado 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. Kommer att leverera %1$.2f enheter Du har nått din tillåtna gräns Ingen profil vald - Loop stängdes av + Loop stängdes av. Loop aktiverades Loop är avstängd Loop är aktiverad @@ -537,7 +537,7 @@ Eversense-appen. Återuppta Återanslut Pump Fel duration - Loop pausad + Loop pausad. Loop återupptagen 15 min trend COB