Merge pull request #2552 from MilosKozak/2.6.1.1

2.6.1.1
2020-04-05 23:41:28 +02:00 · 2020-04-05 23:41:28 +02:00 · 0f6f344f63
parent cffe1b4392 d64edd486b
commit 0f6f344f63
12 changed files with 36 additions and 19 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -109,7 +109,7 @@ android {
        targetSdkVersion 28
        multiDexEnabled true
        versionCode 1500
-        version "2.6.1"
+        version "2.6.1.1"
        buildConfigField "String", "VERSION", '"' + version + '"'
        buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
        buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
@ -46,7 +46,7 @@ private fun checkVersion() = if (isConnected()) {
        }
    }.start()
 } else
-    log.debug("Github master version no checked. No connectivity")
+    log.debug("Github master version not checked. No connectivity")

 fun compareWithCurrentVersion(newVersion: String?, currentVersion: String) {

--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@ -713,20 +713,28 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
                override fun run() {
                    val detailedBolusInfo = DetailedBolusInfo()
                    detailedBolusInfo.carbs = anInteger().toDouble()
+                    detailedBolusInfo.source = Source.USER
                    detailedBolusInfo.date = secondLong()
-                    ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
-                        override fun run() {
-                            if (result.success) {
-                                var replyText = String.format(MainApp.gs(R.string.smscommunicator_carbsset), anInteger)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
-                                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
-                            } else {
-                                var replyText = MainApp.gs(R.string.smscommunicator_carbsfailed)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
-                                sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                    if (ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription?.storesCarbInfo == true) {
+                        ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                            override fun run() {
+                                if (result.success) {
+                                    var replyText = String.format(MainApp.gs(R.string.smscommunicator_carbsset), anInteger)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                                } else {
+                                    var replyText = MainApp.gs(R.string.smscommunicator_carbsfailed)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                }
                            }
-                        }
-                    })
+                        })
+                    } else {
+                        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true)
+                        var replyText = String.format(MainApp.gs(R.string.smscommunicator_carbsset), anInteger)
+                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                    }
                }
            })
        }
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@ -280,6 +280,10 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {

    // return true if new record is created
    public UpdateReturn createOrUpdate(Treatment treatment) {
+        if (treatment != null && treatment.source == Source.NONE) {
+            log.error("Coder error: source is not set for treatment: " + treatment, new Exception());
+            FabricPrivacy.logException(new Exception("Coder error: source is not set for treatment: " + treatment));
+        }
        try {
            Treatment old;
            treatment.date = DatabaseHelper.roundDateToSec(treatment.date);
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@ -35,6 +35,7 @@
    <string name="objectives_useloop">Отворете съдържанието на Цикъл плъгина.</string>
    <string name="objectives_usescale">Използвайте функцията за удължаване на периода на графиката, като задържите върху нея.</string>
    <string name="objectives_button_enter">Въведи</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ако имате поне 3 месеца опит с други системи, които биха може да получите код за пропускане на целите. Прочетете https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives за получаване на подробна информация.</string>
    <string name="codeaccepted">Код приет!</string>
    <string name="codeinvalid">Неправилен код</string>
    <string name="objectives_exam_objective">Докажете знанията си</string>
@ -45,6 +46,7 @@
    <string name="requestcode">Код (request code): %1$s</string>
    <string name="objectives_hint">(отбележете всички правилни отговори)</string>
    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="notconnected">Няма връзка с Интернет!</string>
    <string name="failedretrievetime">Не може да се вземе времето</string>
    <string name="requirementnotmet">Задачите не са изпълнени</string>
    <plurals name="objective_days">
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -280,7 +280,7 @@
    <string name="danarprofile">DanaR profil</string>
    <string name="danarprofile_dia">DIA [h]</string>
    <string name="danarprofile_dia_summary">Celková doba aktivity inzulínu</string>
-    <string name="failedupdatebasalprofile">Chyba při nastavení dočasného bazálu</string>
+    <string name="failedupdatebasalprofile">Chyba při nastavení bazálního pprofilu</string>
    <string name="danar_historyreload">Načíst</string>
    <string name="uploading">Nahrávám</string>
    <string name="danar_ebolus">E bolus</string>
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@ -35,6 +35,7 @@
    <string name="objectives_useloop">Affichage du contenu du plugin Boucle</string>
    <string name="objectives_usescale">Modification de l\'échelle du graphique par un appui long sur la courbe de glycémie</string>
    <string name="objectives_button_enter">Entrer</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous avez au moins 3 mois d\'expérience de boucle fermée avec d\'autres systèmes, vous pourriez avoir droit à un code permettant d\'ignorer les objectifs. Voir https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Objectives.html#ignorer-les-objectifs pour plus de détails.</string>
    <string name="codeaccepted">Code accepté</string>
    <string name="codeinvalid">Code invalide</string>
    <string name="objectives_exam_objective">Prouver ses connaissances</string>
--- a/app/src/main/res/values-nl-rNL/objectives.xml
+++ b/app/src/main/res/values-nl-rNL/objectives.xml
@ -35,6 +35,7 @@
    <string name="objectives_useloop">Inhoud van loop plugin weergeven</string>
    <string name="objectives_usescale">Gebruik de schaalfunctie: houd de BG grafiek lang ingedrukt</string>
    <string name="objectives_button_enter">Enter</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Als je ten minste 3 maanden closed loop ervaring hebt met een ander doe-het-zelf systeem dan kun je wellicht een code aanvragen om doelen over te slaan. Zie https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Objectives.html#doelen-overslaan voor details.</string>
    <string name="codeaccepted">Code geaccepteerd</string>
    <string name="codeinvalid">Code ongeldig</string>
    <string name="objectives_exam_objective">Bewijs je kennis</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -564,7 +564,7 @@
    <string name="virtualpump_firmware_label">Firmware</string>
    <string name="pump_lastconnection_label">Última ligação</string>
    <string name="danar_bluetooth_status">Estado Bluetooth</string>
-    <string name="nav_about">Acerca</string>
+    <string name="nav_about">Sobre</string>
    <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
    <string name="xdripstatus_settings">Estado xDrip (relógio)</string>
@ -742,7 +742,7 @@
    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
    <string name="combo_programming_bolus">A programar a bomba para injectar o bolus</string>
-    <string name="combo_refresh">Actualizar</string>
+    <string name="combo_refresh">Atualizar</string>
    <string name="combo_pump_state_label">Estado</string>
    <string name="combo_pump_activity_label">Atividades</string>
    <string name="combo_no_pump_connection">Sem conexão há %1$d min</string>
@ -841,7 +841,7 @@
    <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
    <string name="combo_high_temp_rejected_due_to_pump_history_changes">A rejeitar a temporal alta uma vez que o cálculo não considerou as mudanças do histórico da bomba</string>
    <string name="combo_activity_checking_pump_state">Atualizando estado da bomba</string>
-    <string name="combo_warning_pump_basal_rate_changed">O rácio da basal foi alterado na bomba e vai ser actualizado em breve</string>
+    <string name="combo_warning_pump_basal_rate_changed">A taxa basal na bomba mudou e será atualizada em breve</string>
    <string name="combo_error_failure_reading_changed_basal_rate">Rácio da basal foi alterado na bomba, mas a leitura falhou</string>
    <string name="combo_activity_checking_for_history_changes">Verificando alterações de histórico</string>
    <string name="combo_error_multiple_boluses_with_identical_timestamp">Bólus múltiplos, com a mesma quantidade e no mesmo minuto acabaram de ser importados. Apenas um registo pôde ser adicionado aos tratamentos. Por favor confirma na bomba e adicione o registo de bólus manualmente, utilizando o separador do Careportal. Tenha em atenção que deve criar um bólus com um tempo em que nã oexistem outros registos de bólus.</string>
--- a/app/src/main/res/values-sv-rSE/objectives.xml
+++ b/app/src/main/res/values-sv-rSE/objectives.xml
@ -35,6 +35,7 @@
    <string name="objectives_useloop">Visa innehållet i insticksprogrammet \"Loop\"</string>
    <string name="objectives_usescale">Testa skala om BG-grafen genom att trycka och hålla in fingret på den</string>
    <string name="objectives_button_enter">Enter</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Om du har minst 3 månaders erfarenhet av closed loop med andra system kan du kvalificera dig för en kod för att hoppa över mål. Se https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives för mer info.</string>
    <string name="codeaccepted">Koden godkänd</string>
    <string name="codeinvalid">Koden är felaktig</string>
    <string name="objectives_exam_objective">Bevisa dina kunskaper</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -1454,4 +1454,5 @@ Eversense-appen.</string>
    <string name="loop_smbexecution_time_label">SMB utförd</string>
    <string name="loop_tbrrequest_time_label">Basalförändring begärd</string>
    <string name="loop_tbrexecution_time_label">Basalförändring utförd</string>
+    <string name="insight_alert_notification_channel">Pumpvarningar Insight</string>
 </resources>
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>