caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into dagger3

Browse source
This commit is contained in:
Milos Kozak 2020-04-19 14:17:37 +02:00 committed by GitHub
commit 23937a7278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -129,7 +129,7 @@ android {
targetSdkVersion 28
multiDexEnabled true
versionCode 1500
version "2.6.1-dagger3"
version "2.6.5"
buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

6
app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
View file

@ -107,8 +107,10 @@ public class InsightAlertService extends DaggerService implements InsightConnect
}
@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();

3
app/src/main/res/values-nl-rNL/strings.xml
View file

@ -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>

2
app/src/main/res/values-pt-rPT/strings.xml
View file

@ -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>

4
app/src/main/res/values-sv-rSE/strings.xml
View file

@ -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>