From ad3d175b021fc8ec8027d1a64964ad553ee2c640 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 23 Aug 2017 23:03:28 +0200
Subject: [PATCH 01/53] better handling DetailedBolusInfo in v2 driver

---
 .../ConfigBuilder/DetailedBolusInfoStorage.java   | 12 +++++++++++-
 .../plugins/PumpDanaRv2/DanaRv2Plugin.java        | 14 ++++++++++++--
 .../PumpDanaRv2/comm/MsgHistoryEvents_v2.java     | 15 ++++++++-------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/DetailedBolusInfoStorage.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/DetailedBolusInfoStorage.java
index e99c5a8f22..d6352cdb18 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/DetailedBolusInfoStorage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/DetailedBolusInfoStorage.java
@@ -32,10 +32,20 @@ public class DetailedBolusInfoStorage {
             log.debug("Existing info: " + new Date(infoTime).toLocaleString());
             if (bolustime > infoTime - 60 * 1000 && bolustime < infoTime + 60 * 1000) {
                 found = store.get(i);
-                store.remove(i);
                 break;
             }
         }
         return found;
     }
+
+    public static void remove(long bolustime) {
+        for (int i = 0; i < store.size(); i++) {
+            long infoTime = store.get(i).date;
+            if (bolustime > infoTime - 60 * 1000 && bolustime < infoTime + 60 * 1000) {
+                log.debug("Removing info: " + new Date(infoTime).toLocaleString());
+                store.remove(i);
+                break;
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
index ca1e1e6e3e..6960e96b17 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
@@ -286,10 +286,20 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         detailedBolusInfo.insulin = configBuilderPlugin.applyBolusConstraints(detailedBolusInfo.insulin);
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             DetailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history
+            // v2 stores end time for bolus, we need to adjust time
+            // delivery speed is 12 U/min
+            detailedBolusInfo.date += detailedBolusInfo.insulin / 12d * 60 * 1000;
+            // clean carbs to prevent counting them as twice because they will picked up as another record
+            // I don't think it's necessary to copy DetailedBolusInfo right now for carbs records
+            double carbs = detailedBolusInfo.carbs;
+            detailedBolusInfo.carbs = 0;
+            int carbTime = detailedBolusInfo.carbTime;
+            detailedBolusInfo.carbTime = 0;
+
             Treatment t = new Treatment();
             boolean connectionOK = false;
-            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0)
-                connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, System.currentTimeMillis() + detailedBolusInfo.carbTime * 60 * 1000 + 1000, t); // +1000 to make the record different
+            if (detailedBolusInfo.insulin > 0 || carbs > 0)
+                connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) carbs, System.currentTimeMillis() + carbTime * 60 * 1000 + 1000, t); // +1000 to make the record different
             PumpEnactResult result = new PumpEnactResult();
             result.success = connectionOK;
             result.bolusDelivered = t.insulin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java
index 416a96c269..f04218ac61 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java
@@ -67,15 +67,10 @@ public class MsgHistoryEvents_v2 extends MessageBase {
         if (detailedBolusInfo == null) {
             log.debug("DetailedBolusInfo not found for " + datetime.toLocaleString());
             detailedBolusInfo = new DetailedBolusInfo();
-        } else {
-            log.debug("DetailedBolusInfo found for " + datetime.toLocaleString() + ": " + new Date(detailedBolusInfo.date).toLocaleString());
-            detailedBolusInfo.carbTime = 0;
-            detailedBolusInfo.carbs = 0;
         }
         detailedBolusInfo.date = datetime.getTime();
         detailedBolusInfo.source = Source.PUMP;
         detailedBolusInfo.pumpId = datetime.getTime();
-        detailedBolusInfo.source = Source.PUMP;
 
         switch (recordCode) {
             case DanaRPump.TEMPSTART:
@@ -102,11 +97,13 @@ public class MsgHistoryEvents_v2 extends MessageBase {
                 detailedBolusInfo.insulin = param1 / 100d;
                 boolean newRecord = MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
                 log.debug((newRecord ? "**NEW** " : "") + "EVENT BOLUS (" + recordCode + ") " + datetime.toLocaleString() + " Bolus: " + (param1 / 100d) + "U Duration: " + param2 + "min");
+                DetailedBolusInfoStorage.remove(detailedBolusInfo.date);
                 break;
             case DanaRPump.DUALBOLUS:
                 detailedBolusInfo.insulin = param1 / 100d;
                 newRecord = MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
                 log.debug((newRecord ? "**NEW** " : "") + "EVENT DUALBOLUS (" + recordCode + ") " + datetime.toLocaleString() + " Bolus: " + (param1 / 100d) + "U Duration: " + param2 + "min");
+                DetailedBolusInfoStorage.remove(detailedBolusInfo.date);
                 break;
             case DanaRPump.DUALEXTENDEDSTART:
                 log.debug("EVENT DUALEXTENDEDSTART (" + recordCode + ") " + datetime.toLocaleString() + " Amount: " + (param1 / 100d) + "U Duration: " + param2 + "min");
@@ -134,8 +131,12 @@ public class MsgHistoryEvents_v2 extends MessageBase {
                 log.debug("EVENT PROFILECHANGE (" + recordCode + ") " + datetime.toLocaleString() + " No: " + param1 + " CurrentRate: " + (param2 / 100d) + "U/h");
                 break;
             case DanaRPump.CARBS:
-                detailedBolusInfo.carbs = param1;
-                newRecord = MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                DetailedBolusInfo emptyCarbsInfo = new DetailedBolusInfo();
+                emptyCarbsInfo.carbs = param1;
+                emptyCarbsInfo.date = datetime.getTime();
+                emptyCarbsInfo.source = Source.PUMP;
+                emptyCarbsInfo.pumpId = datetime.getTime();
+                newRecord = MainApp.getConfigBuilder().addToHistoryTreatment(emptyCarbsInfo);
                 log.debug((newRecord ? "**NEW** " : "") + "EVENT CARBS (" + recordCode + ") " + datetime.toLocaleString() + " Carbs: " + param1 + "g");
                 break;
             default:

From 196e0bb3097d9371f79cd4fa68d41baf51a64ad9 Mon Sep 17 00:00:00 2001
From: boysim <18055382+boysim@users.noreply.github.com>
Date: Thu, 24 Aug 2017 23:18:21 +0200
Subject: [PATCH 02/53] Update strings.xml

---
 app/src/main/res/values-nl/strings.xml | 651 ++++++++++++++++++++++++-
 1 file changed, 650 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c93f92ba38..d35103cb36 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,4 +1,653 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">AndroidAPS</string>
-</resources>
\ No newline at end of file
+    <string name="Glimp">Glimp</string>
+    <string name="MM640g">MM640g</string>
+    <string name="absolute">Absoluut</string>
+    <string name="absorption_maxtime_summary">Verwachte tijd in uren vooraleer alle koolhydraten opgenomen zijn</string>
+    <string name="absorption_maxtime_title">Max absorbtietijd maaltijd [u]</string>
+    <string name="absorptionsettings_title">Opname instellingen</string>
+    <string name="actions">Acties</string>
+    <string name="actions_shortname">ACT</string>
+    <string name="activity">Actief</string>
+    <string name="adult">Volwassene</string>
+    <string name="advancedsettings_title">Uitgebreide instellingen</string>
+    <string name="alert_dialog_storage_permission_text">Herstart je telefoon of herstart AndroidAPS vanuit de systeem instellingen a.u.b. anders zal AndroidAPS geen logboek hebben (Belangrijk om te controleren of de algoritmes correct werken)!</string>
+    <string name="always_use_shortavg_summary">Nuttig wanneer gevens van niet gefilterde bronnes zoals Xdrip wispelturig zijn</string>
+    <string name="androidaps_start">AndroidAPS gestart</string>
+    <string name="approachingdailylimit">Insuline daglimiet bereikt</string>
+    <string name="apsmode_title">APS Mode</string>
+    <string name="youareonallowedlimit">Limiet bereikt</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="xdripstatus_settings">xDrip Status (Horloge)</string>
+    <string name="xdripstatus">xDrip Statuslijn (Horloge)</string>
+    <string name="xdripnotinstalled">xDrip+ niet geïnstalleerd</string>
+    <string name="xdrip">xDrip</string>
+    <string name="wrongpumppassword">Verkeerd pomp wachtwoord!</string>
+    <string name="wrongpumpdriverselected">Verkeerde pomp driver geselecteerd</string>
+    <string name="wrongpassword">Verkeerd wachtwoord</string>
+    <string name="wear_showbgi_title">Toon BGI</string>
+    <string name="wear_showbgi_summary">Voeg BGI toe aan status lijn</string>
+    <string name="wear_shortname">WEAR</string>
+    <string name="wear_settings">Wear instellingen</string>
+    <string name="wear_overviewnotifications_summary">Geef de overzicht notificaties door als wear bevestigings berichten</string>
+    <string name="wear_overviewnotifications">Overzicht Notificaties</string>
+    <string name="wear_detailedIOB_title">Toon gedetailleerde IOB</string>
+    <string name="wear_detailedIOB_summary">Splits IOB in bolus en basaal op de watchface</string>
+    <string name="wear">Wear</string>
+    <string name="waitingforpumpresult">Wacht op het resultaat</string>
+    <string name="waitingforpumpclicktorefresh">Wacht op pomp. Klik om te vernieuwen.</string>
+    <string name="waitingforpump">Wacht op pomp</string>
+    <string name="vitualpump_label">VIRTUELE POMP</string>
+    <string name="visible">Zichtbaar</string>
+    <string name="virtualpump_uploadstatus_title">Upload status naar NS</string>
+    <string name="virtualpump_tempbasal_label">Tijdelijk basaal</string>
+    <string name="virtualpump_sqlerror">SQL Storing</string>
+    <string name="virtualpump_shortname">VP</string>
+    <string name="virtualpump_settings">Virtuele pomp instellingen</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="virtualpump_reservoir_label">Reservoir</string>
+    <string name="virtualpump_lastconnection_label">Laatste verbinding</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="virtualpump_extendedbolus_label_short">EXT</string>
+    <string name="virtualpump_extendedbolus_label">Vertraagde bolus</string>
+    <string name="virtualpump_battery_label">Batterij</string>
+    <string name="virtualpump">Virtuele Pomp</string>
+    <string name="uploading">Uploaden</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="uploader">Uploader</string>
+    <string name="updatingbasalrates">Bijwerken basaal patroon</string>
+    <string name="up">Omhoog</string>
+    <string name="unsupportednsversion">Niet ondersteunde versie van Nightscout</string>
+    <string name="unsupportedclientver">Niet ondersteunde versie van NSClient</string>
+    <string name="unlock_settings">Instellingen ontgrendelen</string>
+    <string name="units">Eenheden:</string>
+    <string name="treatmentssafety_maxcarbs_title">Max toegestaane koolhydraten [g]</string>
+    <string name="basal">Basaal</string>
+    <string name="basal_short">BAS</string>
+    <string name="basalmissing">Basaal ontbreekt in profiel. Standaard actief</string>
+    <string name="basalshortlabel">BAS</string>
+    <string name="base_profile_label">Basis Profiel</string>
+    <string name="batterydischarged">Pomp Batterij Leeg</string>
+    <string name="batteryoptimalizationerror">Toestel ondersteund klaarblijkelijk geen baterij optimalisatie vrijschakeling!</string>
+    <string name="bg_lang">български</string>
+    <string name="bolus">Bolus</string>
+    <string name="bolus_step">Bolus Stap</string>
+    <string name="bolusdelivered" formatted="false">Bolus %.2fU succesvol toegediend</string>
+    <string name="bolusdelivering" formatted="false">Toedienen %.2fU</string>
+    <string name="bolusrequested" formatted="false">Klaar om %.2fE toe te dienen</string>
+    <string name="button1">Knop 1</string>
+    <string name="button2">Knop 2</string>
+    <string name="button3">Knop 3</string>
+    <string name="calibrationsent">Kalibratie naat xDrip verzonden</string>
+    <string name="cancel">Annuleer</string>
+    <string name="canceltemp">Annuleer tijdelijk basaal</string>
+    <string name="carbs">Koolhydraten</string>
+    <string name="careportal">Careportal</string>
+    <string name="careportal_announcement">Mededeling</string>
+    <string name="careportal_bgcheck">BG Controle</string>
+    <string name="careportal_canulaage_label">Ouderdom katheter</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="careportal_carbsandbolus_label">KOOLHYDRATEN &amp; BOLUS</string>
+    <string name="careportal_carbscorrection">Koolhydraten correctie</string>
+    <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
+    <string name="careportal_cgmsensorinsert">CGM Sensor geplaatst</string>
+    <string name="careportal_cgmsensorstart">CGM Sensor Start</string>
+    <string name="careportal_combobolus">Multiwave bolus</string>
+    <string name="careportal_correctionbolus">Correctie bolus</string>
+    <string name="careportal_exercise">Sport</string>
+    <string name="careportal_insulinage_label">Insuline leeftijd</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="careportal_insulincartridgechange">Insuline ampul wissel</string>
+    <string name="careportal_mealbolus">Maaltijd bolus</string>
+    <string name="careportal_newnstreatment_absolute_label">Absoluut</string>
+    <string name="careportal_newnstreatment_carbs_label">Koolhydraten</string>
+    <string name="careportal_newnstreatment_duration_label">Tijdsduur</string>
+    <string name="careportal_newnstreatment_duration_min_label">Tijdsduur [min]</string>
+    <string name="careportal_newnstreatment_enteredby_title">Ingegeven door</string>
+    <string name="careportal_newnstreatment_eventtime_label">Gebeurtenis tijdstip</string>
+    <string name="careportal_newnstreatment_eventtype">Gebeurtenis type</string>
+    <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
+    <string name="careportal_newnstreatment_insulin_label">Insuline</string>
+    <string name="careportal_newnstreatment_meter">Meter</string>
+    <string name="careportal_newnstreatment_notes_label">Notities</string>
+    <string name="careportal_newnstreatment_other">Andere</string>
+    <string name="careportal_newnstreatment_percent_label">Percent</string>
+    <string name="careportal_newnstreatment_profile_label">Profiel</string>
+    <string name="careportal_newnstreatment_sensor">Sensor</string>
+    <string name="careportal_newnstreatment_split_label">Splitzen</string>
+    <string name="careportal_note">Notitie</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pbage_label">Leeftijd batterij</string>
+    <string name="careportal_profileswitch">Profiel wissel</string>
+    <string name="careportal_pump_label">Pomp</string>
+    <string name="careportal_pumpbatterychange">Pomp batterij wissel</string>
+    <string name="careportal_pumpsitechange">Infusieplaats wissel</string>
+    <string name="careportal_question">Vraag</string>
+    <string name="careportal_sensorage_label">Leeftijd sensor</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="careportal_shortname">CP</string>
+    <string name="careportal_snackbolus">Snack bolus</string>
+    <string name="careportal_tempbasalend">Einde tijdelijk basaal</string>
+    <string name="careportal_tempbasalstart">Begin tijdelijk basaal</string>
+    <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
+    <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
+    <string name="changeyourinput">Wijzig het ingegevene!</string>
+    <string name="child">Kind</string>
+    <string name="clearlog">Logboek wissen</string>
+    <string name="closedloop">Closed loop</string>
+    <string name="cob">COB</string>
+    <string name="comment">Commentaar</string>
+    <string name="configbuilder">Configurator</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_bgsource">BG bron</string>
+    <string name="configbuilder_constraints">Beperkingen</string>
+    <string name="configbuilder_general">Algemeen</string>
+    <string name="configbuilder_insulin">insuline</string>
+    <string name="clear_queue">Ledig wachtrij</string>
+    <string name="configbuilder_loop">Loop</string>
+    <string name="configbuilder_nightscoutversion_label">Nightscout versie:</string>
+    <string name="configbuilder_profile">Profiel</string>
+    <string name="configbuilder_pump">Pomp</string>
+    <string name="configbuilder_sensitivity">Gevoeligheid detectie</string>
+    <string name="configbuilder_shortname">CONF</string>
+    <string name="configbuilder_tempbasals">Tijdelijke basalen</string>
+    <string name="configbuilder_treatments">Behandelingen</string>
+    <string name="confirmation">Bevestiging</string>
+    <string name="connected">Verbonden</string>
+    <string name="connecting">Verbinden</string>
+    <string name="connectionerror">Pomp verbindings storing</string>
+    <string name="constraintapllied">Beperking toegepast</string>
+    <string name="constraints_violation">In strijd met beperkingen</string>
+    <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
+    <string name="copy_to_clipboard">Kopieren naar klembord</string>
+    <string name="correctionbous">Correctie</string>
+    <string name="cpp_notloadedplugins">Niet alle profielen zijn geladen!</string>
+    <string name="cpp_sync_setting_missing">Moet geactiveerd worden om waardes naat de pomp te verzenden!</string>
+    <string name="cpp_valuesnotstored">Waarden niet opgeslagen!</string>
+    <string name="cs_lang">Čeština</string>
+    <string name="danar_alarm">Alarm</string>
+    <string name="danar_basalhour">Basaal uur</string>
+    <string name="danar_bluetooth_status">Bluetooh status</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth toestel</string>
+    <string name="danar_carbohydrate">Koolhydraten</string>
+    <string name="danar_dailyunits">Dag totaal</string>
+    <string name="danar_disableeasymode">EasyUI modus in pomp deactiveren</string>
+    <string name="danar_enableextendedbolus">Activeer vertraagde bolussen op de pomp</string>
+    <string name="danar_error">Storing</string>
+    <string name="danar_glucose">glucose</string>
+    <string name="danar_history">Geschiedenis</string>
+    <string name="danar_history_alarm">Alarm</string>
+    <string name="restart">Herstart</string>
+    <string name="result">Resultaat</string>
+    <string name="resume">Hervatten</string>
+    <string name="save">Opslaan</string>
+    <string name="safety">Veiligheid</string>
+    <string name="send">VERZEND</string>
+    <string name="send_calibration" formatted="false">Verzend calibratie %.1f naar xDrip?</string>
+    <string name="send_to_pump">VERZEND NAAR POMP</string>
+    <string name="sensitivity_warning">Vergeet niet alle gegeten koolhydraten in te geven bij het activeren van de Autosens functie. Anders zullen BG wijzigingen door maaltijden foutief geïnterpreteerd worden!!</string>
+    <string name="sensitivityaaps">Gevoeligheid AAPS</string>
+    <string name="sensitivityoref0">Gevoeligheid Oref0</string>
+    <string name="setbasalquestion">Accepteer nieuw tijdelijk basaal:</string>
+    <string name="setextendedbolusquestion">Stel nieuwe vertraagde bolus in:</string>
+    <string name="setting_imported">Instellingen geïnporteerd</string>
+    <string name="settingextendedbolus">Instellingen vertraagde bolus</string>
+    <string name="settings_password">Wachtwoord voor instelligen</string>
+    <string name="settingtempbasal">Instellingen tijdelijk basaal</string>
+    <string name="show_queue">Toon wachtrij</string>
+    <string name="simpleprofile">Eenvoudig profiel</string>
+    <string name="simpleprofile_shortname">EP</string>
+    <string name="sms_actualbg">BG:</string>
+    <string name="sms_basal">Basaal:</string>
+    <string name="sms_bolus">Bolus:</string>
+    <string name="sms_iob">IOB</string>
+    <string name="sms_lastbg">Laatste BG:</string>
+    <string name="smscommunicator">SMS Communicator</string>
+    <string name="smscommunicator_allowednumbers">Geautoriseerde telefoon nummers</string>
+    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
+    <string name="smscommunicator_basalreplywithcode" formatted="false">Om het basaal %.2fU/u te starten antwoord met de code %s</string>
+    <string name="smscommunicator_basalstopreplywithcode">Om het tijdelijke basaal te stoppen antwoord met de code %s</string>
+    <string name="smscommunicator_bolusdelivered" formatted="false">Bolus %.2fU succesvol toegediend</string>
+    <string name="smscommunicator_bolusfailed">Bolus mislukt</string>
+    <string name="smscommunicator_bolusreplywithcode" formatted="false">Om de bolus %.2fU toe te dienen antwoord met de code %s</string>
+    <string name="smscommunicator_calibrationfailed">XDrip ontvangt geen callibraties</string>
+    <string name="smscommunicator_calibrationreplywithcode" formatted="false">Om calibratie %.2f te verzenden antwoord met de code %s</string>
+    <string name="smscommunicator_calibrationsent">Callibratie verzonden. Het ontvangen van callibraties moet actief zijn in xDrip.</string>
+    <string name="ko_lang">한국어</string>
+    <string name="language">Taal</string>
+    <string name="localprofile">Lokaal profiel</string>
+    <string name="localprofile_shortname">LP</string>
+    <string name="lock_screen">Vergrendel scherm</string>
+    <string name="lock_screen_short">Vergrendel</string>
+    <string name="loop">Loop</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="loop_constraintsprocessed_label">Berekening met toepassing van limieten</string>
+    <string name="loop_setbypump_label">Gedefinieerd door de pomp</string>
+    <string name="loop_shortname">LOOP</string>
+    <string name="it_lang">Italiano</string>
+    <string name="nl_lang">Nederlands</string>
+    <string name="isfmissing">ISF ontbreekt in profiel. Standaard waarden toegepast.</string>
+    <string name="glucosetype_finger">Vingerprik</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="high_mark">Hoog grens</string>
+    <string name="hours">Uren</string>
+    <string name="icmissing">KH ratio ontbreekt in profieel. Standaard waarde toegepast</string>
+    <string name="import_from">Importeer instellingen van</string>
+    <string name="initializing">Initialisering</string>
+    <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
+    <string name="danar_history_bolus">Bulossen</string>
+    <string name="danar_history_carbohydrates">Koolhydraten</string>
+    <string name="danar_history_errors">Storing</string>
+    <string name="danar_history_glucose">Glucose</string>
+    <string name="danar_history_refill">Hervullen</string>
+    <string name="danar_history_syspend">Onderbreken</string>
+    <string name="danar_historyreload">Vernieuw</string>
+    <string name="days">Dagen</string>
+    <string name="de_lang">Deutsch</string>
+    <string name="deliver_now">Toedienen</string>
+    <string name="device">Toestel</string>
+    <string name="devicenotfound">Geselecteerd toestel niet gevonden</string>
+    <string name="disabledloop">Loop gedeactiveerd</string>
+    <string name="disableloop">Loop deactiveren</string>
+    <string name="disconnected">Niet verbonden</string>
+    <string name="disconnecting">Verbreken</string>
+    <string name="disconnectpumpfor10h">Verbreek verbinding 10u met pomp</string>
+    <string name="disconnectpumpfor1h">Verbreek verbinding 1u met pomp</string>
+    <string name="disconnectpumpfor2h">Verbreek verbinding 2u met pomp</string>
+    <string name="disconnectpumpfor30m">Verbreek verbinding 30min met pomp</string>
+    <string name="disconnectpumpfor3h">Verbreek verbinding 3u met pomp</string>
+    <string name="dismiss">NEGEER</string>
+    <string name="do_not_track_profile_switch">Negeer profiel wijzigingen</string>
+    <string name="iob">IOB</string>
+    <string name="invalidprofile">Ongeldig profiel !!!</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="glucose">Glucose</string>
+    <string name="gettingpumpstatus">Opvragen pomp status</string>
+    <string name="en_lang">English</string>
+    <string name="enableloop">Activeer Loop</string>
+    <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
+    <string name="enablesuperbolus_summary">Activeer de superbolus functie in de wizard. Activeer deze niet tot je begrijpt wat dit doet. OVERDOSISEN ZIJN MOGELIJK BIJ ONWETENDHEID</string>
+    <string name="enablesuperbolus">Activeer superbolus in de wizard</string>
+    <string name="enabled">Geactiveerd</string>
+    <string name="dont_show_again">Toon niet opnieuw</string>
+    <string name="eatingsoon">Eet binnenkort</string>
+    <string name="edit_base_basal">Verander basaal patroon</string>
+    <string name="old_data">Oude gegevens</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="danar_lastbolus">Laatste bolus</string>
+    <string name="danar_password_title">Pomp wachtwoord</string>
+    <string name="danar_pump_settings">DanaR pomp instellingen</string>
+    <string name="danar_refill">Hervullen</string>
+    <string name="danar_stats_amount_days"># Dagen</string>
+    <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
+    <string name="entertreatmentquestion">Nieuwe behandeling ingeven:</string>
+    <string name="error_field_must_not_be_empty">Veld mag niet leeg zijn</string>
+    <string name="extendedbolus">Vertraagde bolus</string>
+    <string name="failedupdatebasalprofile">Update basaal profiel mislukt</string>
+    <string name="fastactinginsulin">Snel werkende insuline</string>
+    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
+    <string name="filenotfound">Bestand niet gevonden</string>
+    <string name="fillbolus_title">Vull standaard hoeveelheid.</string>
+    <string name="fillwarning">Verzeker u dat de vulhoeveelheid overeenkomt met de infusieset!</string>
+    <string name="exported">Voorkeuren geexporteerd</string>
+    <string name="es_lang">Español</string>
+    <string name="executing">Uitvoeren</string>
+    <string name="export_to">Exporteer instellingen naar</string>
+    <string name="error_phone_not_valid">Telefoon nummer niet conform</string>
+    <string name="error_only_numeric_digits_range_allowed" formatted="false">Alleen numerike waarden binnen het bereik %1$s - %2$s toegelaten.</string>
+    <string name="error_only_numeric_digits_allowed">Alleen numerieke waarden toegelaten.</string>
+    <string name="el_lang">Ελληνικά</string>
+    <string name="nsclientinternal_secret_title">NS API geheim</string>
+    <string name="nsclientinternal_shortname">NSCI</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="nsclientinternal_url_dialogmessage">Nightscout URL ingeven</string>
+    <string name="nsclientinternal_url_title">Nightscout URL</string>
+    <string name="nsprofileview_target_label">Doelstelling</string>
+    <string name="nsprofileview_isf_label">ISF</string>
+    <string name="nsclientinternal_secret_dialogtitle">NS API geheim</string>
+    <string name="danar_invalidinput">Verkeerde ingave</string>
+    <string name="danar_iob_label">Pomp IOB</string>
+    <string name="basal_rate">Basaal:</string>
+    <string name="circadian_percentage_profile_shortname">CPP</string>
+    <string name="danar_history_dailyinsulin">Dagtotaal insuline</string>
+    <string name="danar_stats_date">Datum</string>
+    <string name="danar_stats_tbb">Totaal basaal</string>
+    <string name="danar_stats_weight">Gewicht</string>
+    <string name="danar_switchtouhmode">Wijzig de mudus U/d naar U/u op de pomp</string>
+    <string name="danar_useextended_title">Gebruik vertraagde bolussen voor >200%</string>
+    <string name="danar_valuenotsetproperly">Waarde niet correct ingesteld</string>
+    <string name="danar_viewprofile">Profiel bekijken</string>
+    <string name="danar_visualizeextendedaspercentage_title">Toon vertraagde bolussen in % aan</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="danarprofile">DanaR profiel instellingen</string>
+    <string name="danarprofile_dia">PIA [u]</string>
+    <string name="danarprofile_dia_summary">Periode van insuline activiteit</string>
+    <string name="danarpump">DanaR</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="dev">DEV</string>
+    <string name="nobtadapter">Geen bluetooth adapter gevonden</string>
+    <string name="nochangerequested">Geen aanpassing noodzakelijk</string>
+    <string name="noprofile">Nog geen profiel geladen van NS</string>
+    <string name="noprofileselected">Geen profiel geselecteerd</string>
+    <string name="noprofileset">Geen profiel ingesteld</string>
+    <string name="nosuccess">Niet geslaagd - controleer de telefoon</string>
+    <string name="notavailable">Niet beschikbaar</string>
+    <string name="nowritepermission">NSCLIENT heeft geen schrijfrechten. Verkeerd API geheim?</string>
+    <string name="nightscout">Nightscout</string>
+    <string name="ok">Ok</string>
+    <string name="danar_stats_basalrate">Basaal</string>
+    <string name="loopdisabled">Loop gedeactiveerd door beperkingen</string>
+    <string name="loopmenu">Loop menu</string>
+    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
+    <string name="loopsuspended">Loop pauzeren</string>
+    <string name="loopsuspendedfor" formatted="false">Pauzeer (%d m)</string>
+    <string name="lowbattery">Batterij bijna leeg</string>
+    <string name="manual">Maneel</string>
+    <string name="mdi">MDI</string>
+    <string name="mdtp_cancel">Afbreken</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="mealbolus">Maaltijd bolus</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="missing">Te weinig</string>
+    <string name="mmol">mmol/l</string>
+    <string name="nav_about">Over</string>
+    <string name="nav_backup">Backup</string>
+    <string name="nav_exit">Exit</string>
+    <string name="nav_export">Exporteer instellingen</string>
+    <string name="nav_import">Importeer instellingen</string>
+    <string name="nav_preferences">Voorkeuren</string>
+    <string name="nav_refreshtreatments">Haal wijzigingen op van NS</string>
+    <string name="nav_resetdb">Reset databanken</string>
+    <string name="nav_show_logcat">Toon logboek</string>
+    <string name="nav_test_alert">Test alarm</string>
+    <string name="needwhitelisting" formatted="false">%s benodigd batterij omptimalistaie vrijwaring voor performate werking</string>
+    <string name="ns_alarmoptions">Alarm opties</string>
+    <string name="ns_noupload">Geen upload naar NS</string>
+    <string name="ns_upload_only">Enkel NS upload (sync. gedeactiveerd)</string>
+    <string name="nsalarm_high">Hoog</string>
+    <string name="nsalarm_low">Laag</string>
+    <string name="nsalarm_summary" formatted="false">Ingesteld op %f</string>
+    <string name="nsalarm_urgenthigh">Zeer hoog</string>
+    <string name="nsalarm_urgentlow">Zeer laag</string>
+    <string name="nsclient">NSClient</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_autoscroll">Autoscroll</string>
+    <string name="nsclientinternal_devicename_dialogtitle">Toestelnaam ingeven</string>
+    <string name="nsclientinternal_devicename_title">Toestel naam</string>
+    <string name="nsclientinternal_secret_dialogmessage">Geen NS API geheim op (min 12 kar.)</string>
+    <string name="treatmentssafety_maxbolus_title">Max toegestane bolus [E]</string>
+    <string name="treatments_wizard_unit_label">E</string>
+    <string name="treatments_wizard_total_label">Totaal</string>
+    <string name="treatments_wizard_correction_label">Correctie</string>
+    <string name="treatments_wizard_cob_label">COB</string>
+    <string name="treatments_wizard_carbs_label">Koolhydraten</string>
+    <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
+    <string name="treatments_wizard_bgtrend_label">15min trend</string>
+    <string name="treatments_wizard_bg_label">BG</string>
+    <string name="treatments_wizard_basaliob_label">Basaal IOB</string>
+    <string name="treatments_shortname">BEHAND</string>
+    <string name="treatments_newtreatment_insulinamount_label">Insuline hoeveelheid</string>
+    <string name="treatments_newtreatment_carbsamount_label">Koolhydraten hoeveelheid</string>
+    <string name="treatments_iobtotal_label_string">Totale IOB:</string>
+    <string name="treatments_iobactivitytotal_label_string">Totale IOB activiteit:</string>
+    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="smscommunicator_invalidphonennumber">Foutief SMS telefoon nummer</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop was uitgeschakeld</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop was ingeschakeld</string>
+    <string name="smscommunicator_loopisdisabled">Loop is uitgeschakeld</string>
+    <string name="smscommunicator_loopisenabled">Loop is ingeschakeld</string>
+    <string name="treatments_insulin_label_string">Insuline:</string>
+    <string name="treatments_carbs_label_string">Koolhydraten:</string>
+    <string name="treatments_activity_string">Actief:</string>
+    <string name="treatments">Behandeling</string>
+    <string name="treatmentdeliveryerror">Bolus toedien storing</string>
+    <string name="basalvaluebelowminimum">Basaal onder minimum. Profiel niet ingesteld!</string>
+    <string name="overview_newtempbasal_percent_label">% (100% = actueel)</string>
+    <string name="danar_stats_bolus">Bolus</string>
+    <string name="openapsma_request_label">Voorstel</string>
+    <string name="openloop">Open loop</string>
+    <string name="openloop_newsuggestion">Nieuw voorstel beschikbaar</string>
+    <string name="othersettings_title">Andere</string>
+    <string name="openapsma_nopump">Geen pomp beschikbaar</string>
+    <string name="overview">Overzicht</string>
+    <string name="overview_bolus_label">Bolus</string>
+    <string name="overview_bolusprogress_delivered">Toegediend</string>
+    <string name="overview_bolusprogress_goingtodeliver" formatted="false">Er worden %.2fE toegediend</string>
+    <string name="overview_bolusprogress_stop">Stop</string>
+    <string name="overview_bolusprogress_stoped">Gestopt</string>
+    <string name="overview_bolusprogress_stoppressed">STOP INGEDRUKT</string>
+    <string name="overview_calibration">Kalibratie</string>
+    <string name="danar_stats_olddata_Message">Oude gegevens druk \"VERNIEUW\" a.u.b.</string>
+    <string name="hoursago">u geleden</string>
+    <string name="minago">%d min geleden</string>
+    <string name="reason">Berekening</string>
+    <string name="rate">Dosis</string>
+    <string name="duration">Periode</string>
+    <string name="openapsma_scriptdebugdata_label">Script debug</string>
+    <string name="openapsma_mealdata_label">Maaltijd gegevens</string>
+    <string name="nsprofileview_units_label">éénheid</string>
+    <string name="objectives">Doelen</string>
+    <string name="objectives_0_gate">Controleren dat BG beschikbaar is op Nightscout en dat de insulinepomp data is geupload</string>
+    <string name="objectives_0_objective">Opzetten van visualisatie en monitoring eveneens onalyze van basaal en ratio\'s</string>
+    <string name="objectives_1_gate">Werking in Open Loop modus voor enkele dagen, manueel vele tijdelijke basalen instellen</string>
+    <string name="objectives_1_objective">Starten met de Open Loop modus</string>
+    <string name="objectives_2_gate">Gebaseerd op deze ervarinegen beslissen wat het maximale basaal mag zijn en dit in de pomp instellen</string>
+    <string name="objectives_2_objective">De Open Loop begrijpen, inclusief de voorgestelde tijdelijke basalen</string>
+    <string name="objectives_3_gate">In gesloten Loop werken met een max. IOB = 0 voor enkele dagen met een beperkt aantal LBG</string>
+    <string name="objectives_3_objective">Starten met gesloten Loop met lage glucose begrenzing</string>
+    <string name="objectives_4_gate">Gebruik enkele dagen en ten miinste 1 naght zonder een laag BG alarm voordat je je BG doel laat dalen</string>
+    <string name="objectives_bgavailableinns">BG beschikbaar op NS</string>
+    <string name="objectives_5_objective">Pas het basaal en de ratios aan indien nodig, activeer hierna de auto-sens optie</string>
+    <string name="openapsma_run">Bereken nu</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Standaardwaarde: waar Dit wordt gebruikt om autosens de bevoegdheid te geven BG doelen aan te passen alsook ISF en basalen</string>
+    <string name="openapsama_autosens_period">Interval voor autosens [u]</string>
+    <string name="openapsama_autosens_period_summary">Aantal uren in het verleden voor gevoeligheids detectie (koolhy. absorbtie tijd niet meegerekend)</string>
+    <string name="openapsama_useautosens">Gebruik de AMA autosens functie</string>
+    <string name="openapsma">OpenAPS MA</string>
+    <string name="openapsma_autosensdata_label">Autosens gegevens</string>
+    <string name="openapsma_disabled">Plugin is gedeactiveerd</string>
+    <string name="openapsma_noglucosedata">Geen BG gegevens beschikbaar</string>
+    <string name="openapsma_noprofile">Geen profiel beschikbaar</string>
+    <string name="openapsma_maxiob_title">Maximaal basaal IOB OpenAPS kan toedienen [E]</string>
+    <string name="openapsma_profile_label">Profiel</string>
+    <string name="openapsma_valueoutofrange">Waarde %s is buiten de toegestane limieten</string>
+    <string name="virtualpump_basebasalrate_label">Basis basale dosis</string>
+    <string name="openapsma_lastrun_label">Laatse berekening</string>
+    <string name="openapsma_lastenact_label">Laatste uitvoering</string>
+    <string name="openapsma_glucosestatus_label">Glucose gegevens</string>
+    <string name="openapsma_currenttemp_label">Actueel</string>
+    <string name="openapsma_inputparameters_label">Berekende gegevens</string>
+    <string name="openapsma_iobdata_label">IOB gegevens</string>
+    <string name="openapsma_maxbasal_summary">DIt is de maximale waarde waarop het basaal door OpenAPS ingesteld kan worden</string>
+    <string name="profileswitch">Profiel wissel</string>
+    <string name="profileviewer">NS Profiel</string>
+    <string name="profileviewer_shortname">NSPROFIEL</string>
+    <string name="pump">Pomp</string>
+    <string name="overview_tempbasal_button">Tijdelijk basaal</string>
+    <string name="tempbasal">Tijdelijk basaal</string>
+    <string name="temptarget">Tijdelijk streefdoel</string>
+    <string name="objectives_gate_label_string">Actie</string>
+    <string name="objectives_button_start">Start</string>
+    <string name="objectives_button_verify">Controleer</string>
+    <string name="queue">Wachtend:</string>
+    <string name="paused">Gepauzeerd</string>
+    <string name="patientage">Leeftijd Patient</string>
+    <string name="overview_editquickwizardlistactivity_add">Voeg toe</string>
+    <string name="profile">Profiel</string>
+    <string name="percent">Percent</string>
+    <string name="patientage_summary">Kies leeftijd van de patient voor veiligheids limieten</string>
+    <string name="percentagefactor_hint">Percentage factor waarmee het basaal profiel mag vermenigvuldigd worden</string>
+    <string name="pleaseallowpermission">Sta wijzigingen toe</string>
+    <string name="predictionshortlabel">PRE</string>
+    <string name="target_range">Streefdoel:</string>
+    <string name="overview_extendedbolus_button">Vertraagde bolus</string>
+    <string name="overview_extendedbolus_cancel_button">Annuleer vertraagde bolus</string>
+    <string name="overview_newtempbasal_basalabsolute">Basale waarde [E/u]</string>
+    <string name="careportal_newnstreatment_carbtime_label">KH tijdsduur</string>
+    <string name="refresheventsfromnightscout">Haal wijzigingen op van NS</string>
+    <string name="reloadprofile">Herlaad profiel</string>
+    <string name="restartingapp">Sluiten van applicatie om instellingen bij te werken</string>
+    <string name="objectives_objective_label_string">Doel:</string>
+    <string name="smscommunicator_remotebolusnotallowed">Bolus via sms niet toegestaan</string>
+    <string name="smscommunicator_missingsmspermission">Geen SMS bevoegdheid</string>
+    <string name="smscommunicator_remotecommandsallowed">Sta SMS bevelen toe</string>
+    <string name="smscommunicator_shortname">SMS</string>
+    <string name="suspendloopfor10h">Onderbreek loop voor 10u</string>
+    <string name="suspendloopfor1h">Onderbreek loop voor 1u</string>
+    <string name="suspendloopfor2h">Onderbreek loop voor 2u</string>
+    <string name="suspendloopfor3h">Onderbreek loop voor 3u</string>
+    <string name="sv_lang">svenska</string>
+    <string name="teenage">Tiener</string>
+    <string name="tempbasaldeliveryerror">Tijdelijk basaal toedien storing</string>
+    <string name="tempbasals_iobtotal_label_string">Totale IOB:</string>
+    <string name="ru_lang">русский</string>
+    <string name="avgdelta">Gemiddeld verschil</string>
+    <string name="always_use_shortavg">Gebruik altijd kleine gemiddelde verschillen ipv gewone verschillen</string>
+    <string name="array_of_elements">Tabel met %d elementen. Actuele waarde:</string>
+    <string name="overview_quickwizard_item_remove_button">Verwijder</string>
+    <string name="overview_quickwizard_item_edit_button">Wijzig</string>
+    <string name="overview_shortname">Home</string>
+    <string name="overview_editquickwizard_valid">Geldigheid:</string>
+    <string name="overview_editquickwizard_carbs">Koolhydraten:</string>
+    <string name="overview_editquickwizard_buttontext">Knop tekst:</string>
+    <string name="overview_calibration_bg_label">Kalibratie</string>
+    <string name="overview_calculator_label">Bolus wizard</string>
+    <string name="danar_ebolus">E bolus</string>
+    <string name="danar_dsbolus">DS bolus</string>
+    <string name="danar_debolus">DE bolus</string>
+    <string name="danar_history_basalhours">Basale uren</string>
+    <string name="overview_newtempbasal_basalpercent">Basale waarde [%]</string>
+    <string name="overview_newtempbasal_basaltype_label">Basaal type</string>
+    <string name="basal_step">Basaal stap</string>
+    <string name="bolusconstraintapplied">Bolus limiet ingesteld</string>
+    <string name="carbsconstraintapplied">KH limiet ingesteld</string>
+    <string name="circadian_percentage_profile">CircadianPercentageProfiel</string>
+    <string name="danar_sbolus">S Bolus</string>
+    <string name="danar_stats">DanaR Statistiek</string>
+    <string name="danar_stats_cumulative_tdd">Cumulative TDD</string>
+    <string name="danar_stats_expweight">Exponentieel verhoogt TDD</string>
+    <string name="danar_stats_ratio">Ratio</string>
+    <string name="danar_stats_tbb2">TBB * 2</string>
+    <string name="danar_stats_tdd">TDD</string>
+    <string name="danar_stats_warning_Message">Mogelijks inacuraat bij gebruik van bolussen om infusieset te vullen</string>
+    <string name="delta">Verschil</string>
+    <string name="dia">DIA:</string>
+    <string name="do_not_track_profile_switch_summary">Alle profiel wijzigingen worden genegeerd, aktief profiel wordt gebruikt</string>
+    <string name="edit_base_ic">Basis-IC aanpassen:</string>
+    <string name="edit_base_isf">Basis-ISF aanpassen:</string>
+    <string name="enacted">Uitgevoerd</string>
+    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
+    <string name="long_avgdelta">Groot gemiddeld verschil</string>
+    <string name="low_mark">LAAG grens</string>
+    <string name="noapsselected">GEEN APS GESLECTEERD OF TOEGEKENT RESULTAAT</string>
+    <string name="ns_localbroadcasts">Activeer delen met andere apps (zoals xDrip).</string>
+    <string name="ns_localbroadcasts_title">Activeer locaal delen</string>
+    <string name="ns_logappstartedevent">Log app start naar NS</string>
+    <string name="ns_noupload_summary">AAPS is verbonden met NS maar er worden geen wijzigingen uitgevoerd op NS</string>
+    <string name="ns_sync_use_absolute_title">Gebruik altijd absolute basale waarden</string>
+    <string name="nsclientnotinstalled">NSClient niet geïnstalleerd. Gegevens verloren!</string>
+    <string name="nsprofileview_activeprofile_label">Actief profiel</string>
+    <string name="nsprofileview_basal_label">Basaal</string>
+    <string name="nsprofileview_dia_label">DIA</string>
+    <string name="nsprofileview_ic_label">KH ratio</string>
+    <string name="nsalarm_staledata">Oude gegevens</string>
+    <string name="nsalarm_staledatavalue_label">Oude gegevens sinds [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Alarm oude gegevens sinds [min]</string>
+    <string name="nsalarm_urgentstaledata">Dringend oude gegevens vernieuwen</string>
+    <string name="nsclientinternal_devicename_dialogmessage">Dit zal worden gebruikt in het Ingegeven door vak</string>
+    <string name="oaps_shortname">OAPS</string>
+    <string name="objectives_6_objective">Activeren van extra functies tijdens de dag zoals AMA</string>
+    <string name="objectives_manualenacts">Manuele correcties</string>
+    <string name="objectives_minimalduration">Minimale tijdsduur</string>
+    <string name="objectives_pumpstatusavailableinns">Pomp status beschikbaar op NS</string>
+    <string name="objectives_shortname">DOEL</string>
+    <string name="occlusion">Afsluiting</string>
+    <string name="ongoingnotificaction">Lopende berichten</string>
+    <string name="open_settings_on_wear">Opene instellingen op Wear</string>
+    <string name="openapsma_maxbasal_title">Maximale E/u dat OpenAPS kan toedienen</string>
+    <string name="prefs_delta_title">Verschil instellingen</string>
+    <string name="prefs_range_title">Bereik voor visualisatie</string>
+    <string name="primefill">Ontlucht/vul</string>
+    <string name="profile_set_failed">Instelln van basaal profiel mislukt</string>
+    <string name="profile_set_ok">Basaal profiel in pomp bijgewerkt</string>
+    <string name="tempbasals_iob_label_string">IOB:</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_netratio_label_string">Ratio:</string>
+    <string name="tempbasals_realduration_label_string">Tijdsduur:</string>
+    <string name="tempbasals_shortname">TB</string>
+    <string name="temptargetrange_shortname">TT</string>
+    <string name="treatmentssafety_title">Behandeling veiligheden</string>
+    <string name="pumperror">Pomp storing</string>
+    <string name="timeshift_hint">Tijd in uren waarbij het profiel cilindrische verschoven wordt</string>
+    <string name="objectives_4_objective">Inregelen van de closed loop, verhoog de max IOB boven 0 en laat gelijdelijk het BG doel dalen</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openapsama_autosens_max_summary">Standaard waarde: 1.2 Dit betekent dat de verhoging voor autosense ratio (en autotune ratio) is ingesteld op max 20%. Maw. een limiet in hoever je basaal kan verhooght worden en hoeveel je ISF en BG doel verlaagd kan worden.</string>
+    <string name="ns_upload_only_summary">Enkel NS upload. Heeft geen effect op de SGV tot als een lokale bron zoals xDipp geselecteerd is. Heeft geen effect op de profielen wanneer het ns profiel is gekozen.</string>
+    <string name="pumpNotInitialized">Pomp niet geïnitialiseerd</string>
+    <string name="pumpNotInitializedProfileNotSet">Pomp niet geïnitialiseerd, profiel niet gekozen!</string>
+    <string name="pumpbusy">Pomp is in gebruik</string>
+    <string name="pumpshutdown">Pomp uitschakelen</string>
+    <string name="pumpsuspended">Pomp onderbreken</string>
+    <string name="pumpsuspendedclicktorefresh">Pomp onderbroken. Klik om de status te vernieuwen</string>
+    <string name="quickwizard">Instelassisten</string>
+    <string name="quickwizardsettings">Instelassistent instellingen</string>
+    <string name="ratio_short">SEN</string>
+    <string name="removerecord">Verwijder gegeven:</string>
+    <string name="resend_all_data">Verzend alle gegevens opnieuw</string>
+    <string name="reset_db_confirm">Wil je echt de databank wissen?</string>
+    <string name="sensitivity_shortname">SENS</string>
+    <string name="short_avgdelta">Klein gemiddeld verschil</string>
+    <string name="short_tabtitles">Kleine tab tittels</string>
+    <string name="sms_delta">Verschil:</string>
+    <string name="sms_minago">%dmin geleden</string>
+    <string name="smscommunicator_loopresumed">Loop hervat</string>
+    <string name="smscommunicator_loopsuspended">Loop onderbroken</string>
+    <string name="smscommunicator_remotebasalnotallowed">Basale instellingen op afstand zijn niet toegestaan</string>
+    <string name="smscommunicator_remotecalibrationnotallowed">Kalibratie op afstand is niet toegestaan</string>
+    <string name="smscommunicator_remotecommandnotallowed">Bevelen op astand zijn niet toegestaan</string>
+    <string name="smscommunicator_tempbasalcanceled">Tijdelijk basaal afgebroken</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Afbreken van tijdelijk basaal mislukt</string>
+    <string name="targetmissing">Streefdoel ontbreekt in profiel. Standaard waarde wordt gebruikt</string>
+    <string name="smscommunicator_tempbasalfailed">Start tijdelijk basaal mislukt</string>
+    <string name="openapsma_maxiob_summary">Deze waarde wordt de MAx IOB in OpenAPS context genoemt. Dit is standaard 0. Na enkele dagen of weken naargelang uw vertrouwen kan je dit getal wijzigen.</string>
+    <string name="prefs_range_summary">Hoge en lage grens voor grafieken op het overzicht en op Wear</string>
+    <string name="smscommunicator_unknowncommand">Onbekend bevel of verkeerd antwoord</string>
+    <string name="smscommunicator_wrongduration">Verkeerde tijdsduur</string>
+    <string name="status">Status:</string>
+    <string name="stoppingextendedbolus">Stoppen van vertraagde bolus</string>
+    <string name="stoppingtempbasal">Stoppen van tijdelijk basaal</string>
+    <string name="success">Succes</string>
+    <string name="superbolus">Superbolus</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">Opgelet! Onderstaande waardes moeten normaal gezien niet worden aangepast. KLIK HIER en LEES de tekst zodat je alles volledig BEGRIJPT voordat je een waarde wijzigt.</string>
+    <string name="openapsama_autosens_min_summary">Standaard waarde: 0.7 Dit is de andere kan van de autosens veiligheid limiet. Dit zet een limiet op hoe laag het basaal kan aangepast worden, en hoe hoog het ISF en het BG doel</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Standaard waarde: 2 Bolus snooze is actief nadat je een maaltijd bolus toegediend hebt, zodat de loop geen tegenvoorstel met een verlaagd tijdelijk basaal doet nadat je gegeten hebt. Het voorbeeld hier van van standaard 2; dus een 3 u DIA betekent dat de bolus snooze gemiddeld 1.5u actief is (3DIA/2).</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal ; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft.Dit is een veiligheidsmaatregel om te vermijden dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
+    <string name="objectives_5_gate">1 week succesvol loop gedurende de dag met geregeld KH ingave</string>
+    <string name="syncprofiletopump_title">Synchroniseer profiel met de pomp</string>
+    <string name="careportal_activity_label">ACTIVITIJD &amp; FEEDBACK</string>
+    <string name="danar_model" formatted="false">Model: %02X Protokoll: %02X Code: %02X</string>
+    <string name="danar_history_connectingfor">Verbonden gedurende %d s</string>
+    <string name="danar_totaluploaded">Totaal %d gegevens geupload</string>
+    <string name="openapsma_valuelimitedto" formatted="false">%.2f gelimitteerd tot %.2f</string>
+    <string name="smscommunicator_suspendreplywithcode" formatted="false">Om de loop te onderbreken voor %d minuten antwoord met de code %s</string>
+    <string name="smscommunicator_tempbasalset" formatted="false">Tijdelijk basaal %.2fE/u voor %d minuten succesvol gestart</string>
+    <string name="sensitivityweightedaverage">Gemiddelde gevoeligheid</string>
+    <string name="end_user_license_agreement_text">Dit mag niet gebruikt worden om medische besluiten te trekken. Er is geen garantie voor dit programma voor de werking en het gebruik van dit programma. Tenzij anders beschreven in het copy right. Gebruikers en andere partijen leven dit programma zoals het momenteel is, dit zonder enige garantie.</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">Standaard waarde: 3.0 Dit is een belangrijke veiligheid parameter van OpenAPS. Dit limiteert je basaal met een max va 3 maal je hoogste basale dosis. Normaal hoef je deze niet te veranderen. Het is echter belangrijk dat je de ingebouwde limieten kent</string>
+    <string name="openapsama_min_5m_carbimpact_summary">"Standaard waarde: 3.0 Dit is de instelling voor standaard KH absorbeer impact per 5 minuten. Deze standaard waarde slaat op 3mg/dl/5min. Dit heeft effect op hoe snel COB uitgewerkt zijn en hoeveel KH absorptie zal worden gebruikt in het berekenen van de volgende BG en dit wanneer de BG sneller daalt of stijgt dan verwacht. "</string>
+    <string name="activate_profile">Activeer profiel</string>
+    <string name="date">Datum</string>
+    <string name="free_peak_oref">Free-Peak Oref</string>
+    <string name="dia_too_short" formatted="false">DIA van %s te kort -  %s wordt inplaats gebruikt!\"</string>
+    <string name="insulin_oref_peak">IOB curve piek tijd</string>
+    <string name="insulin_peak_time">Piek tijd [min]</string>
+    <string name="invalid">Ongeldig</string>
+    <string name="rapid_acting_oref">Snel-werkende Oref</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+</resources>

From 6ea7549e4fbc5cde73534d6fa903c904c5524f2d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 26 Aug 2017 12:07:37 +0200
Subject: [PATCH 03/53] update languages

---
 app/src/main/res/values-cs/strings.xml | 9 +++++++++
 app/src/main/res/values-it/strings.xml | 2 +-
 app/src/main/res/values-ru/strings.xml | 2 +-
 app/src/main/res/values-sv/strings.xml | 3 ++-
 app/src/main/res/values/strings.xml    | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e3605d0f5f..56ccf2a223 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -620,4 +620,13 @@
     <string name="uploader">Uploader</string>
     <string name="uploader_short">UPLD</string>
     <string name="app_name">AndroidAPS</string>
+    <string name="activate_profile">AKTIVOVAT PROFIL</string>
+    <string name="danar_visualizeextendedaspercentage_title">Zobrazovat prodloužený bolus v %</string>
+    <string name="date">Datum</string>
+    <string name="dia_too_short">DIA %s je příliž krátké - použito %s !</string>
+    <string name="insulin_oref_peak">Čas vrcholu IOB křivky</string>
+    <string name="insulin_peak_time">Vrchol křivky [min]</string>
+    <string name="invalid">NEPLATNÝ</string>
+    <string name="nl_lang">Nizozemština</string>
+    <string name="sv_lang">Švédština</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 13ea3fe715..d57e7d5876 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -156,7 +156,7 @@
     <string name="edit_base_ic">Modifica Base-IC:</string>
     <string name="edit_base_isf">Modifica Base-ISF:</string>
     <string name="el_lang">Greco</string>
-    <string name="en_lang">Inglese</string>
+    <string name="en_lang">English</string>
     <string name="enabled">Abilitare</string>
     <string name="enableloop">Abilitare Loop</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 03bc3dcebe..8a5910fb92 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -191,7 +191,7 @@
     <string name="edit_base_ic">редактировать инсулин/ВХ:</string>
     <string name="edit_base_isf">редактировать чувствительность к инсулину:</string>
     <string name="el_lang">греческий</string>
-    <string name="en_lang">английский</string>
+    <string name="en_lang">English</string>
     <string name="enabled">активировано</string>
     <string name="enableloop">активировать цикличность</string>
     <string name="enablesuperbolus">активировать суперболюс</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f8aff3bad7..a4ef3e7b2e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -176,7 +176,7 @@
     <string name="duration">Duration</string>
     <string name="eatingsoon">Äta snart</string>
     <string name="edit_base_basal">Ändra Base-Basal:</string>
-    <string name="en_lang">Engelska</string>
+    <string name="en_lang">English</string>
     <string name="enabled">Startad</string>
     <string name="enableloop">Starta loop</string>
     <string name="enablesuperbolus">Aktivera superbolus i kalkylatorn</string>
@@ -586,4 +586,5 @@
     <string name="nsalarm_urgenthigh">Bråttom hög</string>
     <string name="nsalarm_urgentlow">Bråttom låg</string>
     <string name="nsalarm_urgentstaledata">Bråttom gammal data</string>
+    <string name="app_name">AndroidAPS</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b12e163a7e..9eb710ce9a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -697,7 +697,7 @@
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
-    <string name="dia_too_short" formatted="false">"DIA of %s too short - using %s instead!"</string>
+    <string name="dia_too_short" formatted="false">DIA of %s too short - using %s instead!</string>
     <string name="activate_profile">ACTIVATE PROFILE</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>

From 40d86eb87ac5ac4816a127a7cb581a9b91f9d36a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 26 Aug 2017 14:37:38 +0200
Subject: [PATCH 04/53] fix strings

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

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 56ccf2a223..e656d0053d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -623,7 +623,7 @@
     <string name="activate_profile">AKTIVOVAT PROFIL</string>
     <string name="danar_visualizeextendedaspercentage_title">Zobrazovat prodloužený bolus v %</string>
     <string name="date">Datum</string>
-    <string name="dia_too_short">DIA %s je příliž krátké - použito %s !</string>
+    <string name="dia_too_short" formatted="false">DIA %s je příliž krátké - použito %s !</string>
     <string name="insulin_oref_peak">Čas vrcholu IOB křivky</string>
     <string name="insulin_peak_time">Vrchol křivky [min]</string>
     <string name="invalid">NEPLATNÝ</string>

From 3369ce17591869961e5a0a8b6cc34a086211aa46 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 26 Aug 2017 20:42:25 +0200
Subject: [PATCH 05/53] temporary remove untested plugin for release

---
 app/src/main/java/info/nightscout/androidaps/MainApp.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 338b5f2e07..ac9aa93c7b 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -118,8 +118,8 @@ public class MainApp extends Application {
             pluginsList.add(InsulinOrefUltraRapidActingFragment.getPlugin());
             pluginsList.add(InsulinOrefFreePeakFragment.getPlugin());
             pluginsList.add(SensitivityOref0Plugin.getPlugin());
-            pluginsList.add(SensitivityAAPSPlugin.getPlugin());
-            pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
+            //pluginsList.add(SensitivityAAPSPlugin.getPlugin());
+            //pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRFragment.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRKoreanFragment.getPlugin());
             if (Config.DANARv2) pluginsList.add(DanaRv2Fragment.getPlugin());

From 491378caf52f0e8ccb77ce3d82943618d6203055 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 26 Aug 2017 20:42:53 +0200
Subject: [PATCH 06/53] 1.51 bump

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

diff --git a/app/build.gradle b/app/build.gradle
index 8585b54e63..d6f321e942 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1500
-        version "1.5h"
+        version "1.51"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
     }

From b02b1829adc0f4afeaeab56160964d692e135c26 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 26 Aug 2017 21:26:40 +0200
Subject: [PATCH 07/53] put back sensitivity plugins

---
 app/src/main/java/info/nightscout/androidaps/MainApp.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index ac9aa93c7b..338b5f2e07 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -118,8 +118,8 @@ public class MainApp extends Application {
             pluginsList.add(InsulinOrefUltraRapidActingFragment.getPlugin());
             pluginsList.add(InsulinOrefFreePeakFragment.getPlugin());
             pluginsList.add(SensitivityOref0Plugin.getPlugin());
-            //pluginsList.add(SensitivityAAPSPlugin.getPlugin());
-            //pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
+            pluginsList.add(SensitivityAAPSPlugin.getPlugin());
+            pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRFragment.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRKoreanFragment.getPlugin());
             if (Config.DANARv2) pluginsList.add(DanaRv2Fragment.getPlugin());

From e4c98e6cd1cda813d27dc00a8379b6fd0ecb4df4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 26 Aug 2017 21:28:08 +0200
Subject: [PATCH 08/53] make dev 1.52

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

diff --git a/app/build.gradle b/app/build.gradle
index d6f321e942..8d62dbe7f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1500
-        version "1.51"
+        version "1.52"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
     }

From 6bf120e9da4df5004c777bbfab3b355fcd0306c5 Mon Sep 17 00:00:00 2001
From: Radoslav Radev <radoslav.radev@gmail.com>
Date: Sat, 26 Aug 2017 22:59:14 +0300
Subject: [PATCH 09/53] Update strings.xml

---
 app/src/main/res/values-bg/strings.xml | 77 ++++++++++++++++----------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 3293aa7f03..84ae6eaf3b 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -82,7 +82,7 @@
     <string name="profileviewer">NS Профил</string>
     <string name="simpleprofile">Обикновен профил</string>
     <string name="tempbasal">TempBasal</string>
-    <string name="treatments">Treatments</string>
+    <string name="treatments">Лечения</string>
     <string name="virtualpump">Виртуална помпа</string>
     <string name="careportal">Careportal</string>
 
@@ -96,8 +96,8 @@
     <string name="days">дни</string>
     <string name="objectives_minimalduration">Минимална продължителност</string>
     <string name="configbuilder_constraints">Ограничения</string>
-    <string name="loop">Цикъл</string>
-    <string name="configbuilder_loop">Цикъл</string>
+    <string name="loop">Loop</string>
+    <string name="configbuilder_loop">Loop</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">След ограничения</string>
     <string name="loop_setbypump_label">Зададено на помпата</string>
@@ -106,7 +106,7 @@
     <string name="cancel">Откажи</string>
     <string name="noapsselected">НЕ Е ИЗБРАН APS ИЛИ НЯМА РЕЗУЛТАТ ОТ НЕГО</string>
     <string name="safety">Сигурност</string>
-    <string name="openapsma_disabled">Плъгина е изключен</string>
+    <string name="openapsma_disabled">Модула е изключен</string>
     <string name="constraints_violation">Нарушено ограничение</string>
     <string name="treatmentdeliveryerror">Грешка при подаване на болус</string>
     <string name="tempbasaldeliveryerror">Грешка при подаване на временен базал</string>
@@ -130,10 +130,10 @@
     <string name="nsclient">NSClient</string>
     <string name="apsmode_title">APS режим</string>
 
-    <string name="closedloop">Затворен цикъл</string>
-    <string name="openloop">Отворен цикъл</string>
-    <string name="disabledloop">изключен</string>
-    <string name="disableloop">Изключи</string>
+    <string name="closedloop">Closed Loop</string>
+    <string name="openloop">Open Loop</string>
+    <string name="disabledloop">Loop изключен</string>
+    <string name="disableloop">Изключи Loop</string>
     <string name="enableloop">Включи</string>
     <string name="openloop_newsuggestion">Има ново предложение</string>
     <string name="unsupportedclientver">Несъвместима версия на NSClient</string>
@@ -142,7 +142,7 @@
     <string name="objectives_bgavailableinns">КЗ да се вижда в NS</string>
     <string name="objectives_pumpstatusavailableinns">Статуса на помпа да е достъпен в NS</string>
     <string name="objectives_manualenacts">Ръчно приложени</string>
-    <string name="loopdisabled">ЦИКЪЛА Е СПРЯН ОТ ОГРАНИЧЕНИЯТА</string>
+    <string name="loopdisabled">LOOP Е СПРЯН ОТ ОГРАНИЧЕНИЯТА</string>
     <string name="cs_lang">Czech</string>
     <string name="en_lang">English</string>
     <string name="treatments_wizard_basaliob_label">Базален IOB</string>
@@ -180,7 +180,7 @@
     <string name="careportal_newnstreatment_notes_label">Бележки</string>
     <string name="careportal_newnstreatment_eventtime_label">Време на събитие</string>
     <string name="careportal_newnstreatment_profile_label">Профил</string>
-    <string name="careportal_newnstreatment_enteredby_title">Въведен от</string>
+    <string name="careportal_newnstreatment_enteredby_title">Въведено от</string>
     <string name="careportal_newnstreatment_glucosetype">Тип КЗ</string>
     <string name="noprofile">Още не е зареден профила от NS</string>
     <string name="overview_tempbasal_button">Временен базал</string>
@@ -283,7 +283,7 @@
     <string name="danar_history_glucose">КЗ</string>
     <string name="danar_history_refill">Пълнене</string>
     <string name="danar_history_syspend">Спиране</string>
-    <string name="danar_history_connectingfor" formatted="false">Свързване с помпата за %d сек.</string>
+    <string name="danar_history_connectingfor" formatted="false">Свързва се с помпата за %d сек.</string>
     <string name="danar_password_title">Парола за помпата</string>
     <string name="wrongpumppassword">Грешна парола за помпата!</string>
     <string name="pumpbusy">Помпата е заета</string>
@@ -294,15 +294,15 @@
     <string name="overview_bolusprogress_stoppressed">Натиснат е СТОП!</string>
     <string name="waitingforpump">Очаква помпата</string>
     <string name="waitingforpumpclicktorefresh">Очаква резутат. Натисни за обновяване.</string>
-    <string name="overview_bolusprogress_goingtodeliver" formatted="false">Ще доставя %.2fЕ</string>
+    <string name="overview_bolusprogress_goingtodeliver" formatted="false">Ще достави %.2fЕ</string>
     <string name="objectives_0_objective">Настройка на визуализацията и наблюдението, а също и анализиране на базалните нужди и коефициенти</string>
-    <string name="objectives_1_gate">Работете в Отворен режим няколко дни и ръчно прилагайте на много временни базали</string>
-    <string name="objectives_1_objective">Стартиране на Отворен режим </string>
+    <string name="objectives_1_gate">Работете в Open Loop няколко дни и ръчно прилагайте на много временни базали</string>
+    <string name="objectives_1_objective">Стартиране на Open Loop </string>
     <string name="objectives_2_gate">Определяне на макс. лимит на базалния инсулин и настройване в помпата и програмата</string>
-    <string name="objectives_2_objective">Разбиране на вашият Отворен режим, включително препоръчваните временни базали</string>
-    <string name="objectives_3_objective">Стартиране на Затворен цикъл с изключване на базал при ниска КЗ</string>
-	<string name="objectives_3_gate">Стартиране на Затворен цикъл с макс. IOB=0 без твърде много събития тип ниска КЗ</string>
-    <string name="objectives_4_objective">Настройване на Затворения цикъл чрез повишаване на максималният IOB над 0 и понижаване на целевите нива на КЗ</string>
+    <string name="objectives_2_objective">Разбиране на вашият Open Loop, включително препоръчваните временни базали</string>
+    <string name="objectives_3_objective">Стартиране на Closed Loop с изключване на базал при ниска КЗ</string>
+	<string name="objectives_3_gate">Стартиране на Closed Loop с макс. IOB=0 без твърде много събития тип ниска КЗ</string>
+    <string name="objectives_4_objective">Настройване на Closed Loop чрез повишаване на максималният IOB над 0 и понижаване на целевите нива на КЗ</string>
     <string name="objectives_4_gate">Прекарайте няколко дни по този начин, като поне една нощ нямате аларма за ниска КЗ.</string>
     <string name="objectives_5_objective">Настройване на базалния инсулин и коефициенти ако е необходимо и активиране на auto-sens</string>
     <string name="objectives_5_gate">Една седмица успешно дневно използване с редовно въвеждане на въглехидрати</string>
@@ -387,7 +387,7 @@
     <string name="mdi">Писалки</string>
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Текущи известия</string>
-    <string name="old_data">ПЕКАЛЕНО СТАРИ ДАННИ</string>
+    <string name="old_data">СТАРИ ДАННИ</string>
     <string name="minago">преди %d мин</string>
     <string name="sms_minago">%dmin ago</string>
     <string name="localprofile">Локален профил</string>
@@ -440,14 +440,14 @@
     <string name="always_use_shortavg">Използвай краткоср. Δ вместо разлика от последната КЗ</string>
     <string name="always_use_shortavg_summary">Полезно при данни за КЗ с много шум</string>
     <string name="advancedsettings_title">Разширени настройки</string>
-    <string name="danar_model" formatted="false">Медел: %02X Протокол: %02X Код: %02X</string>
+    <string name="danar_model" formatted="false">Модел: %02X Протокол: %02X Код: %02X</string>
     <string name="profile">Профил</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">По подразбиране: 3 Това е основен параметър в сигурността на OpenAPS. Той ограничава максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от "3x от най-високия дневен; 4x от текущия". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри.</string>
     <string name="openapsama_autosens_max_summary">По подразбиране: 1.2\nТова е максималният множител на autosens (а скоро autotune) за да позволи 20% максимален лимит на autosens коефициента, който от своя страна настройва базалите, колко може да намали ISF, и колко ниско може да свали целевата КЗ.</string>
     <string name="openapsama_autosens_min_summary">По подразбиране: 0.7\nДругата част от сигурността на autosens, слагайки ограничение на колко ниско може да ограничи базалите, колко да повиши чувствителността (ISF) и целевите КЗ.</string>
     <string name="openapsama_autosens_adjusttargets_summary">По подразбиране: разрешено\nТова позволява на autosens да променя и целевите КЗ(освен чувствителност и базал).</string>
-    <string name="openapsama_bolussnooze_dia_divisor_summary">По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така цикъла няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2).</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така Loop няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">По подразбиране: 3.0\nТова е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл/5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values.</string>
     <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
@@ -487,7 +487,7 @@
     <string name="nsclientinternal">вътрешен NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
-    <string name="nsclientinternal_autoscroll">Autoscroll</string>
+    <string name="nsclientinternal_autoscroll">Автопревъртане</string>
     <string name="restart">Рестарт</string>
     <string name="nsclientinternal_title">Вътрешен NSClient</string>
     <string name="nsclientinternal_url_title">Nightscout адрес</string>
@@ -511,16 +511,16 @@
     <string name="patientage_summary">Изберете възраст за определяне лимитите на безопасност</string>
     <string name="Glimp">Glimp</string>
     <string name="batteryoptimalizationerror">Устройството изглежда не подържа изключване на оптимизиране на батерията!</string>
-    <string name="pleaseallowpermission">Моля, позволете рарешение</string>
+    <string name="pleaseallowpermission">Моля, добавете рарешение</string>
     <string name="needwhitelisting" formatted="false">%s се нуждае от зключване на оптимизиране на батерията за пълна функционалност</string>
-    <string name="loopsuspended">Цикъл изключен</string>
+    <string name="loopsuspended">Loop изключен</string>
     <string name="loopsuspendedfor" formatted="false">Изключен (%d мин)</string>
     <string name="loopsuperbolusfor" formatted="false">Суперболус (%d мин)</string>
-    <string name="loopmenu">Меню Цикъл</string>
-    <string name="suspendloopfor1h">Изключи цикъла за 1ч</string>
-    <string name="suspendloopfor2h">Изключи цикъла за 2ч</string>
-    <string name="suspendloopfor3h">Изключи цикъла за 3ч</string>
-    <string name="suspendloopfor10h">Изключи цикъла за 10 ч</string>
+    <string name="loopmenu">Меню Loop</string>
+    <string name="suspendloopfor1h">Изключи Loop за 1ч</string>
+    <string name="suspendloopfor2h">Изключи Loop за 2ч</string>
+    <string name="suspendloopfor3h">Изключи Loop за 3ч</string>
+    <string name="suspendloopfor10h">Изключи Loop за 10 ч</string>
     <string name="disconnectpumpfor30m">Изключи помпата за 30 мин.</string>
     <string name="disconnectpumpfor1h">Изключи помпата за 1 ч</string>
     <string name="disconnectpumpfor2h">Изключи помпата за 2 ч</string>
@@ -631,4 +631,23 @@
     <string name="wear_detailedIOB_summary">Раздели IOB от болус и от базал на часовника</string>
     <string name="wear_detailedIOB_title">Покажи подробен IOB</string>
     <string name="app_name">AndroidAPS</string>
+    <string name="activate_profile">Активирай профила</string>
+    <string name="careportal_activity_label">АКТИВНОСТ И ОБРАТНА ВРЪЗКА</string>
+    <string name="careportal_carbsandbolus_label">ХРАНА И БОЛУС</string>
+    <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
+    <string name="careportal_newnstreatment_duration_min_label">Продължителност [мин.]</string>
+    <string name="careportal_pump_label">ПОМПА</string>
+    <string name="date">Дата</string>
+    <string name="dia_too_short" formatted="false">DIA от %s е твърде кратка - използвай %s вместо това!</string>
+    <string name="free_peak_oref">със свободен пик по Oref</string>
+    <string name="insulin_oref_peak">Пик на кривата на IOB</string>
+    <string name="insulin_peak_time">Време на пик [мин.]</string>
+    <string name="invalid">НЕВАЛИДНО</string>
+    <string name="nl_lang">Dutch</string>
+    <string name="overview_newtempbasal_basalabsolute">Базална стойност [Е/ч]</string>
+    <string name="rapid_acting_oref">Бързодействащ по Oref</string>
+    <string name="ratio_short">SEN</string>
+    <string name="sv_lang">Swedish</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="ultrarapid_oref">Ултра бързодействащ по Oref</string>
 </resources>

From 761f9f5075c2fabcb53a8aeaf58c56225990c7be Mon Sep 17 00:00:00 2001
From: warstar2187 <warstar2187@gmail.com>
Date: Sun, 27 Aug 2017 06:09:17 +0900
Subject: [PATCH 10/53] Update strings.xml

---
 app/src/main/res/values-ko/strings.xml | 94 +++++++++++++-------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 33cf3ef855..5dce573231 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -42,7 +42,7 @@
     <string name="treatments_newtreatment_carbsamount_label">탄수화물 양</string>
     <string name="treatments_wizard_bg_label">혈당</string>
     <string name="treatments_wizard_carbs_label">탄수화물</string>
-    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="treatments_wizard_correction_label">교정</string>
     <string name="treatments_wizard_unit_label">U</string>
     <string name="treatments_wizard_bolusiob_label">식사주입 IOB</string>
     <string name="treatments_wizard_total_label">총</string>
@@ -98,7 +98,7 @@
     <string name="configbuilder_loop">Loop</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">제약 적용 후</string>
-    <string name="loop_setbypump_label">펌프로 설정</string>
+    <string name="loop_setbypump_label">펌프 설정</string>
     <string name="openapsma_lastenact_label">최근 주입</string>
     <string name="ok">OK</string>
     <string name="cancel">취소</string>
@@ -107,7 +107,7 @@
     <string name="openapsma_disabled">플러그인이 사용불가능 합니다</string>
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">식사주입 전송 에러</string>
-    <string name="tempbasaldeliveryerror">임시기초 전송 에러</string>
+    <string name="tempbasaldeliveryerror">임시기초주입 전송 에러</string>
     <string name="overview_newtempbasal_basalpercent">기초주입 값 [%]</string>
     <string name="overview_newtempbasal_percent_label">% (100% = 현재)</string>
     <string name="setbasalquestion">새 임시기초주입 적용:</string>
@@ -224,7 +224,7 @@
     <string name="devicenotfound">선택된 기기를 찾지 못했습니다</string>
     <string name="connectionerror">펌프 연결 에러</string>
     <string name="danar_iob_label">펌프 IOB</string>
-    <string name="danar_dailyunits">하루 인슐린양</string>
+    <string name="danar_dailyunits">일 인슐린 총량</string>
     <string name="danar_lastbolus">최근 식사주입:</string>
     <string name="hoursago">시간 전</string>
     <string name="danar_invalidinput">사용할수 없는 입력 데이터</string>
@@ -245,7 +245,7 @@
     <string name="smscommunicator_calibrationreplywithcode" formatted="false">보정값 %.2f을 전송하려면 %s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_bolusfailed">Bolus failed</string>
     <string name="bolusdelivered" formatted="false">Bolus %.2fU delivered successfully</string>
-    <string name="bolusrequested" formatted="false">Going to deliver %.2fU</string>
+    <string name="bolusrequested" formatted="false">%.2fU 주입 예정입니다.</string>
     <string name="smscommunicator_bolusdelivered" formatted="false">Bolus %.2fU delivered successfully</string>
     <string name="bolusdelivering" formatted="false">%.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
@@ -271,7 +271,7 @@
     <string name="danar_glucose">혈당</string>
     <string name="danar_carbohydrate">탄수화물</string>
     <string name="danar_alarm">알람</string>
-    <string name="danar_totaluploaded" formatted="false">Total %d records uploaded</string>
+    <string name="danar_totaluploaded" formatted="false">총 %d 기록들이 업로드되었습니다.</string>
     <string name="danar_sbolus">S bolus</string>
     <string name="danar_history_alarm">알람</string>
     <string name="danar_history_basalhours">기초주입 시간</string>
@@ -294,19 +294,19 @@
     <string name="waitingforpump">펌프를 기다리는 중</string>
     <string name="waitingforpumpclicktorefresh">펌프를 기다리고 있습니다. 새로고침 하려면 클릭하세요.</string>
     <string name="overview_bolusprogress_goingtodeliver" formatted="false">%.2fU을 주입합니다</string>
-    <string name="objectives_0_objective">나이트스카우트를 세팅하고, 기초주입과 비율을 분석한다.</string>
+    <string name="objectives_0_objective">표시설정과 모니터링설정을 완료하고, 기초주입과 비율을 분석한다.</string>
     <string name="objectives_0_gate">나이트스카우트에서 혈당 데이터가 잘 들어오는지, 펌프데이터가 업로드 되는지 확인한다.</string>
     <string name="objectives_1_objective">Open Loop를 시작한다.</string>
-    <string name="objectives_1_gate">Open Loop 모드에서 몇일동안 사용해보고, 수동으로 여러번 임시기초주입을 해본다.</string>
+    <string name="objectives_1_gate">Open Loop 모드에서 몇일간 사용하여보고, 임시기초주입을 여러번 수동으로 실행하여본다.</string>
     <string name="objectives_2_objective">임시기초주입 추천기능을 포함해서, Open Loop에 대해 이해한다.</string>
     <string name="objectives_2_gate">이 경험을 토대로, 최대 기초주입량을 결정하고 이를 펌프와 설정에 입력한다.</string>
     <string name="objectives_3_objective">Closed Loop를 시작하고 저혈당인슐린 중지 기능을 사용해본다.</string>
     <string name="objectives_3_gate">최대 IOB = 0 인 상태로 Closed Loop를 몇일동안 실행시켜 본다. 저혈당 인슐린일시중지가 많이 발생하지 않도록 한다.</string>
-    <string name="objectives_4_objective">Closed Loop를 조정하고, 최대 IOB를 0 이상으로 올려서 서서히 혈당 목표치를 낮춘다.</string>
-    <string name="objectives_4_gate">혈당을 낮추기 전에 최소한 하루는 저혈당 혈당 알람없게 하고 몇일간 사용해본다.</string>
+    <string name="objectives_4_objective">Closed Loop를 조정하여 최대 IOB를 0 이상으로 올려서 서서히 혈당 목표치를 낮춘다.</string>
+    <string name="objectives_4_gate">혈당을 낮추기 전에 몇일간 사용해보되 최소한 하루는 저혈당 혈당 알람이 발생하지 않도록 해본다.</string>
     <string name="objectives_5_objective">필요하면 기초주입과 비율을 조절하고, auto-sens를 활성화한다.</string>
-    <string name="objectives_5_gate">평소 먹는 탄수화물 입력하면서 Loop를 실행하고 1주일간 성공적으로 낮시간을 관리한다.</string>
-    <string name="objectives_6_objective">AMA(Advanced Meal Assist)같은 주간용을 위한 추가적인 기능들을 실행하여 본다.</string>
+    <string name="objectives_5_gate">평소의 탄수화물을 입력하면서 1주일동안 낮시간대에 loop를 성공적으로 사용해본다.</string>
+    <string name="objectives_6_objective">AMA(Advanced Meal Assist)같은 낮시간대를 위한 추가적인 기능들을 실행하여 본다.</string>
     <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
     <string name="noprofileselected">프로파일이 선택되지 않았습니다</string>
     <string name="smscommunicator_loophasbeendisabled">Loop가 중지되었습니다.</string>
@@ -320,10 +320,10 @@
     <string name="smscommunicator_basalreplywithcode" formatted="false">기초주입 %.2fU/h 을 실행하려면 %s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_suspendreplywithcode" formatted="false">%d분동안 Loop 일시중지하려면 %s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalset" formatted="false">Temp basal %.2fU/h for %d min started successfully</string>
-    <string name="smscommunicator_tempbasalfailed">임시기초 시작을 실패하였습니다.</string>
+    <string name="smscommunicator_tempbasalfailed">Temp basal start failed</string>
     <string name="smscommunicator_basalstopreplywithcode" formatted="false">임시기초주입을 중지하려면 %s 를 입력하고 답장하세요</string>
-    <string name="smscommunicator_tempbasalcanceled">임시기초가 취소되었습니다.</string>
-    <string name="smscommunicator_tempbasalcancelfailed">임시기초 취소를 실패하였습니다.</string>
+    <string name="smscommunicator_tempbasalcanceled">Temp basal canceled</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Canceling temp basal failed</string>
     <string name="smscommunicator_unknowncommand">알려지지 않은 명령이거나 잘못된 답장입니다.</string>
     <string name="quickwizard">빠른마법사</string>
     <string name="quickwizardsettings">빠른마법사 설정</string>
@@ -343,7 +343,7 @@
     <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
     <string name="pumpNotInitializedProfileNotSet">펌프가 초기화와 프로파일 설정이 되지 않았습니다!</string>
     <string name="primefill">공기/채움</string>
-    <string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
+    <string name="fillwarning">양이 인퓨전세트의 사양과 일치하는지 확인하세요!</string>
     <string name="othersettings_title">기타</string>
     <string name="fillbolus_title">공기/채움 기본 인슐린양</string>
     <string name="button1">버튼1</string>
@@ -412,8 +412,8 @@
     <string name="danar_stats_ratio">비율</string>
     <string name="danar_stats_amount_days">#일</string>
     <string name="danar_stats_weight">가중</string>
-    <string name="danar_stats_warning_Message">Possibly inaccurate if using boluses for priming/filling!</string>
-    <string name="danar_stats_olddata_Message">Old Data Please Press "RELOAD"</string>
+    <string name="danar_stats_warning_Message">공기/채움을 위해 식사주입을 사용한 경우 부정확할 수 있습니다!!</string>
+    <string name="danar_stats_olddata_Message">오래된 데이터입니다. "새로고침"을 누르세요.</string>
     <string name="danar_stats_tbb">총기초량</string>
     <string name="danar_stats_tbb2">총기초량 * 2</string>
     <string name="initializing">초기화중 ...</string>
@@ -437,19 +437,19 @@
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">탭 이름 단축</string>
     <string name="prefs_delta_title">Delta Settings</string>
-    <string name="always_use_shortavg">Always use short average delta instead of simple delta</string>
-    <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
+    <string name="always_use_shortavg">단순델타값 대신 단기평균델타값을 항상 사용합니다.</string>
+    <string name="always_use_shortavg_summary">xDrip의 혈당데이터에 노이즈가 심할경우 유용합니다.</string>
     <string name="advancedsettings_title">고급 설정</string>
     <string name="danar_model" formatted="false">Model: %02X Protocol: %02X Code: %02X</string>
     <string name="profile">프로파일</string>
-    <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3\nThis is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
-    <string name="openapsama_current_basal_safety_multiplier_summary">Default value: 4\nThis is the other half of the key OpenAPS safety caps, and the other half of “3x max daily; 4x current” of the safety caps. This means your basal, regardless of max basal set on your pump, cannot be any higher than this number times the current level of your basal. This is to prevent people from getting into dangerous territory by setting excessively high max basals before understanding how the algorithm works. Again, the default is 4x; most people will never need to adjust this and are instead more likely to need to adjust other settings if they feel like they are “running into” this safety cap.</string>
-    <string name="openapsama_autosens_max_summary">Default value: 1.2\nThis is a multiplier cap for autosens (and soon autotune) to set a 20% max limit on how high the autosens ratio can be, which in turn determines how high autosens can adjust basals, how low it can adjust ISF, and how low it can set the BG target.</string>
-    <string name="openapsama_autosens_min_summary">Default value: 0.7\nThe other side of the autosens safety limits, putting a cap on how low autosens can adjust basals, and how high it can adjust ISF and BG targets.</string>
-    <string name="openapsama_autosens_adjusttargets_summary">Default value: true\nThis is used to allow autosens to adjust BG targets, in addition to ISF and basals.</string>
-    <string name="openapsama_bolussnooze_dia_divisor_summary">Default value: 2\nBolus snooze is enacted after you do a meal bolus, so the loop won’t counteract with low temps when you’ve just eaten. The example here and default is 2; so a 3 hour DIA means that bolus snooze will be gradually phased out over 1.5 hours (3DIA/2).</string>
-    <string name="openapsama_min_5m_carbimpact_summary">Default value: 3.0\nThis is a setting for default carb absorption impact per 5 minutes. The default is an expected 3mg/dl/5min. This affects how fast COB are decayed, and how much carb absorption is assumed in calculating future predicted BG, when BG is falling more than expected, or not rising as much as expected.</string>
-    <string name="openapsama_link_to_preferncejson_doc_txt">주의!\n보통의 경우 아래의 값을 변경하면 안됩니다. 이 값들을 변경하기 전에 반드시 이곳을 클릭하고 글을 정독해서 확실하게 이해를 하여야 합니다..</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">기본값: 3\n이 값은 중요한 OpenAPS 안전장치입니다. 이 값의 역할은 펌프에 설정되어 있는 최대기초주입량보다 3배를 초과할 수 없게 제한하는 것입니다. 이 값을 변경할 필요는 없을 것이지만, 안전을 위해 "3x max daily; 4x current"이 의미하는 바를 알고 있어야 합니다.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 "3x max daily; 4x current"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이 값은 펌프에 설정된 최대기초주입량과 관계없이, 설정된 현재시간의 기초주입량에 이 값을 곱한 양을 초과할 수 없게됩니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
+    <string name="openapsama_autosens_max_summary">기본값: 1.2\n이 값은 autosens가 autosens 비율을 얼마나 높게 할 수 있는지에 대한 최대 한계를 20%로 설정하는 승수장치입니다. 이는 autosens가 얼마나 높게 기초주입량을 조절할수 있는지, ISF를 얼마나 낮게 조절할수 있는지, 혈당 목표범위를 얼마나 낮게 설정할수 있는지를 결정합니다.</string>
+    <string name="openapsama_autosens_min_summary">기본값: 0.7\nautosens 안전 제한의 나머지 부분입니다. 이는 기초주입량을 얼마나 낮게 조절할 수 있는지, ISF와 혈당 목표범위를 얼마나 높게 설정할 수 있는지를 결정합니다.</string>
+    <string name="openapsama_autosens_adjusttargets_summary">기본값: 활성\n이것은 autosens가 ISF와 기초주입뿐만 아니라, 혈당 목표범위를 조절할 수 있게 합니다.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">기본값: 2\n식사주입 후 Bolus snooze가 수행되게 되고, 따라서 식사주입 직후엔 loop가 low temp에 대응하지 않게 됩니다. 기본값이 2일때 예제는 다음과 같습니다; DIA가 3시간일 경우  bolus snooz는 점차적으로 1.5시간에 걸쳐 단계적으로 사라지게 됩니다.(3DIA/2).</string>
+    <string name="openapsama_min_5m_carbimpact_summary">기본값: 3\n이것은 5분당 기본 탄수화물 흡수량에 대한 설정입니다. 예상되는 기본값은 3mg/dl/5min입니다. 이는 혈당이 예상보다 빨리 떨어지거나 오를때, 얼마나 빨리 COB가 감쇠하는지와 혈당예측을 위한 계산시 탄수화물 흡수량이 얼마나 될것으로 예상되는지에 영향을 미치게 됩니다.</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">주의!\n보통의 경우 아래의 값을 변경하면 안됩니다. 이 값들을 변경하기 전에 반드시 이곳을 클릭하고 글을 정독해서 확실하게 이해를 하여야 합니다.</string>
     <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
     <string name="error_only_numeric_digits_allowed">숫자만 입력가능합니다.</string>
     <string name="error_only_numeric_digits_range_allowed">이 범위(%1$s - %2$s)안에 해당하는 숫자만 입력가능합니다.</string>
@@ -468,10 +468,10 @@
     <string name="smscommunicator_calibrationsent">보정 전송됨. xDrip에서 수신이 되도록 설정되어 있어야 합니다.</string>
     <string name="smscommunicator_calibrationfailed">xDrip에서 보정을 받지 못합니다.</string>
     <string name="dont_show_again">다시 보지 않기</string>
-    <string name="pumpsuspendedclicktorefresh">펌프 일시중지. 상태를 새로고치려면 클릭하세요</string>
+    <string name="pumpsuspendedclicktorefresh">펌프 일시중지. 상태를 새로고치려면 클릭하세요.</string>
     <string name="pumpsuspended">펌프 일시중지됨</string>
     <string name="gettingpumpstatus">펌프 상태 가져오는중</string>
-    <string name="settingtempbasal">임시 기초주입 설정중</string>
+    <string name="settingtempbasal">임시기초주입 설정중</string>
     <string name="stoppingtempbasal">임시기초주입 취소중</string>
     <string name="settingextendedbolus">확장식사주입 설정중</string>
     <string name="stoppingextendedbolus">확장식사주입 취소중</string>
@@ -535,8 +535,8 @@
     <string name="disconnectpumpfor10h">10시간동안 펌프 일시중지</string>
     <string name="resume">재시작</string>
     <string name="smscommunicator_wrongduration">기간이 잘못되었습니다.</string>
-    <string name="smscommunicator_loopsuspended">Loop 일시중지됨</string>
-    <string name="smscommunicator_loopresumed">Loop 재시작됨</string>
+    <string name="smscommunicator_loopsuspended">Loop가 일시중지되었습니다.</string>
+    <string name="smscommunicator_loopresumed">Loop가 재시작되었습니다.</string>
     <string name="treatments_wizard_bgtrend_label">15분 추이</string>
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="superbolus">Superbolus</string>
@@ -549,8 +549,8 @@
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
     <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
-    <string name="enablesuperbolus">Enable superbolus in wizard</string>
-    <string name="enablesuperbolus_summary">Enable superbolus functionality in wizard. Do not enable until you learn what it really does. IT MAY CAUSE INSULIN OVERDOSE IF USED BLINDLY!</string>
+    <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
+    <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="predictionshortlabel">PRE</string>
@@ -559,7 +559,7 @@
     <string name="virtualpump_lastconnection_label">최근 연결</string>
     <string name="danar_bluetooth_status">블루투스 상태</string>
     <string name="nav_about">About</string>
-    <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
+    <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
     <string name="dev">DEV</string>
     <string name="xdripstatus_settings">xDrip 상태(워치)</string>
     <string name="xdripstatus">xDrip 상태표시라인(워치)</string>
@@ -573,9 +573,9 @@
     <string name="extendedbolus">확장식사</string>
     <string name="temptarget">임시목표</string>
     <string name="overview_extendedbolus_cancel_button">확장 식사주입 취소</string>
-    <string name="careportal_sensorage_label">센서 나이</string>
-    <string name="careportal_canulaage_label">캐뉼라 나이</string>
-    <string name="careportal_insulinage_label">인슐린 나이</string>
+    <string name="careportal_sensorage_label">센서 사용기간</string>
+    <string name="careportal_canulaage_label">캐뉼라 사용기간</string>
+    <string name="careportal_insulinage_label">인슐린 사용기간</string>
     <string name="hours">시간</string>
     <string name="overview_newtempbasal_basaltype_label">기초주입 종류</string>
     <string name="isfmissing">프로파일에서 ISF가 누락되었습니다. 가본값을 사용합니다.</string>
@@ -584,7 +584,7 @@
     <string name="targetmissing">프로파일에서 목표범위가 누락되었습니다. 가본값을 사용합니다.</string>
     <string name="invalidprofile">프로파일이 잘못되었습니다 !!!</string>
     <string name="profileswitch">프로파일변경</string>
-    <string name="careportal_pbage_label">펌프 배터리 나이</string>
+    <string name="careportal_pbage_label">펌프배터리사용기간</string>
     <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
     <string name="ns_alarmoptions">알람 옵션</string>
     <string name="nsalarm_urgenthigh">Urgent high</string>
@@ -596,11 +596,11 @@
     <string name="nsalarm_urgentstaledata">Urgent stale data</string>
     <string name="nsalarm_staledatavalue_label">Stale data threshold [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Urgent stale data threshold [min]</string>
-    <string name="openapsama_autosens_period">Interval for autosens [h]</string>
-    <string name="openapsama_autosens_period_summary">Amount of hours in the past for sensitivity detection (carbs absorption time is excluded)</string>
+    <string name="openapsama_autosens_period">autosens 시간 [h]</string>
+    <string name="openapsama_autosens_period_summary">민감도를 감지하기 위해 계산될 총 시간 (탄수화물 흡수 시간은 제외됩니다.)</string>
     <string name="ratio_short">SEN</string>
-    <string name="do_not_track_profile_switch">Ignore profile switch events</string>
-    <string name="do_not_track_profile_switch_summary">All profile switch events are ignored and active profile is always used</string>
+    <string name="do_not_track_profile_switch">프로파일 변경 이벤트 무시하기</string>
+    <string name="do_not_track_profile_switch_summary">모든 프로파일 변경 이벤트는 무시되고, 항상 활성 프로파일이 사용됩니다.</string>
     <string name="pump">Pump</string>
     <string name="openaps">OpenAPS</string>
     <string name="device">Device</string>
@@ -610,8 +610,8 @@
     <string name="sensitivityoref0">Sensitivity Oref0</string>
     <string name="sensitivityaaps">Sensitivity AAPS</string>
     <string name="absorptionsettings_title">흡수 설정</string>
-    <string name="absorption_maxtime_title">Meal max absorption time [h]</string>
-    <string name="absorption_maxtime_summary">Time in hours where is expected all carbs from meal will be absorbed</string>
+    <string name="absorption_maxtime_title">식사 최대 흡수 시간 [h]</string>
+    <string name="absorption_maxtime_summary">식사로 섭취한 탄수화물이 모두 흡수될기까지 예상되는 시간</string>
     <string name="danar_visualizeextendedaspercentage_title">확장식사주입을 %로 표시하기</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
@@ -623,7 +623,7 @@
     <string name="virtualpump_extendedbolus_label_short">EXT</string>
     <string name="lock_screen">화면 잠금</string>
     <string name="lock_screen_short">잠금</string>
-    <string name="sensitivity_warning">By turning on Autosense feature remember to enter all eated carbs. Otherwise carbs deviations will be identified wrong as sensitivity change !!</string>
+    <string name="sensitivity_warning">Autosense 기능을 켜면 모든 섭취된 탄수화물양을 입력하십시오. 그렇지 않으면 탄수화물 편차(deviations)가 민감도 변화로 잘못 인식될것입니다!!</string>
     <string name="sensitivityweightedaverage">Sensitivity WeightedAverage</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdtp_cancel">Cancel</string>
@@ -632,7 +632,7 @@
     <string name="cpp_valuesnotstored">Values not stored!</string>
     <string name="wear_overviewnotifications">개요 알림</string>
     <string name="wear_overviewnotifications_summary">개요 알림을 웨어확인메세지로 전달합니다.</string>
-    <string name="ns_localbroadcasts">(xDrip 같은) 다른 앱으로 브로드캐스트를 활성화합니다.</string>
+    <string name="ns_localbroadcasts">(xDrip 같은) 다른 앱으로의 브로드캐스트를 활성화합니다.</string>
     <string name="ns_localbroadcasts_title">Local Broadcasts 활성화하기</string>
     <string name="careportal_activity_label">활동 &amp; 조절</string>
     <string name="careportal_carbsandbolus_label">탄수화물 &amp; 식사주입</string>

From ba967df2e386517954a8e25f955b3526d5f9ca3f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 27 Aug 2017 11:44:39 +0200
Subject: [PATCH 11/53] disable careportal buttons until profile is set

---
 .../Careportal/CareportalFragment.java        |  18 +
 .../main/res/layout/careportal_fragment.xml   | 665 +++++++++---------
 2 files changed, 360 insertions(+), 323 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
index 6ddda8cd68..2353fa6645 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
@@ -9,6 +9,7 @@ import android.text.Layout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
@@ -16,10 +17,13 @@ import com.squareup.otto.Subscribe;
 import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
 
 public class CareportalFragment extends SubscriberFragment implements View.OnClickListener {
@@ -32,6 +36,8 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
     TextView pbage;
 
     View statsLayout;
+    LinearLayout butonsLayout;
+    View noProfileView;
 
     static public CareportalPlugin getPlugin() {
         if (careportalPlugin == null) {
@@ -95,6 +101,18 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
 
         statsLayout = (View) view.findViewById(R.id.careportal_stats);
 
+        noProfileView = (View) view.findViewById(R.id.profileview_noprofile);
+        butonsLayout = (LinearLayout) view.findViewById(R.id.careportal_buttons);
+
+        ProfileStore profileStore = ConfigBuilderPlugin.getActiveProfileInterface().getProfile();
+        if (profileStore == null) {
+            noProfileView.setVisibility(View.VISIBLE);
+            butonsLayout.setVisibility(View.GONE);
+        } else {
+            noProfileView.setVisibility(View.GONE);
+            butonsLayout.setVisibility(View.VISIBLE);
+        }
+
         if (BuildConfig.NSCLIENTOLNY)
             statsLayout.setVisibility(View.GONE); // visible on overview
 
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 9c7d34d6a1..4f21471075 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -22,353 +22,372 @@
                 android:layout_height="wrap_content" />
 
             <TextView
+                android:id="@+id/profileview_noprofile"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="15dp"
-                android:text="@string/careportal_activity_label" />
+                android:gravity="center_horizontal"
+                android:text="@string/noprofileset"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="@android:color/holo_red_light"
+                android:textStyle="bold"
+                android:visibility="gone" />
 
-            <android.support.v7.widget.GridLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:padding="10dip"
-                app:columnCount="3">
-
-                <Button
-                    android:id="@+id/careportal_bgcheck"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_bgcheck"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_bgcheck"
-
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="0" />
-
-                <Button
-                    android:id="@+id/careportal_exercise"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_exercise"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_exercise"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="0" />
-
-                <Button
-                    android:id="@+id/careportal_temporarytarget"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_target"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_temporarytarget"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="0" />
-
-
-            </android.support.v7.widget.GridLayout>
-
-
-            <TextView
+            <LinearLayout
+                android:id="@+id/careportal_buttons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="15dp"
-                android:text="@string/careportal_carbsandbolus_label" />
+                android:orientation="vertical">
 
-            <android.support.v7.widget.GridLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:padding="10dip"
-                app:columnCount="3">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="15dp"
+                    android:text="@string/careportal_activity_label" />
 
-                <Button
-                    android:id="@+id/careportal_snackbolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_bolus_snack"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_snackbolus"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+                <android.support.v7.widget.GridLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:padding="10dip"
+                    app:columnCount="3">
 
-                <Button
-                    android:id="@+id/careportal_mealbolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_bolus_meal"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_mealbolus"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+                    <Button
+                        android:id="@+id/careportal_bgcheck"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0px"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_bgcheck"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_bgcheck"
 
-                <Button
-                    android:id="@+id/careportal_correctionbolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_bolus_correction"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_correctionbolus"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
 
-                <Button
-                    android:id="@+id/careportal_carbscorrection"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_carbscorrection"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="2" />
+                    <Button
+                        android:id="@+id/careportal_exercise"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_exercise"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_exercise"
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
 
-                <Button
-                    android:id="@+id/careportal_combobolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_bolus_correction"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_combobolus"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="2" />
-
-                <Button
-                    android:id="@+id/careportal_tempbasalstart"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_basal_start"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_tempbasalstart"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="2" />
-
-                <Button
-                    android:id="@+id/careportal_tempbasalend"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_basal_end"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_tempbasalend"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="3" />
-
-            </android.support.v7.widget.GridLayout>
+                    <Button
+                        android:id="@+id/careportal_temporarytarget"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_cgm_target"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_temporarytarget"
+                        app:layout_column="2"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
 
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="15dp"
-                android:text="@string/careportal_cgm_label" />
-
-            <android.support.v7.widget.GridLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:padding="10dip"
-                app:columnCount="3">
-
-                <Button
-                    android:id="@+id/careportal_cgmsensorstart"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_start"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_cgmsensorstart"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+                </android.support.v7.widget.GridLayout>
 
 
-                <Button
-                    android:id="@+id/careportal_cgmsensorinsert"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_insert"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_cgmsensorinsert"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="15dp"
+                    android:text="@string/careportal_carbsandbolus_label" />
+
+                <android.support.v7.widget.GridLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:padding="10dip"
+                    app:columnCount="3">
+
+                    <Button
+                        android:id="@+id/careportal_snackbolus"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_bolus_snack"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_snackbolus"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
+
+                    <Button
+                        android:id="@+id/careportal_mealbolus"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_bolus_meal"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_mealbolus"
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
+
+                    <Button
+                        android:id="@+id/careportal_correctionbolus"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_bolus_correction"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_correctionbolus"
+                        app:layout_column="2"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
+
+                    <Button
+                        android:id="@+id/careportal_carbscorrection"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_carbscorrection"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="2" />
+
+                    <Button
+                        android:id="@+id/careportal_combobolus"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_bolus_correction"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_combobolus"
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="2" />
+
+                    <Button
+                        android:id="@+id/careportal_tempbasalstart"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_basal_start"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_tempbasalstart"
+                        app:layout_column="2"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="2" />
+
+                    <Button
+                        android:id="@+id/careportal_tempbasalend"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_basal_end"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_tempbasalend"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="3" />
+
+                </android.support.v7.widget.GridLayout>
 
 
-                <Button
-                    android:id="@+id/careportal_openapsoffline"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_aaps_offline"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_openapsoffline"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="15dp"
+                    android:text="@string/careportal_cgm_label" />
+
+                <android.support.v7.widget.GridLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:padding="10dip"
+                    app:columnCount="3">
+
+                    <Button
+                        android:id="@+id/careportal_cgmsensorstart"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_cgm_start"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_cgmsensorstart"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
 
 
-                <Button
-                    android:id="@+id/careportal_announcement"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_announcement"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_announcement"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="4" />
-
-                <Button
-                    android:id="@+id/careportal_question"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_question"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_question"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="4" />
-
-                <Button
-                    android:id="@+id/careportal_note"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_note"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_note"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="4" />
-            </android.support.v7.widget.GridLayout>
+                    <Button
+                        android:id="@+id/careportal_cgmsensorinsert"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_cgm_insert"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_cgmsensorinsert"
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
 
 
-            <TextView
-                android:id="@+id/textView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="15dp"
-                android:text="@string/careportal_pump_label" />
-
-            <android.support.v7.widget.GridLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:padding="10dip"
-                app:columnCount="3">
-
-                <Button
-                    android:id="@+id/careportal_pumpsitechange"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_pump_canula"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_pumpsitechange"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="0" />
-
-                <Button
-                    android:id="@+id/careportal_insulincartridgechange"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_pump_cartridge"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_insulincartridgechange"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="0" />
-
-                <Button
-                    android:id="@+id/careportal_profileswitch"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_profile"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_profileswitch"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="0" />
+                    <Button
+                        android:id="@+id/careportal_openapsoffline"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_aaps_offline"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_openapsoffline"
+                        app:layout_column="2"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
 
 
-                <Button
-                    android:id="@+id/careportal_pumpbatterychange"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_pump_battery"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_pumpbatterychange"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="6" />
+                    <Button
+                        android:id="@+id/careportal_announcement"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_announcement"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_announcement"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="4" />
 
-            </android.support.v7.widget.GridLayout>
+                    <Button
+                        android:id="@+id/careportal_question"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_question"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_question"
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="4" />
+
+                    <Button
+                        android:id="@+id/careportal_note"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_note"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_note"
+                        app:layout_column="2"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="4" />
+                </android.support.v7.widget.GridLayout>
+
+
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="15dp"
+                    android:text="@string/careportal_pump_label" />
+
+                <android.support.v7.widget.GridLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:padding="10dip"
+                    app:columnCount="3">
+
+                    <Button
+                        android:id="@+id/careportal_pumpsitechange"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_pump_canula"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_pumpsitechange"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
+
+                    <Button
+                        android:id="@+id/careportal_insulincartridgechange"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_pump_cartridge"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_insulincartridgechange"
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
+
+                    <Button
+                        android:id="@+id/careportal_profileswitch"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_cgm_profile"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_profileswitch"
+                        app:layout_column="2"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
+
+
+                    <Button
+                        android:id="@+id/careportal_pumpbatterychange"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:drawableTop="@drawable/icon_cp_pump_battery"
+                        android:paddingLeft="0dp"
+                        android:paddingRight="0dp"
+                        android:text="@string/careportal_pumpbatterychange"
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="6" />
+
+                </android.support.v7.widget.GridLayout>
+
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 </FrameLayout>

From 1417410dbb2c051cbce37e041391f5cbd68e1072 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 27 Aug 2017 11:53:36 +0200
Subject: [PATCH 12/53] add WakeLock#isHeld()

---
 app/src/main/java/info/nightscout/androidaps/MainActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 528cbd21bd..b9bdc1c17d 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -206,7 +206,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     @Override
     public void onDestroy() {
         if (mWakeLock != null)
-            mWakeLock.release();
+            if (mWakeLock.isHeld())
+                mWakeLock.release();
         super.onDestroy();
     }
 

From 03bf1abdd4442892952e146c83357feaab0e877a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 27 Aug 2017 11:57:06 +0200
Subject: [PATCH 13/53] add WakeLock#isHeld()

---
 .../main/java/info/nightscout/androidaps/MainActivity.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index b9bdc1c17d..2cb501b99a 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -95,9 +95,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         if (ev.lock) {
             mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "AAPS");
-            mWakeLock.acquire();
+            if (!mWakeLock.isHeld())
+                mWakeLock.acquire();
         } else {
-            if (mWakeLock != null)
+            if (mWakeLock != null && mWakeLock.isHeld())
                 mWakeLock.release();
         }
     }

From 034faa4f6e09036a1f458008c3192d49fda2af28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karri=20Niemel=C3=A4?= <kakoni@Karris-MacBook-Pro.local>
Date: Tue, 29 Aug 2017 15:06:53 +0300
Subject: [PATCH 14/53] Adding support out_units

---
 .../plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java      | 6 ++++++
 .../plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java        | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
index 66696ac9b8..7833dbf54e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.util.Date;
 
 import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
@@ -224,6 +225,11 @@ public class DetermineBasalAdapterAMAJS {
         mProfile.add("temptargetSet", tempTargetSet);
         mProfile.add("autosens_adjust_targets", SP.getBoolean("openapsama_autosens_adjusttargets", true));
         mProfile.add("min_5m_carbimpact", SP.getDouble("openapsama_min_5m_carbimpact", 3d));
+
+        if (units.equals(Constants.MMOL)) {
+            mProfile.add("out_units", "mmol/L");
+        }
+        
         mV8rt.add(PARAM_profile, mProfile);
 
         mCurrentTemp = new V8Object(mV8rt);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
index dc4d2ee70d..a03ef9731b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 
 import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
@@ -242,6 +243,11 @@ public class DetermineBasalAdapterMAJS {
         mProfile.add("sens", Profile.toMgdl(profile.getIsf().doubleValue(), units));
 
         mProfile.add("current_basal", pump.getBaseBasalRate());
+
+        if (units.equals(Constants.MMOL)) {
+            mProfile.add("out_units", "mmol/L");
+        }
+
         mCurrentTemp.add("duration", MainApp.getConfigBuilder().getTempBasalRemainingMinutesFromHistory());
         mCurrentTemp.add("rate", MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory());
 

From 981a96aa16330403c76a720286c90f241badfb6b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 29 Aug 2017 17:59:46 +0200
Subject: [PATCH 15/53] ConfigBuilder layout

---
 .../ConfigBuilder/ConfigBuilderFragment.java  |  45 +---
 .../res/layout/configbuilder_fragment.xml     | 248 +++++++++---------
 .../res/layout/configbuilder_simpleitem.xml   |  59 ++---
 .../res/layout/configbuilder_smallitem.xml    |  48 ----
 app/src/main/res/values-cs/strings.xml        |   2 +-
 app/src/main/res/values/colors.xml            |   1 +
 6 files changed, 171 insertions(+), 232 deletions(-)
 delete mode 100644 app/src/main/res/layout/configbuilder_smallitem.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
index be9341b860..3f2c27ef08 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.ConfigBuilder;
 
 
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.DisplayMetrics;
@@ -58,8 +57,6 @@ public class ConfigBuilderFragment extends Fragment {
     TextView pumpLabel;
     ListView loopListView;
     TextView loopLabel;
-    ListView treatmentsListView;
-    TextView treatmentsLabel;
     ListView profileListView;
     TextView profileLabel;
     ListView apsListView;
@@ -76,27 +73,16 @@ public class ConfigBuilderFragment extends Fragment {
     PluginCustomAdapter bgsourceDataAdapter = null;
     PluginCustomAdapter pumpDataAdapter = null;
     PluginCustomAdapter loopDataAdapter = null;
-    PluginCustomAdapter treatmentsDataAdapter = null;
     PluginCustomAdapter profileDataAdapter = null;
     PluginCustomAdapter apsDataAdapter = null;
     PluginCustomAdapter constraintsDataAdapter = null;
     PluginCustomAdapter generalDataAdapter = null;
 
-    boolean smallWidth;
-
-    // TODO: sorting
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.configbuilder_fragment, container, false);
 
-        //check screen width
-        final DisplayMetrics dm = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
-        int screen_width = dm.widthPixels;
-        smallWidth = screen_width < Constants.SMALL_WIDTH;
-
         insulinListView = (ListView) view.findViewById(R.id.configbuilder_insulinlistview);
         sensitivityListView = (ListView) view.findViewById(R.id.configbuilder_sensitivitylistview);
         bgsourceListView = (ListView) view.findViewById(R.id.configbuilder_bgsourcelistview);
@@ -105,8 +91,6 @@ public class ConfigBuilderFragment extends Fragment {
         pumpLabel = (TextView) view.findViewById(R.id.configbuilder_pumplabel);
         loopListView = (ListView) view.findViewById(R.id.configbuilder_looplistview);
         loopLabel = (TextView) view.findViewById(R.id.configbuilder_looplabel);
-        treatmentsListView = (ListView) view.findViewById(R.id.configbuilder_treatmentslistview);
-        treatmentsLabel = (TextView) view.findViewById(R.id.configbuilder_treatmentslabel);
         profileListView = (ListView) view.findViewById(R.id.configbuilder_profilelistview);
         profileLabel = (TextView) view.findViewById(R.id.configbuilder_profilelabel);
         apsListView = (ListView) view.findViewById(R.id.configbuilder_apslistview);
@@ -141,48 +125,43 @@ public class ConfigBuilderFragment extends Fragment {
     }
 
     void setViews() {
-        insulinDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(InsulinInterface.class, PluginBase.INSULIN), PluginBase.INSULIN);
+        insulinDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(InsulinInterface.class, PluginBase.INSULIN), PluginBase.INSULIN);
         insulinListView.setAdapter(insulinDataAdapter);
         setListViewHeightBasedOnChildren(insulinListView);
-        bgsourceDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(BgSourceInterface.class, PluginBase.BGSOURCE), PluginBase.BGSOURCE);
+        bgsourceDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(BgSourceInterface.class, PluginBase.BGSOURCE), PluginBase.BGSOURCE);
         bgsourceListView.setAdapter(bgsourceDataAdapter);
         if (MainApp.getSpecificPluginsVisibleInList(PluginBase.BGSOURCE).size() == 0)
             bgsourceLabel.setVisibility(View.GONE);
         setListViewHeightBasedOnChildren(bgsourceListView);
-        pumpDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.PUMP), PluginBase.PUMP);
+        pumpDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.PUMP), PluginBase.PUMP);
         pumpListView.setAdapter(pumpDataAdapter);
         if (MainApp.getSpecificPluginsVisibleInList(PluginBase.PUMP).size() == 0)
             pumpLabel.setVisibility(View.GONE);
         setListViewHeightBasedOnChildren(pumpListView);
-        loopDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.LOOP), PluginBase.LOOP);
+        loopDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.LOOP), PluginBase.LOOP);
         loopListView.setAdapter(loopDataAdapter);
         setListViewHeightBasedOnChildren(loopListView);
         if (MainApp.getSpecificPluginsVisibleInList(PluginBase.LOOP).size() == 0)
             loopLabel.setVisibility(View.GONE);
-        treatmentsDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.TREATMENT), PluginBase.TREATMENT);
-        treatmentsListView.setAdapter(treatmentsDataAdapter);
-        if (MainApp.getSpecificPluginsVisibleInList(PluginBase.TREATMENT).size() == 0)
-            treatmentsLabel.setVisibility(View.GONE);
-        setListViewHeightBasedOnChildren(treatmentsListView);
-        profileDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(ProfileInterface.class, PluginBase.PROFILE), PluginBase.PROFILE);
+        profileDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(ProfileInterface.class, PluginBase.PROFILE), PluginBase.PROFILE);
         profileListView.setAdapter(profileDataAdapter);
         if (MainApp.getSpecificPluginsVisibleInList(PluginBase.PROFILE).size() == 0)
             profileLabel.setVisibility(View.GONE);
         setListViewHeightBasedOnChildren(profileListView);
-        apsDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.APS), PluginBase.APS);
+        apsDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.APS), PluginBase.APS);
         apsListView.setAdapter(apsDataAdapter);
         setListViewHeightBasedOnChildren(apsListView);
         if (MainApp.getSpecificPluginsVisibleInList(PluginBase.APS).size() == 0)
             apsLabel.setVisibility(View.GONE);
-        sensivityDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(SensitivityInterface.class, PluginBase.SENSITIVITY), PluginBase.SENSITIVITY);
+        sensivityDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(SensitivityInterface.class, PluginBase.SENSITIVITY), PluginBase.SENSITIVITY);
         sensitivityListView.setAdapter(sensivityDataAdapter);
         setListViewHeightBasedOnChildren(sensitivityListView);
-        constraintsDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface.class, PluginBase.CONSTRAINTS), PluginBase.CONSTRAINTS);
+        constraintsDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface.class, PluginBase.CONSTRAINTS), PluginBase.CONSTRAINTS);
         constraintsListView.setAdapter(constraintsDataAdapter);
         setListViewHeightBasedOnChildren(constraintsListView);
         if (MainApp.getSpecificPluginsVisibleInList(PluginBase.CONSTRAINTS).size() == 0)
             constraintsLabel.setVisibility(View.GONE);
-        generalDataAdapter = new PluginCustomAdapter(getContext(), smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.GENERAL), PluginBase.GENERAL);
+        generalDataAdapter = new PluginCustomAdapter(getContext(), R.layout.configbuilder_simpleitem, MainApp.getSpecificPluginsVisibleInList(PluginBase.GENERAL), PluginBase.GENERAL);
         generalListView.setAdapter(generalDataAdapter);
         setListViewHeightBasedOnChildren(generalListView);
 
@@ -217,7 +196,7 @@ public class ConfigBuilderFragment extends Fragment {
             PluginViewHolder holder = null;
 
             if (view == null) {
-                view = LayoutInflater.from(parent.getContext()).inflate(smallWidth?R.layout.configbuilder_smallitem :R.layout.configbuilder_simpleitem, null);
+                view = LayoutInflater.from(parent.getContext()).inflate(R.layout.configbuilder_simpleitem, null);
 
                 holder = new PluginViewHolder();
                 holder.name = (TextView) view.findViewById(R.id.configbuilder_simpleitem_name);
@@ -307,6 +286,10 @@ public class ConfigBuilderFragment extends Fragment {
                 }
             }
 
+            if (plugin.isEnabled(type)) {
+                view.setBackgroundColor(MainApp.sResources.getColor(R.color.configBuilderSelectedBackground));
+            }
+
             return view;
 
         }
diff --git a/app/src/main/res/layout/configbuilder_fragment.xml b/app/src/main/res/layout/configbuilder_fragment.xml
index 02aaeb78af..881afb9f80 100644
--- a/app/src/main/res/layout/configbuilder_fragment.xml
+++ b/app/src/main/res/layout/configbuilder_fragment.xml
@@ -25,173 +25,177 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_insulin"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <ListView
-                    android:id="@+id/configbuilder_insulinlistview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@color/cardColorBackground" />
-
-                <TextView
-                    android:id="@+id/configbuilder_bgsourcelabel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_bgsource"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <ListView
-                    android:id="@+id/configbuilder_bgsourcelistview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@color/cardColorBackground" />
-
-
-                <TextView
-                    android:id="@+id/configbuilder_pumplabel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_pump"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <ListView
-                    android:id="@+id/configbuilder_pumplistview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@color/cardColorBackground" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_sensitivity"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <ListView
-                    android:id="@+id/configbuilder_sensitivitylistview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@color/cardColorBackground" />
-
-                <TextView
-                    android:id="@+id/configbuilder_apslabel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_aps"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <ListView
-                    android:id="@+id/configbuilder_apslistview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@color/cardColorBackground" />
-
-
-                <TextView
-                    android:id="@+id/configbuilder_looplabel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_loop"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <ListView
-                    android:id="@+id/configbuilder_looplistview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@color/cardColorBackground" />
-
                 <TextView
                     android:id="@+id/configbuilder_profilelabel"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
                     android:text="@string/configbuilder_profile"
+                    android:textAllCaps="true"
                     android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
                     android:textStyle="bold" />
 
                 <ListView
                     android:id="@+id/configbuilder_profilelistview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
                     android:background="@color/cardColorBackground" />
 
                 <TextView
-                    android:id="@+id/configbuilder_treatmentslabel"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/configbuilder_insulinlabel"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="@string/configbuilder_treatments"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
+                    android:text="@string/configbuilder_insulin"
+                    android:textAllCaps="true"
                     android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
                     android:textStyle="bold" />
 
                 <ListView
-                    android:id="@+id/configbuilder_treatmentslistview"
+                    android:id="@+id/configbuilder_insulinlistview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/cardColorBackground" />
+
+                <TextView
+                    android:id="@+id/configbuilder_bgsourcelabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
+                    android:text="@string/configbuilder_bgsource"
+                    android:textAllCaps="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold" />
+
+                <ListView
+                    android:id="@+id/configbuilder_bgsourcelistview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/cardColorBackground" />
+
+
+                <TextView
+                    android:id="@+id/configbuilder_pumplabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
+                    android:text="@string/configbuilder_pump"
+                    android:textAllCaps="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold" />
+
+                 <ListView
+                    android:id="@+id/configbuilder_pumplistview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/cardColorBackground" />
+
+                <TextView
+                    android:id="@+id/configbuilder_sensitivitylabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
+                    android:text="@string/configbuilder_sensitivity"
+                    android:textAllCaps="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold" />
+
+                 <ListView
+                    android:id="@+id/configbuilder_sensitivitylistview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/cardColorBackground" />
+
+                <TextView
+                    android:id="@+id/configbuilder_apslabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
+                    android:text="@string/configbuilder_aps"
+                    android:textAllCaps="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold" />
+
+                 <ListView
+                    android:id="@+id/configbuilder_apslistview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/cardColorBackground" />
+
+
+                <TextView
+                    android:id="@+id/configbuilder_looplabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
+                    android:text="@string/configbuilder_loop"
+                    android:textAllCaps="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold" />
+
+                 <ListView
+                    android:id="@+id/configbuilder_looplistview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
                     android:background="@color/cardColorBackground" />
 
                 <TextView
                     android:id="@+id/configbuilder_constraintslabel"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
                     android:text="@string/configbuilder_constraints"
+                    android:textAllCaps="true"
                     android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
                     android:textStyle="bold" />
 
-                <ListView
+                 <ListView
                     android:id="@+id/configbuilder_constraintslistview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
                     android:background="@color/cardColorBackground" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:id="@+id/configbuilder_generallabel"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/mdtp_circle_color"
+                    android:paddingLeft="5dp"
                     android:text="@string/configbuilder_general"
+                    android:textAllCaps="true"
                     android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/black"
                     android:textStyle="bold" />
 
                 <ListView
                     android:id="@+id/configbuilder_generallistview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
                     android:background="@color/cardColorBackground" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/configbuilder_simpleitem.xml b/app/src/main/res/layout/configbuilder_simpleitem.xml
index 5adac7e03b..ea3775a5d0 100644
--- a/app/src/main/res/layout/configbuilder_simpleitem.xml
+++ b/app/src/main/res/layout/configbuilder_simpleitem.xml
@@ -3,41 +3,40 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <CheckBox
-        android:id="@+id/configbuilder_simpleitem_checkboxenabled"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
-        android:text="@string/enabled" />
-
-    <CheckBox
-        android:id="@+id/configbuilder_simpleitem_checkboxvisible"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
-        android:text="@string/visible" />
-
-    <ImageView
-        android:id="@+id/configbuilder_simpleitem_upimage"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:src="@android:drawable/arrow_up_float"
-        android:contentDescription="@string/up" />
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/configbuilder_simpleitem_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text=""
-        android:textStyle="bold" />
+        android:layout_gravity="left"
+        android:layout_marginLeft="5dp"
+        android:layout_weight="1"
+        android:text="ConfigBuilder plugin text" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="end"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/configbuilder_simpleitem_checkboxenabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:text="@string/enabled" />
+
+        <CheckBox
+            android:id="@+id/configbuilder_simpleitem_checkboxvisible"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="5dp"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:text="@string/visible" />
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/configbuilder_smallitem.xml b/app/src/main/res/layout/configbuilder_smallitem.xml
deleted file mode 100644
index 63b1b2c20f..0000000000
--- a/app/src/main/res/layout/configbuilder_smallitem.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/configbuilder_simpleitem_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text=""
-        android:textStyle="bold" />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <CheckBox
-            android:id="@+id/configbuilder_simpleitem_checkboxenabled"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:text="@string/enabled" />
-
-        <CheckBox
-            android:id="@+id/configbuilder_simpleitem_checkboxvisible"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:text="@string/visible" />
-
-        <ImageView
-            android:id="@+id/configbuilder_simpleitem_upimage"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:src="@android:drawable/arrow_up_float"
-            android:contentDescription="@string/up" />
-
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e656d0053d..20a54298c2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -607,7 +607,7 @@
     <string name="ru_lang">Ruština</string>
     <string name="sensitivity_warning">Při zapnuté detektci sensitivity nezapomeňte vkládat všechny sacharidy. Jinak budou odchylky mylně vyhodnocovány jako změna sensitivity !!</string>
     <string name="sensitivityaaps">Sensitivita AAPS</string>
-    <string name="sensitivityoref0">Sensotivita Oref0</string>
+    <string name="sensitivityoref0">Sensitivita Oref0</string>
     <string name="sensitivityweightedaverage">Sensitivita vážený průměr</string>
     <string name="openaps">OpenAPS</string>
     <string name="openaps_short">OAPS</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5b1d364563..cb9206a4c7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,6 +34,7 @@
     <color name="cardObjectiveText">#779ECB</color>
 
     <color name="linearBlockBackground">#3e3d3d</color>
+    <color name="configBuilderSelectedBackground">#262525</color>
 
     <color name="colorAcceptTempButton">#f4d700</color>
     <color name="colorTreatmentButton">#67dfe8</color>

From 7dfe77dc9ccdd404d6e4fb08b51ebf1ead15fc6f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 29 Aug 2017 19:47:32 +0200
Subject: [PATCH 16/53] single line in configbuilder

---
 .../res/layout/configbuilder_simpleitem.xml   | 43 +++++++------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/configbuilder_simpleitem.xml b/app/src/main/res/layout/configbuilder_simpleitem.xml
index ea3775a5d0..806ae3ea98 100644
--- a/app/src/main/res/layout/configbuilder_simpleitem.xml
+++ b/app/src/main/res/layout/configbuilder_simpleitem.xml
@@ -3,40 +3,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="horizontal">
+
+    <CheckBox
+        android:id="@+id/configbuilder_simpleitem_checkboxenabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:gravity="center_vertical" />
 
     <TextView
         android:id="@+id/configbuilder_simpleitem_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left"
-        android:layout_marginLeft="5dp"
         android:layout_weight="1"
         android:text="ConfigBuilder plugin text" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-        <CheckBox
-            android:id="@+id/configbuilder_simpleitem_checkboxenabled"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:text="@string/enabled" />
-
-        <CheckBox
-            android:id="@+id/configbuilder_simpleitem_checkboxvisible"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="5dp"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:text="@string/visible" />
-    </LinearLayout>
+    <CheckBox
+        android:id="@+id/configbuilder_simpleitem_checkboxvisible"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:focusable="false"
+        android:focusableInTouchMode="false" />
 
 </LinearLayout>

From 7da8b2de5c9321b7dcb7d0ea290557d6f78d6233 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 29 Aug 2017 21:40:06 +0200
Subject: [PATCH 17/53] visibility icon

---
 .../res/drawable/visibility_black_16x16.png   | Bin 0 -> 233 bytes
 .../res/layout/configbuilder_fragment.xml     |  39 +++++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/visibility_black_16x16.png

diff --git a/app/src/main/res/drawable/visibility_black_16x16.png b/app/src/main/res/drawable/visibility_black_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d24867dcdf25e7cf90ddd1c90d999359b2410d3f
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6Hh8)?hG>ZHJ?QP_#K^#UA$dlw
z!^Ox823=u7mli2?D4ek4o@lVxlkb*Op!5sVugwxwpJxi2Kd{WX*vTHBmS%U?dRyZ8
zxvdf}D@{bW&9km$#kuTRrESXN@+D+#OsB+3>);<3ubGGyCcZqdzC(^nkoA{R+PCr}
z`&qTT99=b&UIrZraE^X>d*!swj$-ZI^IUjLrbgX!DG6PBwdBmvi2Iv6XY3B!`tZbB
h{@~#ER(!eV<zIdAHQM)#-2~`%22WQ%mvv4FO#rC+T&n;8

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/configbuilder_fragment.xml b/app/src/main/res/layout/configbuilder_fragment.xml
index 881afb9f80..1af5f05eff 100644
--- a/app/src/main/res/layout/configbuilder_fragment.xml
+++ b/app/src/main/res/layout/configbuilder_fragment.xml
@@ -1,4 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -25,18 +26,34 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/configbuilder_profilelabel"
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:background="@color/mdtp_circle_color"
-                    android:paddingLeft="5dp"
-                    android:text="@string/configbuilder_profile"
-                    android:textAllCaps="true"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@android:color/black"
-                    android:textStyle="bold" />
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/configbuilder_profilelabel"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_weight="1"
+                        android:background="@color/mdtp_circle_color"
+                        android:paddingLeft="5dp"
+                        android:text="@string/configbuilder_profile"
+                        android:textAllCaps="true"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@android:color/black"
+                        android:textStyle="bold" />
+
+                    <ImageView
+                        android:id="@+id/imageView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="false"
+                        android:layout_alignParentRight="true"
+                        android:layout_weight="1"
+                        android:paddingRight="10dp"
+                        app:srcCompat="@drawable/visibility_black_16x16" />
+                </RelativeLayout>
 
                 <ListView
                     android:id="@+id/configbuilder_profilelistview"

From e1c407466323afd3d08ea84e3752643471182af7 Mon Sep 17 00:00:00 2001
From: Radoslav Radev <radoslav.radev@gmail.com>
Date: Thu, 31 Aug 2017 09:09:26 +0300
Subject: [PATCH 18/53] Update strings.xml

---
 app/src/main/res/values-bg/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 84ae6eaf3b..4234a55d4f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -91,7 +91,7 @@
     <string name="configbuilder_treatments">Treatments</string>
     <string name="configbuilder_tempbasals">Временен базал</string>
     <string name="configbuilder_profile">Профил</string>
-    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_aps">Алгоритъм за APS</string>
     <string name="configbuilder_general">Общи</string>
     <string name="days">дни</string>
     <string name="objectives_minimalduration">Минимална продължителност</string>
@@ -355,8 +355,8 @@
     <string name="units">Единици:</string>
     <string name="mgdl">мг/дл</string>
     <string name="mmol">ммол/л</string>
-    <string name="dia">DIA(време на действие на инсулина):</string>
-    <string name="target_range">Целеви диапазон:</string>
+    <string name="dia">DIA:</string>
+    <string name="target_range">Целева КЗ:</string>
     <string name="edit_base_basal">Редактирай базални стойности</string>
     <string name="edit_base_isf">Редактирай Инс. чувствителност</string>
     <string name="edit_base_ic">Редактирай Инс./ВХ</string>
@@ -540,7 +540,7 @@
     <string name="fastactinginsulin">Бързодействащ инсулин</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="insulin_shortname">ИНС</string>
-    <string name="fastactinginsulinprolonged">Бързодействащ инсулин с удължаване</string>
+    <string name="fastactinginsulinprolonged">Бързодействащ инсулин с удължение</string>
     <string name="enablesuperbolus">Разреши използването на Суперболус</string>
     <string name="enablesuperbolus_summary">Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН.</string>
     <string name="iob">IOB</string>
@@ -639,7 +639,7 @@
     <string name="careportal_pump_label">ПОМПА</string>
     <string name="date">Дата</string>
     <string name="dia_too_short" formatted="false">DIA от %s е твърде кратка - използвай %s вместо това!</string>
-    <string name="free_peak_oref">със свободен пик по Oref</string>
+    <string name="free_peak_oref">Със свободен пик по Oref</string>
     <string name="insulin_oref_peak">Пик на кривата на IOB</string>
     <string name="insulin_peak_time">Време на пик [мин.]</string>
     <string name="invalid">НЕВАЛИДНО</string>

From c312b51fcf83ab7be1aeb159e5b959ab189644a2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 31 Aug 2017 19:32:28 +0200
Subject: [PATCH 19/53] consolidate DanaR fragments

---
 .../info/nightscout/androidaps/MainApp.java   |  12 +-
 .../plugins/PumpDanaR/DanaRFragment.java      |  29 +-
 .../plugins/PumpDanaR/DanaRPlugin.java        |   8 +
 .../PumpDanaRKorean/DanaRKoreanFragment.java  | 248 -----------------
 .../PumpDanaRKorean/DanaRKoreanPlugin.java    |  15 +-
 .../plugins/PumpDanaRv2/DanaRv2Fragment.java  | 250 ------------------
 .../plugins/PumpDanaRv2/DanaRv2Plugin.java    |  17 +-
 7 files changed, 53 insertions(+), 526 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 338b5f2e07..3431bfd39c 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -47,11 +47,11 @@ import info.nightscout.androidaps.plugins.ProfileCircadianPercentage.CircadianPe
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfileFragment;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfileFragment;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfileFragment;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
+import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.services.DanaRExecutionService;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanFragment;
+import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.services.DanaRKoreanExecutionService;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Fragment;
+import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.plugins.PumpMDI.MDIPlugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
@@ -120,9 +120,9 @@ public class MainApp extends Application {
             pluginsList.add(SensitivityOref0Plugin.getPlugin());
             pluginsList.add(SensitivityAAPSPlugin.getPlugin());
             pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
-            if (Config.DANAR) pluginsList.add(DanaRFragment.getPlugin());
-            if (Config.DANAR) pluginsList.add(DanaRKoreanFragment.getPlugin());
-            if (Config.DANARv2) pluginsList.add(DanaRv2Fragment.getPlugin());
+            if (Config.DANAR) pluginsList.add(DanaRPlugin.getPlugin());
+            if (Config.DANAR) pluginsList.add(DanaRKoreanPlugin.getPlugin());
+            if (Config.DANARv2) pluginsList.add(DanaRv2Plugin.getPlugin());
             pluginsList.add(CareportalFragment.getPlugin());
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
             if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getInstance());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
index 87c635cbef..f392485f4b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
@@ -39,15 +39,6 @@ import info.nightscout.utils.SetWarnColor;
 public class DanaRFragment extends SubscriberFragment {
     private static Logger log = LoggerFactory.getLogger(DanaRFragment.class);
 
-    private static DanaRPlugin danaRPlugin;
-
-    public static DanaRPlugin getPlugin() {
-        if (danaRPlugin == null) {
-            danaRPlugin = new DanaRPlugin();
-        }
-        return danaRPlugin;
-    }
-
     private static Handler sHandler;
     private static HandlerThread sHandlerThread;
 
@@ -146,7 +137,7 @@ public class DanaRFragment extends SubscriberFragment {
                 sHandler.post(new Runnable() {
                                   @Override
                                   public void run() {
-                                      DanaRPlugin.sExecutionService.connect("Connect request from GUI");
+                                      MainApp.getConfigBuilder().refreshDataFromPump("Connect request from GUI");
                                   }
                               }
                 );
@@ -218,11 +209,21 @@ public class DanaRFragment extends SubscriberFragment {
 
                     dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
                     SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
-                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(getPlugin().getBaseBasalRate()) + " U/h");
-                    if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
-                        tempBasalView.setText(MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
+                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getBaseBasalRate()) + " U/h");
+                    // DanaRPlugin, DanaRKoreanPlugin
+                    if (MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) {
+                        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
+                            tempBasalView.setText(MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
+                        } else {
+                            tempBasalView.setText("");
+                        }
                     } else {
-                        tempBasalView.setText("");
+                        // v2 plugin
+                        if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
+                            tempBasalView.setText(MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
+                        } else {
+                            tempBasalView.setText("");
+                        }
                     }
                     if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
                         extendedBolusView.setText(MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
index bc5b23ad92..f4343c1629 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
@@ -69,6 +69,14 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
     private static DanaRPump pump = DanaRPump.getInstance();
     private static boolean useExtendedBoluses = false;
 
+    private static DanaRPlugin plugin = null;
+
+    public static DanaRPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new DanaRPlugin();
+        return plugin;
+    }
+
     public static PumpDescription pumpDescription = new PumpDescription();
 
     public DanaRPlugin() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
deleted file mode 100644
index 50ec8883c6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean;
-
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.squareup.otto.Subscribe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.events.EventTempBasalChange;
-import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRStatsActivity;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SetWarnColor;
-
-public class DanaRKoreanFragment extends SubscriberFragment {
-    private static Logger log = LoggerFactory.getLogger(DanaRKoreanFragment.class);
-
-    private static DanaRKoreanPlugin danaRKoreanPlugin = new DanaRKoreanPlugin();
-
-    public static DanaRKoreanPlugin getPlugin() {
-        return danaRKoreanPlugin;
-    }
-
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
-
-    private Handler loopHandler = new Handler();
-    private Runnable refreshLoop = null;
-
-    TextView lastConnectionView;
-    TextView btConnectionView;
-    TextView lastBolusView;
-    TextView dailyUnitsView;
-    TextView basaBasalRateView;
-    TextView tempBasalView;
-    TextView extendedBolusView;
-    TextView batteryView;
-    TextView reservoirView;
-    TextView iobView;
-    TextView firmwareView;
-    TextView basalStepView;
-    TextView bolusStepView;
-    Button viewProfileButton;
-    Button historyButton;
-    Button statsButton;
-
-
-    public DanaRKoreanFragment() {
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(DanaRKoreanFragment.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (refreshLoop == null) {
-            refreshLoop = new Runnable() {
-                @Override
-                public void run() {
-                    updateGUI();
-                    loopHandler.postDelayed(refreshLoop, 60 * 1000L);
-                }
-            };
-            loopHandler.postDelayed(refreshLoop, 60 * 1000L);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.danar_fragment, container, false);
-        btConnectionView = (TextView) view.findViewById(R.id.danar_btconnection);
-        lastConnectionView = (TextView) view.findViewById(R.id.danar_lastconnection);
-        lastBolusView = (TextView) view.findViewById(R.id.danar_lastbolus);
-        dailyUnitsView = (TextView) view.findViewById(R.id.danar_dailyunits);
-        basaBasalRateView = (TextView) view.findViewById(R.id.danar_basabasalrate);
-        tempBasalView = (TextView) view.findViewById(R.id.danar_tempbasal);
-        extendedBolusView = (TextView) view.findViewById(R.id.danar_extendedbolus);
-        batteryView = (TextView) view.findViewById(R.id.danar_battery);
-        reservoirView = (TextView) view.findViewById(R.id.danar_reservoir);
-        iobView = (TextView) view.findViewById(R.id.danar_iob);
-        firmwareView = (TextView) view.findViewById(R.id.danar_firmware);
-        viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
-        historyButton = (Button) view.findViewById(R.id.danar_history);
-        statsButton = (Button) view.findViewById(R.id.danar_stats);
-        basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
-        bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
-
-
-        viewProfileButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                FragmentManager manager = getFragmentManager();
-                ProfileViewDialog profileViewDialog = new ProfileViewDialog();
-                profileViewDialog.show(manager, "ProfileViewDialog");
-            }
-        });
-
-        historyButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(getContext(), DanaRHistoryActivity.class));
-            }
-        });
-
-        statsButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(getContext(), DanaRStatsActivity.class));
-            }
-        });
-
-        btConnectionView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                sHandler.post(new Runnable() {
-                                  @Override
-                                  public void run() {
-                                      DanaRKoreanPlugin.sExecutionService.connect("Connect request from GUI");
-                                  }
-                              }
-                );
-            }
-        });
-
-        updateGUI();
-        return view;
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventPumpStatusChanged c) {
-        Activity activity = getActivity();
-        if (activity != null) {
-            activity.runOnUiThread(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            if (c.sStatus == EventPumpStatusChanged.CONNECTING)
-                                btConnectionView.setText("{fa-bluetooth-b spin} " + c.sSecondsElapsed + "s");
-                            else if (c.sStatus == EventPumpStatusChanged.CONNECTED)
-                                btConnectionView.setText("{fa-bluetooth}");
-                            else if (c.sStatus == EventPumpStatusChanged.DISCONNECTED)
-                                btConnectionView.setText("{fa-bluetooth-b}");
-                        }
-                    }
-            );
-        }
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventDanaRNewStatus s) {
-        updateGUI();
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventTempBasalChange s) {
-        updateGUI();
-    }
-
-   @Subscribe
-    public void onStatusEvent(final EventExtendedBolusChange s) {
-        updateGUI();
-    }
-
-    // GUI functions
-    @Override
-    protected void updateGUI() {
-
-        Activity activity = getActivity();
-        if (activity != null && basaBasalRateView != null)
-            activity.runOnUiThread(new Runnable() {
-                @SuppressLint("SetTextI18n")
-                @Override
-                public void run() {
-                    DanaRPump pump = DanaRPump.getInstance();
-                    if (pump.lastConnection.getTime() != 0) {
-                        Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
-                        int agoMin = (int) (agoMsec / 60d / 1000d);
-                        lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")");
-                        SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d);
-                    }
-//                    if (pump.lastBolusTime.getTime() != 0) {
-//                        Long agoMsec = System.currentTimeMillis() - pump.lastBolusTime.getTime();
-//                        double agoHours =  agoMsec / 60d / 60d / 1000d;
-//                        if (agoHours < 6) // max 6h back
-//                            lastBolusView.setText(formatTime.format(pump.lastBolusTime) + " (" + DecimalFormatter.to1Decimal(agoHours) + " " + getString(R.string.hoursago) + ") " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + " U");
-//                        else lastBolusView.setText("");
-//                    }
-
-                    dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
-                    SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
-                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(danaRKoreanPlugin.getBaseBasalRate()) + " U/h");
-                    if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
-                        tempBasalView.setText(MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
-                    } else {
-                        tempBasalView.setText("");
-                    }
-                    if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-                        extendedBolusView.setText(MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString());
-                    } else {
-                        extendedBolusView.setText("");
-                    }
-                    reservoirView.setText(DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + " / 300 U");
-                    SetWarnColor.setColorInverse(reservoirView, pump.reservoirRemainingUnits, 50d, 20d);
-                    batteryView.setText("{fa-battery-" + (pump.batteryRemaining / 25) + "}");
-                    SetWarnColor.setColorInverse(batteryView, pump.batteryRemaining, 51d, 26d);
-                    iobView.setText(pump.iob + " U");
-                    if (pump.isNewPump) {
-                        firmwareView.setText(String.format(MainApp.sResources.getString(R.string.danar_model), pump.model, pump.protocol, pump.productCode));
-                    } else {
-                        firmwareView.setText("OLD");
-                    }
-                    basalStepView.setText("" + pump.basalStep);
-                    bolusStepView.setText("" + pump.bolusStep);
-                }
-            });
-
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
index 354db54c48..e912eac0b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
@@ -23,6 +23,8 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
@@ -36,12 +38,11 @@ import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.plugins.Overview.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
+import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.utils.DateUtil;
@@ -57,7 +58,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
 
     @Override
     public String getFragmentClass() {
-        return DanaRKoreanFragment.class.getName();
+        return DanaRFragment.class.getName();
     }
 
     static boolean fragmentPumpEnabled = false;
@@ -70,6 +71,14 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
     private static DanaRPump pump = DanaRPump.getInstance();
     private static boolean useExtendedBoluses = false;
 
+    private static DanaRKoreanPlugin plugin = null;
+
+    public static DanaRKoreanPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new DanaRKoreanPlugin();
+        return plugin;
+    }
+
     public static PumpDescription pumpDescription = new PumpDescription();
 
     public DanaRKoreanPlugin() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java
deleted file mode 100644
index 85d9f4b5f2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2;
-
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.squareup.otto.Subscribe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.events.EventTempBasalChange;
-import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRStatsActivity;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SetWarnColor;
-
-public class DanaRv2Fragment extends SubscriberFragment {
-    private static Logger log = LoggerFactory.getLogger(DanaRv2Fragment.class);
-
-    private static DanaRv2Plugin danaRPlugin;
-
-    public static DanaRv2Plugin getPlugin() {
-        if (danaRPlugin == null) {
-            danaRPlugin = new DanaRv2Plugin();
-        }
-        return danaRPlugin;
-    }
-
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
-
-    private Handler loopHandler = new Handler();
-    private Runnable refreshLoop = null;
-
-    TextView lastConnectionView;
-    TextView btConnectionView;
-    TextView lastBolusView;
-    TextView dailyUnitsView;
-    TextView basaBasalRateView;
-    TextView tempBasalView;
-    TextView extendedBolusView;
-    TextView batteryView;
-    TextView reservoirView;
-    TextView iobView;
-    TextView firmwareView;
-    TextView basalStepView;
-    TextView bolusStepView;
-    Button viewProfileButton;
-    Button historyButton;
-    Button statsButton;
-
-
-    public DanaRv2Fragment() {
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(DanaRv2Fragment.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (refreshLoop == null) {
-            refreshLoop = new Runnable() {
-                @Override
-                public void run() {
-                    updateGUI();
-                    loopHandler.postDelayed(refreshLoop, 60 * 1000L);
-                }
-            };
-            loopHandler.postDelayed(refreshLoop, 60 * 1000L);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.danar_fragment, container, false);
-        btConnectionView = (TextView) view.findViewById(R.id.danar_btconnection);
-        lastConnectionView = (TextView) view.findViewById(R.id.danar_lastconnection);
-        lastBolusView = (TextView) view.findViewById(R.id.danar_lastbolus);
-        dailyUnitsView = (TextView) view.findViewById(R.id.danar_dailyunits);
-        basaBasalRateView = (TextView) view.findViewById(R.id.danar_basabasalrate);
-        tempBasalView = (TextView) view.findViewById(R.id.danar_tempbasal);
-        extendedBolusView = (TextView) view.findViewById(R.id.danar_extendedbolus);
-        batteryView = (TextView) view.findViewById(R.id.danar_battery);
-        reservoirView = (TextView) view.findViewById(R.id.danar_reservoir);
-        iobView = (TextView) view.findViewById(R.id.danar_iob);
-        firmwareView = (TextView) view.findViewById(R.id.danar_firmware);
-        viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
-        historyButton = (Button) view.findViewById(R.id.danar_history);
-        statsButton = (Button) view.findViewById(R.id.danar_stats);
-        basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
-        bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
-
-
-        viewProfileButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                FragmentManager manager = getFragmentManager();
-                ProfileViewDialog profileViewDialog = new ProfileViewDialog();
-                profileViewDialog.show(manager, "ProfileViewDialog");
-            }
-        });
-
-        historyButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(getContext(), DanaRHistoryActivity.class));
-            }
-        });
-
-        statsButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(getContext(), DanaRStatsActivity.class));
-            }
-        });
-
-        btConnectionView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                sHandler.post(new Runnable() {
-                                  @Override
-                                  public void run() {
-                                      DanaRv2Plugin.sExecutionService.connect("Connect request from GUI");
-                                  }
-                              }
-                );
-            }
-        });
-
-        updateGUI();
-        return view;
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventPumpStatusChanged c) {
-        Activity activity = getActivity();
-        if (activity != null) {
-            activity.runOnUiThread(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            if (c.sStatus == EventPumpStatusChanged.CONNECTING)
-                                btConnectionView.setText("{fa-bluetooth-b spin} " + c.sSecondsElapsed + "s");
-                            else if (c.sStatus == EventPumpStatusChanged.CONNECTED)
-                                btConnectionView.setText("{fa-bluetooth}");
-                            else if (c.sStatus == EventPumpStatusChanged.DISCONNECTED)
-                                btConnectionView.setText("{fa-bluetooth-b}");
-                        }
-                    }
-            );
-        }
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventDanaRNewStatus s) {
-        updateGUI();
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventTempBasalChange s) {
-        updateGUI();
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventExtendedBolusChange s) {
-        updateGUI();
-    }
-
-    // GUI functions
-    @Override
-    protected void updateGUI() {
-        Activity activity = getActivity();
-        if (activity != null && basaBasalRateView != null)
-            activity.runOnUiThread(new Runnable() {
-                @SuppressLint("SetTextI18n")
-                @Override
-                public void run() {
-                    DanaRPump pump = DanaRPump.getInstance();
-                    if (pump.lastConnection.getTime() != 0) {
-                        Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
-                        int agoMin = (int) (agoMsec / 60d / 1000d);
-                        lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")");
-                        SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d);
-                    }
-                    if (pump.lastBolusTime.getTime() != 0) {
-                        Long agoMsec = System.currentTimeMillis() - pump.lastBolusTime.getTime();
-                        double agoHours = agoMsec / 60d / 60d / 1000d;
-                        if (agoHours < 6) // max 6h back
-                            lastBolusView.setText(DateUtil.timeString(pump.lastBolusTime) + " (" + DecimalFormatter.to1Decimal(agoHours) + " " + MainApp.sResources.getString(R.string.hoursago) + ") " + DecimalFormatter.to2Decimal(DanaRPump.getInstance().lastBolusAmount) + " U");
-                        else lastBolusView.setText("");
-                    }
-
-                    dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
-                    SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
-                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(getPlugin().getBaseBasalRate()) + " U/h");
-                    if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
-                        tempBasalView.setText(MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
-                    } else {
-                        tempBasalView.setText("");
-                    }
-                    if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-                        extendedBolusView.setText(MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString());
-                    } else {
-                        extendedBolusView.setText("");
-                    }
-                    reservoirView.setText(DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + " / 300 U");
-                    SetWarnColor.setColorInverse(reservoirView, pump.reservoirRemainingUnits, 50d, 20d);
-                    batteryView.setText("{fa-battery-" + (pump.batteryRemaining / 25) + "}");
-                    SetWarnColor.setColorInverse(batteryView, pump.batteryRemaining, 51d, 26d);
-                    iobView.setText(pump.iob + " U");
-                    if (pump.isNewPump) {
-                        firmwareView.setText(String.format(MainApp.sResources.getString(R.string.danar_model), pump.model, pump.protocol, pump.productCode));
-                    } else {
-                        firmwareView.setText("OLD");
-                    }
-                    basalStepView.setText("" + pump.basalStep);
-                    bolusStepView.setText("" + pump.bolusStep);
-                }
-            });
-
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
index 6960e96b17..9ff9efeaf3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
@@ -4,9 +4,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
 import android.os.IBinder;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
@@ -25,6 +23,8 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
@@ -37,13 +37,12 @@ import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.Overview.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
+import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.utils.DateUtil;
@@ -58,7 +57,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
 
     @Override
     public String getFragmentClass() {
-        return DanaRv2Fragment.class.getName();
+        return DanaRFragment.class.getName();
     }
 
     static boolean fragmentPumpEnabled = false;
@@ -68,6 +67,14 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
     public static DanaRv2ExecutionService sExecutionService;
 
 
+    private static DanaRv2Plugin plugin = null;
+
+    public static DanaRv2Plugin getPlugin() {
+        if (plugin == null)
+            plugin = new DanaRv2Plugin();
+        return plugin;
+    }
+
     private static DanaRPump pump = DanaRPump.getInstance();
 
     public static PumpDescription pumpDescription = new PumpDescription();

From db952759e119540988a72a4f5b4d491f19aec485 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 31 Aug 2017 22:00:45 +0200
Subject: [PATCH 20/53] Insulin fragments consolidation

---
 .../info/nightscout/androidaps/MainApp.java   | 20 +++----
 .../androidaps/PreferencesActivity.java       |  2 +-
 .../ConfigBuilder/ConfigBuilderFragment.java  |  4 +-
 .../ActivityGraph.java                        |  2 +-
 .../InsulinFastactingPlugin.java              | 12 +++-
 .../InsulinFastactingProlongedPlugin.java     | 12 +++-
 .../InsulinFragment.java}                     | 18 ++----
 .../InsulinOrefBasePlugin.java                |  2 +-
 .../InsulinOrefFreePeakPlugin.java            | 12 +++-
 .../InsulinOrefRapidActingPlugin.java         | 12 +++-
 .../InsulinOrefUltraRapidActingPlugin.java    | 12 +++-
 .../InsulinFastactingProlongedFragment.java   | 57 ------------------
 .../InsulinOrefFreePeakFragment.java          | 58 -------------------
 .../InsulinOrefRapidActingFragment.java       | 57 ------------------
 .../InsulinOrefUltraRapidActingFragment.java  | 58 -------------------
 app/src/main/res/layout/insulin_fragment.xml  |  4 +-
 .../layout/overview_calibration_dialog.xml    |  2 +-
 .../overview_newextendedbolus_dialog.xml      |  2 +-
 .../layout/overview_newtempbasal_dialog.xml   |  2 +-
 19 files changed, 75 insertions(+), 273 deletions(-)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinFastacting => Insulin}/ActivityGraph.java (97%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinFastacting => Insulin}/InsulinFastactingPlugin.java (91%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinFastactingProlonged => Insulin}/InsulinFastactingProlongedPlugin.java (91%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinFastacting/InsulinFastactingFragment.java => Insulin/InsulinFragment.java} (67%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinOrefCurves => Insulin}/InsulinOrefBasePlugin.java (98%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinOrefCurves => Insulin}/InsulinOrefFreePeakPlugin.java (82%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinOrefCurves => Insulin}/InsulinOrefRapidActingPlugin.java (81%)
 rename app/src/main/java/info/nightscout/androidaps/plugins/{InsulinOrefCurves => Insulin}/InsulinOrefUltraRapidActingPlugin.java (81%)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakFragment.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingFragment.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingFragment.java

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 3431bfd39c..18727d87f0 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -30,11 +30,11 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesFragment;
 import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
-import info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment;
-import info.nightscout.androidaps.plugins.InsulinFastactingProlonged.InsulinFastactingProlongedFragment;
-import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefFreePeakFragment;
-import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefRapidActingFragment;
-import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefUltraRapidActingFragment;
+import info.nightscout.androidaps.plugins.Insulin.InsulinFastactingPlugin;
+import info.nightscout.androidaps.plugins.Insulin.InsulinFastactingProlongedPlugin;
+import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
+import info.nightscout.androidaps.plugins.Insulin.InsulinOrefRapidActingPlugin;
+import info.nightscout.androidaps.plugins.Insulin.InsulinOrefUltraRapidActingPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopFragment;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalFragment;
@@ -112,11 +112,11 @@ public class MainApp extends Application {
             pluginsList.add(OverviewFragment.getPlugin());
             pluginsList.add(IobCobCalculatorPlugin.getPlugin());
             if (Config.ACTION) pluginsList.add(ActionsFragment.getPlugin());
-            pluginsList.add(InsulinFastactingFragment.getPlugin());
-            pluginsList.add(InsulinFastactingProlongedFragment.getPlugin());
-            pluginsList.add(InsulinOrefRapidActingFragment.getPlugin());
-            pluginsList.add(InsulinOrefUltraRapidActingFragment.getPlugin());
-            pluginsList.add(InsulinOrefFreePeakFragment.getPlugin());
+            pluginsList.add(InsulinFastactingPlugin.getPlugin());
+            pluginsList.add(InsulinFastactingProlongedPlugin.getPlugin());
+            pluginsList.add(InsulinOrefRapidActingPlugin.getPlugin());
+            pluginsList.add(InsulinOrefUltraRapidActingPlugin.getPlugin());
+            pluginsList.add(InsulinOrefFreePeakPlugin.getPlugin());
             pluginsList.add(SensitivityOref0Plugin.getPlugin());
             pluginsList.add(SensitivityAAPSPlugin.getPlugin());
             pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
index 5c3372123e..c5abda1eae 100644
--- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
@@ -14,7 +14,7 @@ import android.preference.PreferenceManager;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefFreePeakPlugin;
+import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
index 3f2c27ef08..e79c1b06ba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
@@ -4,7 +4,6 @@ package info.nightscout.androidaps.plugins.ConfigBuilder;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,7 +20,6 @@ import com.crashlytics.android.answers.CustomEvent;
 
 import java.util.ArrayList;
 
-import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
@@ -34,7 +32,7 @@ import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.SensitivityInterface;
-import info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingPlugin;
+import info.nightscout.androidaps.plugins.Insulin.InsulinFastactingPlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.SensitivityOref0.SensitivityOref0Plugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/ActivityGraph.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/ActivityGraph.java
index 3eda06fb37..5a0d7fcce9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/ActivityGraph.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinFastacting;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import android.content.Context;
 import android.graphics.Color;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingPlugin.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingPlugin.java
index e055e3d3ed..3c7a7b950e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinFastacting;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
@@ -17,6 +17,14 @@ public class InsulinFastactingPlugin implements PluginBase, InsulinInterface {
     private static boolean fragmentEnabled = true;
     private static boolean fragmentVisible = false;
 
+    private static InsulinFastactingPlugin plugin = null;
+
+    public static InsulinFastactingPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new InsulinFastactingPlugin();
+        return plugin;
+    }
+
     @Override
     public int getType() {
         return INSULIN;
@@ -24,7 +32,7 @@ public class InsulinFastactingPlugin implements PluginBase, InsulinInterface {
 
     @Override
     public String getFragmentClass() {
-        return InsulinFastactingFragment.class.getName();
+        return InsulinFragment.class.getName();
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingProlongedPlugin.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingProlongedPlugin.java
index 3c5df052df..a9f95f0776 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingProlongedPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinFastactingProlonged;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
@@ -17,6 +17,14 @@ public class InsulinFastactingProlongedPlugin implements PluginBase, InsulinInte
     private static boolean fragmentEnabled = false;
     private static boolean fragmentVisible = false;
 
+    private static InsulinFastactingProlongedPlugin plugin = null;
+
+    public static InsulinFastactingProlongedPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new InsulinFastactingProlongedPlugin();
+        return plugin;
+    }
+
     @Override
     public int getType() {
         return INSULIN;
@@ -24,7 +32,7 @@ public class InsulinFastactingProlongedPlugin implements PluginBase, InsulinInte
 
     @Override
     public String getFragmentClass() {
-        return InsulinFastactingProlongedFragment.class.getName();
+        return InsulinFragment.class.getName();
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java
index f62d063193..7cd14f346c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinFastacting;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -14,13 +14,7 @@ import info.nightscout.androidaps.R;
  * Created by mike on 17.04.2017.
  */
 
-public class InsulinFastactingFragment extends Fragment {
-    static InsulinFastactingPlugin insulinFastactingPlugin = new InsulinFastactingPlugin();
-
-    static public InsulinFastactingPlugin getPlugin() {
-        return insulinFastactingPlugin;
-    }
-
+public class InsulinFragment extends Fragment {
     TextView insulinName;
     TextView insulinComment;
     TextView insulinDia;
@@ -47,10 +41,10 @@ public class InsulinFastactingFragment extends Fragment {
     }
 
     private void updateGUI() {
-        insulinName.setText(insulinFastactingPlugin.getFriendlyName());
-        insulinComment.setText(insulinFastactingPlugin.getComment());
-        insulinDia.setText(MainApp.sResources.getText(R.string.dia) + "  " + Double.toString(insulinFastactingPlugin.getDia()) + "h");
-        insulinGraph.show(insulinFastactingPlugin);
+        insulinName.setText(MainApp.getConfigBuilder().getActiveInsulin().getFriendlyName());
+        insulinComment.setText(MainApp.getConfigBuilder().getActiveInsulin().getComment());
+        insulinDia.setText(MainApp.sResources.getText(R.string.dia) + "  " + Double.toString(MainApp.getConfigBuilder().getActiveInsulin().getDia()) + "h");
+        insulinGraph.show(MainApp.getConfigBuilder().getActiveInsulin());
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefBasePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefBasePlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
index 10dfd5dce5..b37e3b5c85 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefBasePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java
similarity index 82%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java
index 747eabda5b..53612762ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -13,6 +13,14 @@ public class InsulinOrefFreePeakPlugin extends InsulinOrefBasePlugin {
     private static boolean fragmentEnabled = false;
     private static boolean fragmentVisible = false;
 
+    private static InsulinOrefFreePeakPlugin plugin = null;
+
+    public static InsulinOrefFreePeakPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new InsulinOrefFreePeakPlugin();
+        return plugin;
+    }
+
     public static final int DEFAULT_PEAK = 75;
 
     @Override
@@ -27,7 +35,7 @@ public class InsulinOrefFreePeakPlugin extends InsulinOrefBasePlugin {
 
     @Override
     public String getFragmentClass() {
-        return InsulinOrefFreePeakFragment.class.getName();
+        return InsulinFragment.class.getName();
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefRapidActingPlugin.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefRapidActingPlugin.java
index 6f6973bc58..c8791869a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefRapidActingPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -12,6 +12,14 @@ public class InsulinOrefRapidActingPlugin extends InsulinOrefBasePlugin {
     private static boolean fragmentEnabled = false;
     private static boolean fragmentVisible = false;
 
+    private static InsulinOrefRapidActingPlugin plugin = null;
+
+    public static InsulinOrefRapidActingPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new InsulinOrefRapidActingPlugin();
+        return plugin;
+    }
+
     public static final int PEAK = 75;
 
     @Override
@@ -26,7 +34,7 @@ public class InsulinOrefRapidActingPlugin extends InsulinOrefBasePlugin {
 
     @Override
     public String getFragmentClass() {
-        return InsulinOrefRapidActingFragment.class.getName();
+        return InsulinFragment.class.getName();
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefUltraRapidActingPlugin.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefUltraRapidActingPlugin.java
index 975707d38b..0f09d96d74 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefUltraRapidActingPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
+package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -12,6 +12,14 @@ public class InsulinOrefUltraRapidActingPlugin extends InsulinOrefBasePlugin {
     private static boolean fragmentEnabled = false;
     private static boolean fragmentVisible = false;
 
+    private static InsulinOrefUltraRapidActingPlugin plugin = null;
+
+    public static InsulinOrefUltraRapidActingPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new InsulinOrefUltraRapidActingPlugin();
+        return plugin;
+    }
+
     public static final int PEAK = 55;
 
     @Override
@@ -26,7 +34,7 @@ public class InsulinOrefUltraRapidActingPlugin extends InsulinOrefBasePlugin {
 
     @Override
     public String getFragmentClass() {
-        return InsulinOrefUltraRapidActingFragment.class.getName();
+        return InsulinFragment.class.getName();
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java
deleted file mode 100644
index 1747f5f4ab..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.InsulinFastactingProlonged;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.InsulinFastacting.ActivityGraph;
-
-/**
- * Created by mike on 17.04.2017.
- */
-
-public class InsulinFastactingProlongedFragment extends Fragment {
-    static InsulinFastactingProlongedPlugin insulinFastactingProlongedPlugin = new InsulinFastactingProlongedPlugin();
-
-    static public InsulinFastactingProlongedPlugin getPlugin() {
-        return insulinFastactingProlongedPlugin;
-    }
-
-    TextView insulinName;
-    TextView insulinComment;
-    TextView insulinDia;
-    ActivityGraph insulinGraph;
-
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.insulin_fragment, container, false);
-
-        insulinName = (TextView) view.findViewById(R.id.insulin_name);
-        insulinComment = (TextView) view.findViewById(R.id.insulin_comment);
-        insulinDia = (TextView) view.findViewById(R.id.insulin_dia);
-        insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph);
-
-        updateGUI();
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateGUI();
-    }
-
-    private void updateGUI() {
-        insulinName.setText(insulinFastactingProlongedPlugin.getFriendlyName());
-        insulinComment.setText(insulinFastactingProlongedPlugin.getComment());
-        insulinDia.setText(MainApp.sResources.getText(R.string.dia) + "  " + Double.toString(insulinFastactingProlongedPlugin.getDia()) + "h");
-        insulinGraph.show(insulinFastactingProlongedPlugin);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakFragment.java
deleted file mode 100644
index f7120369b3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefFreePeakFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.InsulinFastacting.ActivityGraph;
-
-/**
- * Created by adrian on 14/08/17.
- */
-
-public class InsulinOrefFreePeakFragment extends Fragment {
-
-    static InsulinOrefFreePeakPlugin insulinPlugin = new InsulinOrefFreePeakPlugin();
-
-    static public InsulinOrefFreePeakPlugin getPlugin() {
-        return insulinPlugin;
-    }
-
-    TextView insulinName;
-    TextView insulinComment;
-    TextView insulinDia;
-    ActivityGraph insulinGraph;
-
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.insulin_fragment, container, false);
-
-        insulinName = (TextView) view.findViewById(R.id.insulin_name);
-        insulinComment = (TextView) view.findViewById(R.id.insulin_comment);
-        insulinDia = (TextView) view.findViewById(R.id.insulin_dia);
-        insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph);
-
-        updateGUI();
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateGUI();
-    }
-
-    private void updateGUI() {
-        insulinName.setText(insulinPlugin.getFriendlyName());
-        insulinComment.setText(insulinPlugin.getComment());
-        insulinDia.setText(MainApp.sResources.getText(R.string.dia) + "  " + Double.toString(insulinPlugin.getDia()) + "h");
-        insulinGraph.show(insulinPlugin);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingFragment.java
deleted file mode 100644
index e30c087d21..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefRapidActingFragment.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.InsulinFastacting.ActivityGraph;
-
-/**
- * Created by adrian on 14/08/17.
- */
-
-public class InsulinOrefRapidActingFragment extends Fragment {
-
-    static InsulinOrefRapidActingPlugin insulinPlugin = new InsulinOrefRapidActingPlugin();
-
-    static public InsulinOrefRapidActingPlugin getPlugin() {
-        return insulinPlugin;
-    }
-
-    TextView insulinName;
-    TextView insulinComment;
-    TextView insulinDia;
-    ActivityGraph insulinGraph;
-
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.insulin_fragment, container, false);
-
-        insulinName = (TextView) view.findViewById(R.id.insulin_name);
-        insulinComment = (TextView) view.findViewById(R.id.insulin_comment);
-        insulinDia = (TextView) view.findViewById(R.id.insulin_dia);
-        insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph);
-
-        updateGUI();
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateGUI();
-    }
-
-    private void updateGUI() {
-        insulinName.setText(insulinPlugin.getFriendlyName());
-        insulinComment.setText(insulinPlugin.getComment());
-        insulinDia.setText(MainApp.sResources.getText(R.string.dia) + "  " + Double.toString(insulinPlugin.getDia()) + "h");
-        insulinGraph.show(insulinPlugin);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingFragment.java
deleted file mode 100644
index ea05c7f2e7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinOrefCurves/InsulinOrefUltraRapidActingFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.InsulinOrefCurves;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.InsulinFastacting.ActivityGraph;
-
-/**
- * Created by adrian on 14/08/17.
- */
-
-public class InsulinOrefUltraRapidActingFragment extends Fragment {
-
-    static InsulinOrefUltraRapidActingPlugin insulinPlugin = new InsulinOrefUltraRapidActingPlugin();
-
-    static public InsulinOrefUltraRapidActingPlugin getPlugin() {
-        return insulinPlugin;
-    }
-
-    TextView insulinName;
-    TextView insulinComment;
-    TextView insulinDia;
-    ActivityGraph insulinGraph;
-
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.insulin_fragment, container, false);
-
-        insulinName = (TextView) view.findViewById(R.id.insulin_name);
-        insulinComment = (TextView) view.findViewById(R.id.insulin_comment);
-        insulinDia = (TextView) view.findViewById(R.id.insulin_dia);
-        insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph);
-
-        updateGUI();
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateGUI();
-    }
-
-    private void updateGUI() {
-        insulinName.setText(insulinPlugin.getFriendlyName());
-        insulinComment.setText(insulinPlugin.getComment());
-        insulinDia.setText(MainApp.sResources.getText(R.string.dia) + "  " + Double.toString(insulinPlugin.getDia()) + "h");
-        insulinGraph.show(insulinPlugin);
-    }
-
-}
diff --git a/app/src/main/res/layout/insulin_fragment.xml b/app/src/main/res/layout/insulin_fragment.xml
index e9a172ae87..88581403dc 100644
--- a/app/src/main/res/layout/insulin_fragment.xml
+++ b/app/src/main/res/layout/insulin_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
+    tools:context="info.nightscout.androidaps.plugins.Insulin.InsulinFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -35,7 +35,7 @@
                 android:layout_margin="10dp"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            <info.nightscout.androidaps.plugins.InsulinFastacting.ActivityGraph
+            <info.nightscout.androidaps.plugins.Insulin.ActivityGraph
                 android:id="@+id/insuling_graph"
                 android:layout_width="match_parent"
                 android:layout_margin="20dp"
diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index 54e3b1d198..3a51ecec3c 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
+    tools:context="info.nightscout.androidaps.plugins.Overview.Dialogs.CalibrationDialog">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_newextendedbolus_dialog.xml b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
index 7a33737ecf..f89fa2e2ae 100644
--- a/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
+++ b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
+    tools:context="info.nightscout.androidaps.plugins.Actions.dialogs.NewExtendedBolusDialog">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_newtempbasal_dialog.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
index 48c20b6809..6ecf267615 100644
--- a/app/src/main/res/layout/overview_newtempbasal_dialog.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
+    tools:context="info.nightscout.androidaps.plugins.Actions.dialogs.NewTempBasalDialog">
 
     <ScrollView
         android:layout_width="match_parent"

From ed8582b36a2eb52356994bad52f14dcdf5b9424b Mon Sep 17 00:00:00 2001
From: fedor apanasenko <apanasef@gmail.com>
Date: Fri, 1 Sep 2017 10:37:59 +0300
Subject: [PATCH 21/53] update russian

---
 app/src/main/res/values-ru/strings.xml | 95 ++++++++++++++++++++++++--
 1 file changed, 91 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8a5910fb92..2964a144c1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -53,7 +53,7 @@
     <string name="careportal_newnstreatment_absolute_label">абсолют</string>
     <string name="careportal_newnstreatment_carbs_label">углеводы</string>
     <string name="careportal_newnstreatment_carbtime_label">действие углеводов</string>
-    <string name="careportal_newnstreatment_duration_label">продолжительность действия</string>
+    <string name="careportal_newnstreatment_duration_label">Длительность действия</string>
     <string name="careportal_newnstreatment_enteredby_title">кем введено</string>
     <string name="careportal_newnstreatment_eventtime_label">время события</string>
     <string name="careportal_newnstreatment_eventtype">тип события</string>
@@ -221,7 +221,7 @@
     <string name="glucosetype_finger">палец</string>
     <string name="glucosetype_sensor">сенсор</string>
     <string name="high_mark">ВЕРХНЯЯ отметка</string>
-    <string name="hoursago">час/а/ов назад</string>
+    <string name="hoursago">час. назад</string>
     <string name="import_from">импортировать настройки из</string>
     <string name="initializing">инициализация...</string>
     <string name="insulin_shortname">ИНС</string>
@@ -382,7 +382,7 @@
     <string name="overview_editquickwizard_valid">использовать до:</string>
     <string name="overview_editquickwizardlistactivity_add">добавить</string>
     <string name="overview_extendedbolus_button">расширенный болюс</string>
-    <string name="overview_newtempbasal_basalpercent">величина базала</string>
+    <string name="overview_newtempbasal_basalpercent">величина базала (%)</string>
     <string name="overview_newtempbasal_percent_label">% (100% = current)</string>
     <string name="overview_quickwizard_item_edit_button">редактировать</string>
     <string name="overview_quickwizard_item_remove_button">удалить</string>
@@ -559,8 +559,95 @@
     <string name="xdrip">xdrip</string>
     <string name="xdripnotinstalled">xdrip+ не установлен</string>
     <string name="xdripstatus">строка состояния xdrip (часы)</string>
-    <string name="xdripstatus_settings">"состояние xdrip (часы) "</string>
+    <string name="xdripstatus_settings">состояние xdrip (часы)</string>
     <string name="xdripstatus_shortname">xds</string>
     <string name="youareonallowedlimit">разрешенный предел достигнут</string>
     <string name="app_name">AndroidAPS</string>
+    <string name="absorption_maxtime_summary">Ожидаемое время усваивания всех углеводов пищи в часах</string>
+    <string name="absorption_maxtime_title">Максимальное время усваимости пищи</string>
+    <string name="absorptionsettings_title">Настройки усваиваемости</string>
+    <string name="activate_profile">АКТИВИРОВАТЬ ПРОФИЛЬ</string>
+    <string name="basal_short">БАЗ</string>
+    <string name="basalmissing">Базал отсутствует в профиле. Применяются данные по умолчанию</string>
+    <string name="careportal_activity_label">АКТИВНОСТЬ</string>
+    <string name="careportal_canulaage_label">канюля проработала</string>
+    <string name="careportal_canulaage_label_short">ВозрКан</string>
+    <string name="careportal_carbsandbolus_label">УГЛЕВОДЫ ; БОЛЮС</string>
+    <string name="careportal_cgm_label">МОНИТОРИНГ; OPENAPS</string>
+    <string name="careportal_insulinage_label">Инсулин проработал</string>
+    <string name="careportal_insulinage_label_short">ВозрИнс</string>
+    <string name="careportal_newnstreatment_duration_min_label">Длительность (мин)</string>
+    <string name="careportal_pbage_label">Батарея помпы работает</string>
+    <string name="careportal_pbage_label_short">ВозрБат</string>
+    <string name="careportal_pump_label">ПОМПА</string>
+    <string name="careportal_pumpbatterychange">замена батареи помпы</string>
+    <string name="careportal_sensorage_label">сенсор пропаботал</string>
+    <string name="careportal_sensorage_label_short">ВОЗРСенс</string>
+    <string name="configbuilder_sensitivity">определение чувствительности</string>
+    <string name="cpp_notloadedplugins">не все профили загружены!</string>
+    <string name="cpp_sync_setting_missing">требует активации для отправки данных на помпу!</string>
+    <string name="cpp_valuesnotstored">Данные не сохранены!</string>
+    <string name="danar_visualizeextendedaspercentage_title">Просмотреть расширенный болюс %</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="date">дата</string>
+    <string name="device">устройство</string>
+    <string name="dia_too_short">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>
+    <string name="free_peak_oref">Акуу-Зуфл Щкуа</string>
+    <string name="hours">час</string>
+    <string name="icmissing">соотношение инс-углев отсутствует в профиле. применено соотн. по умолчанию</string>
+    <string name="insulin_oref_peak">Время пика действующего инс IOB</string>
+    <string name="insulin_peak_time">время пика (в мин.)</string>
+    <string name="invalid">НЕВЕРНО</string>
+    <string name="invalidprofile">Неверный профиль !!!</string>
+    <string name="isfmissing">фактор чувствительности к инс. отутствует в профиле. Применен фактор по умолчанию</string>
+    <string name="lock_screen">блокировка экрана</string>
+    <string name="lock_screen_short">блок</string>
+    <string name="mdtp_cancel">отмена</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="nl_lang">Голландский</string>
+    <string name="ns_alarmoptions">опции оповещения</string>
+    <string name="ns_localbroadcasts">Активировать передачу на другие приложения (напр. xDrip)</string>
+    <string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
+    <string name="nsalarm_high">Высокий</string>
+    <string name="nsalarm_low">Низкий</string>
+    <string name="nsalarm_staledata">Нет данных</string>
+    <string name="nsalarm_staledatavalue_label">Порог устаревших данных (мин)</string>
+    <string name="nsalarm_summary">сейчас установлен на %f</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Порог тревоги из-за устаревших данных (мин)</string>
+    <string name="nsalarm_urgenthigh">Тревога выс</string>
+    <string name="nsalarm_urgentlow">Тревога низкий</string>
+    <string name="nsalarm_urgentstaledata">Тревога нет данных</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="overview_extendedbolus_cancel_button">отмена расшир болюса</string>
+    <string name="overview_newtempbasal_basalabsolute">значения базала (ед/ч)</string>
+    <string name="overview_newtempbasal_basaltype_label">тип базала</string>
+    <string name="profileswitch">смена профиля</string>
+    <string name="pump">помпа</string>
+    <string name="rapid_acting_oref">быстро действующий Oref</string>
+    <string name="ratio_short">СООТН</string>
+    <string name="refresheventsfromnightscout">обновить данные из NS</string>
+    <string name="ru_lang">heccrbq</string>
+    <string name="sensitivity_shortname">Xedcnd</string>
+    <string name="sensitivity_warning">Активируя Autosense не забывайте вводить все съеденные углеводы. Иначе отклонения в углеводах будут неверно определены как изменение чувствительности !!</string>
+    <string name="sensitivityaaps">Чувствительность AAPS</string>
+    <string name="sensitivityoref0">Чувствительность Oref0</string>
+    <string name="sensitivityweightedaverage">средневзвешенная чувствительность</string>
+    <string name="sv_lang">Шведский</string>
+    <string name="targetmissing">Целевое значение отсутствует в профиле. Применено значение по умолчанию</string>
+    <string name="tempbasal">ВремБазал</string>
+    <string name="temptarget">ВремЦель</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="ultrarapid_oref">Сверхбыстрый Oref</string>
+    <string name="unsupportednsversion">Неподдерживаемая версия Nightscout</string>
+    <string name="uploader">uploader</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="virtualpump_extendedbolus_label_short">ПРОДЛ</string>
+    <string name="wear_overviewnotifications">Просмотр уведомлений</string>
+    <string name="wear_overviewnotifications_summary">Пропустить уведомления как потдтвержденные от Wear</string>
+    <string name="openapsama_autosens_period">интервал для autosens (ч)</string>
+    <string name="openapsama_autosens_period_summary">Время в часах в прошлом для определения чувствительности (время усвоения углеводов исключается)</string>
 </resources>

From 15a40cba80472eee5800997625ec41a967982f44 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Fri, 1 Sep 2017 14:02:47 +0200
Subject: [PATCH 22/53] Split treatments into smaller packages before
 broadcasting

---
 .../plugins/NSClientInternal/broadcasts/BroadcastTreatment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
index 0d998a2bcd..99644c7ba3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
@@ -183,7 +183,7 @@ public class BroadcastTreatment {
                         ret.add(newarr);
                     }
                     newarr = new JSONArray();
-                    count = 200;
+                    count = 100;
                 }
                 newarr.put(array.get(i));
                 --count;

From 7801db5a29c580af26aa4775e8535e38297c3893 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 2 Sep 2017 10:25:46 +0200
Subject: [PATCH 23/53] fix danar bolus step

---
 .../nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java    | 2 +-
 .../androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
index f4343c1629..96871ac128 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
@@ -88,7 +88,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         MainApp.bus().register(this);
 
         pumpDescription.isBolusCapable = true;
-        pumpDescription.bolusStep = 0.1d;
+        pumpDescription.bolusStep = 0.05d;
 
         pumpDescription.isExtendedBolusCapable = true;
         pumpDescription.extendedBolusStep = 0.05d;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
index 9ff9efeaf3..82bbc23e5c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
@@ -86,7 +86,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         MainApp.bus().register(this);
 
         pumpDescription.isBolusCapable = true;
-        pumpDescription.bolusStep = 0.1d;
+        pumpDescription.bolusStep = 0.05d;
 
         pumpDescription.isExtendedBolusCapable = true;
         pumpDescription.extendedBolusStep = 0.05d;

From 3bebea37ae9a66b2f74cc03cb3195f2ba2ac8e3f Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sun, 3 Sep 2017 01:50:27 +0200
Subject: [PATCH 24/53] Use OK/Cancel buttons for 'profile changes refresh from
 NS' dialog in Treatments tab.

---
 .../TreatmentsProfileSwitchFragment.java        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
index fc9d836b8b..7fcca51e67 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
@@ -28,14 +27,11 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileIntervals;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventProfileSwitchChange;
-import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
-import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.SP;
 
 /**
@@ -61,8 +57,7 @@ public class TreatmentsProfileSwitchFragment extends SubscriberFragment implemen
         @Override
         public ProfileSwitchViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
             View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_profileswitch_item, viewGroup, false);
-            ProfileSwitchViewHolder ProfileSwitchViewHolder = new ProfileSwitchViewHolder(v);
-            return ProfileSwitchViewHolder;
+            return new ProfileSwitchViewHolder(v);
         }
 
         @Override
@@ -187,14 +182,18 @@ public class TreatmentsProfileSwitchFragment extends SubscriberFragment implemen
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.profileswitch_refreshfromnightscout:
-                OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.confirmation), MainApp.sResources.getString(R.string.refresheventsfromnightscout) + "?", new Runnable() {
-                    @Override
-                    public void run() {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this.getContext());
+                builder.setTitle(this.getContext().getString(R.string.confirmation));
+                builder.setMessage(this.getContext().getString(R.string.refresheventsfromnightscout) + "?");
+                builder.setPositiveButton(this.getContext().getString(R.string.ok), new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
                         MainApp.getDbHelper().resetProfileSwitch();
                         Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
                         MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
                     }
                 });
+                builder.setNegativeButton(this.getContext().getString(R.string.cancel), null);
+                builder.show();
                 break;
         }
     }

From 1fd99a958259f8dd339d6fc8406101581359a389 Mon Sep 17 00:00:00 2001
From: SMUSTAF1 <susan.mustafa@volvocars.com>
Date: Tue, 5 Sep 2017 13:29:43 +0200
Subject: [PATCH 25/53] changing the color of the bolus value, for visual
 clarify and confirmation.  Reducing errors.

---
 .../plugins/Overview/Dialogs/NewTreatmentDialog.java | 12 +++++++-----
 .../plugins/Overview/Dialogs/WizardDialog.java       | 10 +++++++---
 app/src/main/res/values/colors.xml                   |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index e2edb1e76a..cf750a2d39 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -7,6 +7,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -80,15 +81,16 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     Double insulin = SafeParse.stringToDouble(editInsulin.getText());
                     final Integer carbs = SafeParse.stringToInt(editCarbs.getText());
 
-                    String confirmMessage = getString(R.string.entertreatmentquestion) + "\n";
+                    String confirmMessage = getString(R.string.entertreatmentquestion) + "<br/>";
 
                     Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(insulin);
                     Integer carbsAfterConstraints = MainApp.getConfigBuilder().applyCarbsConstraints(carbs);
 
-                    confirmMessage += getString(R.string.bolus) + ": " + insulinAfterConstraints + "U";
-                    confirmMessage += "\n" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
+                    confirmMessage += getString(R.string.bolus) + ": " + "<font color='"+ MainApp.sResources.getColor(R.color.bolus) + "'>" + insulinAfterConstraints + "U" + "</font>";
+                    confirmMessage += "<br/>" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
                     if (insulinAfterConstraints - insulin != 0 || !Objects.equals(carbsAfterConstraints, carbs))
-                        confirmMessage += "\n" + getString(R.string.constraintapllied);
+                        confirmMessage += "<br/>" + getString(R.string.constraintapllied);
+
 
                     final double finalInsulinAfterConstraints = insulinAfterConstraints;
                     final int finalCarbsAfterConstraints = carbsAfterConstraints;
@@ -97,7 +99,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     AlertDialog.Builder builder = new AlertDialog.Builder(context);
 
                     builder.setTitle(this.getContext().getString(R.string.confirmation));
-                    builder.setMessage(confirmMessage);
+                    builder.setMessage(Html.fromHtml(confirmMessage));
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index bda03a8a27..1839a9d217 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -9,6 +9,7 @@ import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
+import android.text.Html;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -274,13 +275,16 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
             case R.id.ok:
                 if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
                     DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
+
                     String confirmMessage = getString(R.string.entertreatmentquestion);
 
                     Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(calculatedTotalInsulin);
                     Integer carbsAfterConstraints = MainApp.getConfigBuilder().applyCarbsConstraints(calculatedCarbs);
 
-                    confirmMessage += "\n" + getString(R.string.bolus) + ": " + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U";
-                    confirmMessage += "\n" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
+                    confirmMessage += "<br/>" + getString(R.string.bolus) + ": " + "<font color='"+ MainApp.sResources.getColor(R.color.bolus) + "'>" + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U" + "</font>";
+                    confirmMessage += "<br/>" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
+
+
 
                     if (insulinAfterConstraints - calculatedTotalInsulin != 0 || !carbsAfterConstraints.equals(calculatedCarbs)) {
                         AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -299,7 +303,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(context);
                     builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
-                    builder.setMessage(confirmMessage);
+                    builder.setMessage(Html.fromHtml(confirmMessage));
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cb9206a4c7..4c5c58c993 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
     <color name="prediction">#ff00ff</color>
     <color name="basal">#00ffff</color>
     <color name="iob">#FFFB8C00</color>
+    <color name="bolus">#FFFFCC03</color>
     <color name="cob">#8BC34A</color>
     <color name="ratio">#FFFFFF</color>
     <color name="inrange">#00FF00</color>

From 98848b61eca78a946f625499893aa2bf24942ae9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 5 Sep 2017 22:47:10 +0200
Subject: [PATCH 26/53] send max 30 at once to NS

---
 .../plugins/NSClientInternal/services/NSClientService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
index cbc18acbca..d171f87fc8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
@@ -684,10 +684,11 @@ public class NSClientService extends Service {
                 MainApp.bus().post(new EventNSClientNewLog("QUEUE", "Resend started: " + reason));
 
                 CloseableIterator<DbRequest> iterator = null;
+                int maxcount = 30;
                 try {
                     iterator = MainApp.getDbHelper().getDbRequestInterator();
                     try {
-                        while (iterator.hasNext()) {
+                        while (iterator.hasNext() && maxcount > 0) {
                             DbRequest dbr = iterator.next();
                             if (dbr.action.equals("dbAdd")) {
                                 NSAddAck addAck = new NSAddAck();
@@ -702,6 +703,7 @@ public class NSClientService extends Service {
                                 NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id);
                                 dbUpdateUnset(dbr, updateUnsetAck);
                             }
+                            maxcount--;
                         }
                     } finally {
                         iterator.close();

From b1e3b45ce9f7ad75f5546775cb5ce80d6c7f2906 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 9 Sep 2017 15:34:00 +0200
Subject: [PATCH 27/53] Add temp target to Wizard dialog

Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
---
 .../interfaces/TreatmentsInterface.java       |  1 +
 .../ConfigBuilder/ConfigBuilderPlugin.java    |  6 ++
 .../Overview/Dialogs/WizardDialog.java        | 56 ++++++++++++-------
 .../plugins/Overview/OverviewFragment.java    | 10 ++--
 .../plugins/Treatments/TreatmentsPlugin.java  | 12 +++-
 .../plugins/Wear/ActionStringHandler.java     |  5 +-
 .../info/nightscout/utils/BolusWizard.java    | 35 ++++++------
 .../res/layout/overview_wizard_dialog.xml     | 38 +++++++++----
 app/src/main/res/values/strings.xml           |  7 +++
 9 files changed, 111 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
index 5e8b4e52e8..044b259ac9 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
@@ -52,6 +52,7 @@ public interface TreatmentsInterface {
 
     boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo);
 
+    TempTarget getTempTargetFromHistory();
     TempTarget getTempTargetFromHistory(long time);
     Intervals<TempTarget> getTempTargetsFromHistory();
 
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 6bc0e1e807..8f6b47e2ff 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
@@ -890,6 +890,12 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         return newRecordCreated;
     }
 
+    @Override
+    @Nullable
+    public TempTarget getTempTargetFromHistory() {
+        return activeTreatments.getTempTargetFromHistory(System.currentTimeMillis());
+    }
+
     @Override
     @Nullable
     public TempTarget getTempTargetFromHistory(long time) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index bda03a8a27..bbfc688252 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -50,6 +50,7 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.Source;
+import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
@@ -73,6 +74,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     TextView bgInsulin;
     TextView bgUnits;
     CheckBox bgCheckbox;
+    CheckBox ttCheckbox;
     TextView carbs;
     TextView carbsInsulin;
     TextView bolusIobInsulin;
@@ -216,17 +218,21 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         cobInsulin = (TextView) view.findViewById(R.id.treatments_wizard_cobinsulin);
 
         bgCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bgcheckbox);
+        ttCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_ttcheckbox);
+        bgtrendCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bgtrendcheckbox);
+        cobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_cobcheckbox);
         bolusIobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bolusiobcheckbox);
         basalIobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_basaliobcheckbox);
         superbolusCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_sbcheckbox);
-        bgtrendCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bgtrendcheckbox);
-        cobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_cobcheckbox);
+        loadCheckedStates();
+
         bgCheckbox.setOnCheckedChangeListener(this);
+        ttCheckbox.setOnCheckedChangeListener(this);
+        bgtrendCheckbox.setOnCheckedChangeListener(this);
+        cobCheckbox.setOnCheckedChangeListener(this);
         basalIobCheckbox.setOnCheckedChangeListener(this);
         bolusIobCheckbox.setOnCheckedChangeListener(this);
         superbolusCheckbox.setOnCheckedChangeListener(this);
-        bgtrendCheckbox.setOnCheckedChangeListener(this);
-        cobCheckbox.setOnCheckedChangeListener(this);
 
         profileSpinner = (Spinner) view.findViewById(R.id.treatments_wizard_profile);
         profileSpinner.setOnItemSelectedListener(this);
@@ -253,9 +259,29 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        saveCheckedStates();
+        ttCheckbox.setEnabled(bgCheckbox.isChecked() && MainApp.getConfigBuilder().getTempTargetFromHistory() != null);
         calculateInsulin();
     }
 
+    private void saveCheckedStates() {
+        SP.putBoolean(getString(R.string.key_wizard_include_bg), bgCheckbox.isChecked());
+        SP.putBoolean(getString(R.string.key_wizard_include_tt), ttCheckbox.isChecked());
+        SP.putBoolean(getString(R.string.key_wizard_include_cob), cobCheckbox.isChecked());
+        SP.putBoolean(getString(R.string.key_wizard_include_trend_bg), bgtrendCheckbox.isChecked());
+        SP.putBoolean(getString(R.string.key_wizard_include_bolus_iob), bolusIobCheckbox.isChecked());
+        SP.putBoolean(getString(R.string.key_wizard_include_basal_iob), basalIobCheckbox.isChecked());
+    }
+
+    private void loadCheckedStates() {
+        bgCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bg), true));
+        ttCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_tt), false));
+        bgtrendCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_trend_bg), false));
+        cobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_cob), false));
+        bolusIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bolus_iob), true));
+        basalIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_basal_iob), true));
+    }
+
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         calculateInsulin();
@@ -381,31 +407,17 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         BgReading lastBg = DatabaseHelper.actualBg();
 
         if (lastBg != null) {
-            Double lastBgValue = lastBg.valueToUnits(units);
-            Double sens = profile.getIsf();
-            Double targetBGLow = profile.getTargetLow();
-            Double targetBGHigh = profile.getTargetHigh();
-            Double bgDiff;
-            if (lastBgValue <= targetBGLow) {
-                bgDiff = lastBgValue - targetBGLow;
-            } else {
-                bgDiff = lastBgValue - targetBGHigh;
-            }
-
-            bg.setText(lastBg.valueToUnitsToString(units) + " ISF: " + DecimalFormatter.to1Decimal(sens));
-            bgInsulin.setText(DecimalFormatter.to2Decimal(bgDiff / sens) + "U");
             editBg.removeTextChangedListener(textWatcher);
             //bgInput.setText(lastBg.valueToUnitsToString(units));
             editBg.setValue(lastBg.valueToUnits(units));
             editBg.addTextChangedListener(textWatcher);
         } else {
-            bg.setText("");
-            bgInsulin.setText("");
             editBg.removeTextChangedListener(textWatcher);
             //bgInput.setText("");
             editBg.setValue(0d);
             editBg.addTextChangedListener(textWatcher);
         }
+        ttCheckbox.setEnabled(MainApp.getConfigBuilder().getTempTargetFromHistory() != null);
 
         // IOB calculation
         MainApp.getConfigBuilder().updateTotalIOBTreatments();
@@ -458,6 +470,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         }
 
         c_bg = bgCheckbox.isChecked() ? c_bg : 0d;
+        TempTarget tempTarget = ttCheckbox.isChecked() ? MainApp.getConfigBuilder().getTempTargetFromHistory() : null;
 
         // COB
         Double c_cob = 0d;
@@ -466,12 +479,13 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                 try {
                     c_cob = SafeParse.stringToDouble(ConfigBuilderPlugin.getActiveAPS().getLastAPSResult().json().getString("COB"));
                 } catch (JSONException e) {
+                    log.error("Unhandled exception", e);
                 }
             }
         }
 
         BolusWizard wizard = new BolusWizard();
-        wizard.doCalc(specificProfile, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), bgtrendCheckbox.isChecked());
+        wizard.doCalc(specificProfile, tempTarget, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), bgtrendCheckbox.isChecked());
 
         bg.setText(c_bg + " ISF: " + DecimalFormatter.to1Decimal(wizard.sens));
         bgInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromBG) + "U");
@@ -522,6 +536,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
             total.setText(getString(R.string.result) + ": " + insulinText + " " + carbsText);
             okButton.setVisibility(View.VISIBLE);
         } else {
+            // TODO this should also be run when loading the dialog as the OK button is initially visible
+            //      but does nothing if neither carbs nor insulin is > 0
             total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
             okButton.setVisibility(View.INVISIBLE);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index d871bd4c40..363918a9b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -127,9 +127,6 @@ import info.nightscout.utils.Profiler;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
-//Added By Rumen for staledata alarm
-import info.nightscout.androidaps.plugins.Overview.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 public class OverviewFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
     private static Logger log = LoggerFactory.getLogger(OverviewFragment.class);
@@ -637,12 +634,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     void onClickQuickwizard() {
         final BgReading actualBg = DatabaseHelper.actualBg();
         final Profile profile = MainApp.getConfigBuilder().getProfile();
+        final TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory();
 
         QuickWizard.QuickWizardEntry quickWizardEntry = getPlugin().quickWizard.getActive();
         if (quickWizardEntry != null && actualBg != null) {
             quickWizardButton.setVisibility(View.VISIBLE);
             BolusWizard wizard = new BolusWizard();
-            wizard.doCalc(profile, quickWizardEntry.carbs(), 0d, actualBg.valueToUnits(profile.getUnits()), 0d, true, true, false, false);
+            wizard.doCalc(profile, tempTarget, quickWizardEntry.carbs(), 0d, actualBg.valueToUnits(profile.getUnits()), 0d, true, true, false, false);
 
             final JSONObject boluscalcJSON = new JSONObject();
             try {
@@ -976,7 +974,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         }
 
         // temp target
-        TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory(System.currentTimeMillis());
+        TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory();
         if (tempTarget != null) {
             tempTargetView.setTextColor(Color.BLACK);
             tempTargetView.setBackgroundColor(MainApp.sResources.getColor(R.color.tempTargetBackground));
@@ -1117,7 +1115,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             quickWizardButton.setVisibility(View.VISIBLE);
             String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
             BolusWizard wizard = new BolusWizard();
-            wizard.doCalc(profile, quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(units), 0d, true, true, false, false);
+            wizard.doCalc(profile, tempTarget, quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(units), 0d, true, true, false, false);
             text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U";
             quickWizardButton.setText(text);
             if (wizard.calculatedTotalInsulin <= 0)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
index 0f5a6c582e..c7962cabc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
@@ -272,7 +272,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
 
     @Override
     public TemporaryBasal getRealTempBasalFromHistory(long time) {
-        return (TemporaryBasal) tempBasals.getValueByInterval(time);
+        return tempBasals.getValueByInterval(time);
     }
 
     @Override
@@ -358,7 +358,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
 
     @Override
     public ExtendedBolus getExtendedBolusFromHistory(long time) {
-        return (ExtendedBolus) extendedBoluses.getValueByInterval(time);
+        return extendedBoluses.getValueByInterval(time);
     }
 
     @Override
@@ -464,10 +464,16 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
         initializeTempTargetData();
     }
 
+    @Nullable
+    @Override
+    public TempTarget getTempTargetFromHistory() {
+        return tempTargets.getValueByInterval(System.currentTimeMillis());
+    }
+
     @Nullable
     @Override
     public TempTarget getTempTargetFromHistory(long time) {
-        return (TempTarget) tempTargets.getValueByInterval(time);
+        return tempTargets.getValueByInterval(time);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
index e60e30d158..07d41a0d8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
@@ -202,9 +202,10 @@ public class ActionStringHandler {
                 sendError("No recent BG to base calculation on!");
                 return;
             }
+
             DecimalFormat format = new DecimalFormat("0.00");
             BolusWizard bolusWizard = new BolusWizard();
-            bolusWizard.doCalc(profile, carbsAfterConstraints, 0d, useBG ? bgReading.valueToUnits(profile.getUnits()) : 0d, 0d, percentage, useBolusIOB, useBasalIOB, false, false);
+            bolusWizard.doCalc(profile, null, carbsAfterConstraints, 0d, useBG ? bgReading.valueToUnits(profile.getUnits()) : 0d, 0d, percentage, useBolusIOB, useBasalIOB, false, false);
 
             Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(bolusWizard.calculatedTotalInsulin);
             if (insulinAfterConstraints - bolusWizard.calculatedTotalInsulin != 0) {
@@ -470,7 +471,7 @@ public class ActionStringHandler {
         }
 
         //Check for Temp-Target:
-        TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory(System.currentTimeMillis());
+        TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory();
         if (tempTarget != null) {
             ret += "Temp Target: " + Profile.toTargetRangeString(tempTarget.low, tempTarget.low, Constants.MGDL, profile.getUnits());
             ret += "\nuntil: " + DateUtil.timeString(tempTarget.originalEnd());
diff --git a/app/src/main/java/info/nightscout/utils/BolusWizard.java b/app/src/main/java/info/nightscout/utils/BolusWizard.java
index f4eb4907ef..984454005c 100644
--- a/app/src/main/java/info/nightscout/utils/BolusWizard.java
+++ b/app/src/main/java/info/nightscout/utils/BolusWizard.java
@@ -1,12 +1,11 @@
 package info.nightscout.utils;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.GlucoseStatus;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.TempTarget;
+import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 
 /**
  * Created by mike on 11.10.2016.
@@ -15,6 +14,7 @@ import info.nightscout.androidaps.data.Profile;
 public class BolusWizard {
     // Inputs
     Profile specificProfile = null;
+    TempTarget tempTarget;
     public Integer carbs = 0;
     Double bg = 0d;
     Double correction;
@@ -33,9 +33,6 @@ public class BolusWizard {
     public Double targetBGHigh = 0d;
     public Double bgDiff = 0d;
 
-    IobTotal bolusIob;
-    IobTotal basalIob;
-
     public Double insulinFromBG = 0d;
     public Double insulinFromCarbs = 0d;
     public Double insulingFromBolusIOB = 0d;
@@ -50,23 +47,29 @@ public class BolusWizard {
     public Double totalBeforePercentageAdjustment = 0d;
     public Double carbsEquivalent = 0d;
 
-    public Double doCalc(Profile specificProfile, Integer carbs, Double cob, Double bg, Double correction, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
-        return doCalc(specificProfile, carbs, cob, bg, correction, 100d, includeBolusIOB, includeBasalIOB, superBolus, trend);
+    public Double doCalc(Profile specificProfile, TempTarget tempTarget, Integer carbs, Double cob, Double bg, Double correction, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
+        return doCalc(specificProfile, tempTarget, carbs, cob, bg, correction, 100d, includeBolusIOB, includeBasalIOB, superBolus, trend);
     }
 
-        public Double doCalc(Profile specificProfile, Integer carbs, Double cob, Double bg, Double correction, double percentageCorrection, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
+    public Double doCalc(Profile specificProfile, TempTarget tempTarget, Integer carbs, Double cob, Double bg, Double correction, double percentageCorrection, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
         this.specificProfile = specificProfile;
+        this.tempTarget = tempTarget;
         this.carbs = carbs;
         this.bg = bg;
         this.correction = correction;
+        this.includeBolusIOB = includeBolusIOB;
+        this.includeBasalIOB = includeBasalIOB;
         this.superBolus = superBolus;
         this.trend = trend;
 
-
         // Insulin from BG
         sens = specificProfile.getIsf();
         targetBGLow = specificProfile.getTargetLow();
         targetBGHigh = specificProfile.getTargetHigh();
+        if (tempTarget != null) {
+            targetBGLow = tempTarget.low;
+            targetBGHigh = tempTarget.high;
+        }
         if (bg <= targetBGLow) {
             bgDiff = bg - targetBGLow;
         } else {
@@ -108,13 +111,13 @@ public class BolusWizard {
         }
 
         // Total
-            calculatedTotalInsulin = totalBeforePercentageAdjustment = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulingFromBolusIOB + insulingFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB;
-
-            //percentage
-            if(totalBeforePercentageAdjustment > 0){
-                calculatedTotalInsulin = totalBeforePercentageAdjustment*percentageCorrection/100d;
-            }
+        calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulingFromBolusIOB + insulingFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB;
 
+        // Percentage adjustment
+        totalBeforePercentageAdjustment = calculatedTotalInsulin;
+        if (calculatedTotalInsulin > 0) {
+            calculatedTotalInsulin = calculatedTotalInsulin * percentageCorrection / 100d;
+        }
 
         if (calculatedTotalInsulin < 0) {
             carbsEquivalent = -calculatedTotalInsulin * ic;
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index c7b764faba..a8aa4bdd4f 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -225,15 +225,29 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="80dp"
+                android:width="24dp"
                 android:text="@string/treatments_wizard_bg_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
+            <CheckBox
+                android:id="@+id/treatments_wizard_ttcheckbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="32dp"
+                android:checked="true" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="30dp"
+                android:text="@string/treatments_wizard_tt_label"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
             <TextView
                 android:id="@+id/treatments_wizard_bg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="100dp"
+                android:width="94dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -261,7 +275,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="80dp"
+                android:width="86dp"
                 android:text="@string/treatments_wizard_bgtrend_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -269,7 +283,7 @@
                 android:id="@+id/treatments_wizard_bgtrend"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="100dp"
+                android:width="94dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -298,7 +312,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="80dp"
+                android:width="86dp"
                 android:text="@string/treatments_wizard_cob_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -306,7 +320,7 @@
                 android:id="@+id/treatments_wizard_cob"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="100dp"
+                android:width="94dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -404,7 +418,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="80dp"
+                android:width="86dp"
                 android:text="@string/treatments_wizard_carbs_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -412,7 +426,7 @@
                 android:id="@+id/treatments_wizard_carbs"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="100dp"
+                android:width="94dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -438,7 +452,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="80dp"
+                android:width="86dp"
                 android:text="@string/superbolus"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -446,7 +460,7 @@
                 android:id="@+id/treatments_wizard_sb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="100dp"
+                android:width="94dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -472,7 +486,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="80dp"
+                android:width="86dp"
                 android:text="@string/treatments_wizard_correction_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -480,7 +494,7 @@
                 android:id="@+id/treatments_wizard_correction"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="100dp"
+                android:width="94dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9eb710ce9a..42974a836d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="treatments_newtreatment_insulinamount_label">Insulin</string>
     <string name="treatments_newtreatment_carbsamount_label">Carbs</string>
     <string name="treatments_wizard_bg_label">BG</string>
+    <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbs</string>
     <string name="treatments_wizard_correction_label">Corr</string>
     <string name="treatments_wizard_unit_label">U</string>
@@ -701,5 +702,11 @@
     <string name="activate_profile">ACTIVATE PROFILE</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
+    <string name="key_wizard_include_bg">wizard_include_bg</string>
+    <string name="key_wizard_include_tt">wizard_include_tt</string>
+    <string name="key_wizard_include_cob">wizard_include_cob</string>
+    <string name="key_wizard_include_trend_bg">wizard_include_trend_bg</string>
+    <string name="key_wizard_include_bolus_iob">wizard_include_bolus_iob</string>
+    <string name="key_wizard_include_basal_iob">wizard_include_basal_iob</string>
 </resources>
 

From 627cb8e9b2bfec42b7ac61595fc19adffd564afe Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 9 Sep 2017 16:37:08 +0200
Subject: [PATCH 28/53] WizardDialog: don't persist state of tt checkbox,
 default to false.

This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
---
 .../androidaps/plugins/Overview/Dialogs/WizardDialog.java       | 2 --
 app/src/main/res/layout/overview_wizard_dialog.xml              | 2 +-
 app/src/main/res/values/strings.xml                             | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index bbfc688252..4b81737a0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -266,7 +266,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     private void saveCheckedStates() {
         SP.putBoolean(getString(R.string.key_wizard_include_bg), bgCheckbox.isChecked());
-        SP.putBoolean(getString(R.string.key_wizard_include_tt), ttCheckbox.isChecked());
         SP.putBoolean(getString(R.string.key_wizard_include_cob), cobCheckbox.isChecked());
         SP.putBoolean(getString(R.string.key_wizard_include_trend_bg), bgtrendCheckbox.isChecked());
         SP.putBoolean(getString(R.string.key_wizard_include_bolus_iob), bolusIobCheckbox.isChecked());
@@ -275,7 +274,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     private void loadCheckedStates() {
         bgCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bg), true));
-        ttCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_tt), false));
         bgtrendCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_trend_bg), false));
         cobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_cob), false));
         bolusIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bolus_iob), true));
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index a8aa4bdd4f..faaae6967d 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -234,7 +234,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:width="32dp"
-                android:checked="true" />
+                android:checked="false" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42974a836d..bb7831fff1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -703,7 +703,6 @@
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
     <string name="key_wizard_include_bg">wizard_include_bg</string>
-    <string name="key_wizard_include_tt">wizard_include_tt</string>
     <string name="key_wizard_include_cob">wizard_include_cob</string>
     <string name="key_wizard_include_trend_bg">wizard_include_trend_bg</string>
     <string name="key_wizard_include_bolus_iob">wizard_include_bolus_iob</string>

From c50fad81bbaba1706e2a8b414b512560c4052fd3 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sun, 20 Aug 2017 11:17:05 +0200
Subject: [PATCH 29/53] Log exceptions in catch blocks rather than printing to
 console.

The default code used by Android Studio when generating a
try/catch can be altered in Settings under
    Editor->File and Code Templates->Catch Statement body
to
    log.error("Unhandled exception", e);
to also do this for newly generated code.

(cherry picked from commit c2ae29f)

(cherry picked from commit 6031a25)
---
 .../nightscout/androidaps/MainActivity.java   |   2 +-
 .../Services/AlarmSoundService.java           |   4 +-
 .../androidaps/Services/DataService.java      |  18 ++--
 .../nightscout/androidaps/data/IobTotal.java  |   8 +-
 .../nightscout/androidaps/data/Profile.java   |  12 +--
 .../androidaps/data/ProfileStore.java         |   8 +-
 .../androidaps/data/PumpEnactResult.java      |   6 +-
 .../androidaps/db/CareportalEvent.java        |   8 +-
 .../androidaps/db/DatabaseHelper.java         | 100 +++++++++---------
 .../nightscout/androidaps/db/DbRequest.java   |   4 +-
 .../androidaps/db/ProfileSwitch.java          |   2 +-
 .../plugins/Actions/dialogs/FillDialog.java   |   8 +-
 .../dialogs/NewExtendedBolusDialog.java       |   6 +-
 .../Actions/dialogs/NewTempBasalDialog.java   |   6 +-
 .../Dialogs/NewNSTreatmentDialog.java         |  10 +-
 .../ConfigBuilder/ConfigBuilderPlugin.java    |   4 +-
 .../ObjectivesPlugin.java                     |   4 +-
 .../IobCobCalculator/AutosensResult.java      |   5 +-
 .../androidaps/plugins/Loop/APSResult.java    |   6 +-
 .../androidaps/plugins/Loop/DeviceStatus.java |   2 +-
 .../plugins/NSClientInternal/UploadQueue.java |   4 +-
 .../NSClientInternal/acks/NSAddAck.java       |   2 +-
 .../NSClientInternal/acks/NSPingAck.java      |   8 +-
 .../broadcasts/BroadcastStatus.java           |   4 +-
 .../broadcasts/BroadcastTreatment.java        |   2 +-
 .../NSClientInternal/data/NSAlarm.java        |  12 ++-
 .../plugins/NSClientInternal/data/NSCal.java  |   2 +-
 .../NSClientInternal/data/NSDeviceStatus.java |  13 ++-
 .../plugins/NSClientInternal/data/NSMbg.java  |   2 +-
 .../data/NSSettingsStatus.java                |  28 ++---
 .../plugins/NSClientInternal/data/NSSgv.java  |  10 +-
 .../NSClientInternal/data/NSTreatment.java    |  14 ++-
 .../receivers/DBAccessReceiver.java           |  17 ++-
 .../services/NSClientService.java             |  16 +--
 .../DetermineBasalAdapterAMAJS.java           |   2 +-
 .../OpenAPSAMA/DetermineBasalResultAMA.java   |  12 ++-
 .../OpenAPSAMA/OpenAPSAMAFragment.java        |   2 +-
 .../plugins/OpenAPSAMA/OpenAPSAMAPlugin.java  |   6 +-
 .../OpenAPSMA/DetermineBasalAdapterMAJS.java  |   2 +-
 .../OpenAPSMA/DetermineBasalResultMA.java     |   7 +-
 .../plugins/OpenAPSMA/OpenAPSMAPlugin.java    |   9 +-
 .../Overview/Dialogs/BolusProgressDialog.java |   2 +-
 .../Dialogs/EditQuickWizardDialog.java        |   5 +-
 .../Overview/Dialogs/NewTreatmentDialog.java  |   6 +-
 .../Overview/Dialogs/WizardDialog.java        |   2 +-
 .../plugins/Overview/OverviewFragment.java    |   2 +-
 .../plugins/Overview/OverviewPlugin.java      |   5 +-
 .../plugins/Overview/QuickWizard.java         |  19 ++--
 .../CircadianPercentageProfilePlugin.java     |   2 +-
 .../ProfileLocal/LocalProfilePlugin.java      |   2 +-
 .../plugins/ProfileNS/NSProfilePlugin.java    |   2 +-
 .../ProfileSimple/SimpleProfilePlugin.java    |   2 +-
 .../plugins/PumpDanaR/DanaRPlugin.java        |   2 +-
 .../plugins/PumpDanaR/DanaRPump.java          |   6 +-
 .../plugins/PumpDanaR/SerialIOThread.java     |   6 +-
 .../activities/DanaRNSHistorySync.java        |   2 +-
 .../services/DanaRExecutionService.java       |   6 +-
 .../PumpDanaRKorean/DanaRKoreanPlugin.java    |   2 +-
 .../PumpDanaRKorean/SerialIOThread.java       |   6 +-
 .../services/DanaRKoreanExecutionService.java |   6 +-
 .../plugins/PumpDanaRv2/DanaRv2Plugin.java    |   2 +-
 .../plugins/PumpDanaRv2/SerialIOThread.java   |   6 +-
 .../services/DanaRv2ExecutionService.java     |   6 +-
 .../PumpVirtual/VirtualPumpPlugin.java        |   2 +-
 .../androidaps/receivers/NSAlarmReceiver.java |   5 +-
 .../nightscout/utils/ImportExportPrefs.java   |   8 +-
 .../info/nightscout/utils/JSONFormatter.java  |   7 +-
 .../java/info/nightscout/utils/NSUpload.java  |  26 ++---
 .../info/nightscout/utils/TimeListEdit.java   |  10 +-
 .../watchfaces/CircleWatchface.java           |   2 +-
 .../androidaps/watchfaces/NOChart.java        |   2 +-
 71 files changed, 325 insertions(+), 233 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 2cb501b99a..68df307dbf 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -114,7 +114,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 try { // activity may be destroyed
                     setUpTabs(true);
                 } catch (IllegalStateException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 boolean lockScreen = BuildConfig.NSCLIENTOLNY && SP.getBoolean("lockscreen", false);
                 if (lockScreen)
diff --git a/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java b/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java
index 41587e79b9..60dd92a2c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java
@@ -50,7 +50,7 @@ public class AlarmSoundService extends Service {
             player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
             afd.close();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         player.setLooping(true); // Set looping
         player.setVolume(100, 100);
@@ -59,7 +59,7 @@ public class AlarmSoundService extends Service {
             player.prepare();
             player.start();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         return START_STICKY;
diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
index 39eb023cb3..05af04230d 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
@@ -244,7 +244,7 @@ public class DataService extends IntentService {
                         MainApp.bus().post(new EventDismissNotification(Notification.OLD_NSCLIENT));
                     }
                 } catch (PackageManager.NameNotFoundException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 if (ConfigBuilderPlugin.nightscoutVersionCode < Config.SUPPORTEDNSVERSION) {
                     Notification notification = new Notification(Notification.OLD_NS, MainApp.sResources.getString(R.string.unsupportednsversion), Notification.URGENT);
@@ -269,7 +269,7 @@ public class DataService extends IntentService {
                     if (targetlow != null)
                         OverviewPlugin.bgTargetLow = targetlow;
                 } catch (JSONException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
             }
         }
@@ -298,7 +298,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         // Handle profile
@@ -313,7 +313,7 @@ public class DataService extends IntentService {
                 if (Config.logIncommingData)
                     log.debug("Received profileStore: " + activeProfile + " " + profile);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         if (intent.getAction().equals(Intents.ACTION_NEW_TREATMENT)) {
@@ -332,7 +332,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
 
         }
@@ -353,7 +353,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
@@ -376,7 +376,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
@@ -401,7 +401,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
@@ -430,7 +430,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index bd924d35b5..3240e79327 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -2,6 +2,8 @@ package info.nightscout.androidaps.data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
@@ -9,6 +11,8 @@ import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.Round;
 
 public class IobTotal {
+    private static Logger log = LoggerFactory.getLogger(IobTotal.class);
+
     public double iob;
     public double activity;
     public double bolussnooze;
@@ -86,7 +90,7 @@ public class IobTotal {
             json.put("activity", activity);
             json.put("time", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return json;
     }
@@ -100,7 +104,7 @@ public class IobTotal {
             json.put("activity", activity);
             json.put("time", DateUtil.toISOString(new Date(time)));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return json;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
index 984d92c4e5..09885448e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -109,7 +109,7 @@ public class Profile {
                 MainApp.bus().post(new EventDismissNotification(Notification.TARGET_MISSING));
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.invalidprofile));
         }
     }
@@ -129,7 +129,7 @@ public class Profile {
             try {
                 json.put("units", units);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         return json;
     }
@@ -156,7 +156,7 @@ public class Profile {
                 Double value = o.getDouble("value");
                 sparse.put(tas, value);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return sparse;
@@ -176,7 +176,7 @@ public class Profile {
                 }
                 lastValue = value;
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return lastValue;
@@ -215,7 +215,7 @@ public class Profile {
                 if (index + 1 < array.length())
                     retValue += "\n";
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return retValue;
@@ -297,7 +297,7 @@ public class Profile {
             }
             return ret;
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new BasalValue[0];
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.java b/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.java
index 3e2217454f..f97d8b5e02 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.java
@@ -50,7 +50,7 @@ public class ProfileStore {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return profile;
     }
@@ -65,7 +65,7 @@ public class ProfileStore {
                 return defaultProfileName;
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return defaultProfileName;
     }
@@ -90,7 +90,7 @@ public class ProfileStore {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return profile;
     }
@@ -108,7 +108,7 @@ public class ProfileStore {
                 ret.add(profileName);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         return ret;
diff --git a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index bfddeff320..7a4a520bee 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -5,6 +5,8 @@ import android.text.Spanned;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -12,6 +14,8 @@ import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 
 public class PumpEnactResult extends Object {
+    private static Logger log = LoggerFactory.getLogger(PumpEnactResult.class);
+
     public boolean success = false;    // request was processed successfully (but possible no change was needed)
     public boolean enacted = false;    // request was processed successfully and change has been made
     public String comment = "";
@@ -101,7 +105,7 @@ public class PumpEnactResult extends Object {
                 result.put("duration", duration);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return result;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index f65da51176..b80f4f932e 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -142,7 +142,7 @@ public class CareportalEvent implements DataPointWithLabelInterface {
                 JSONObject object = new JSONObject(json);
                 mbg = object.getDouble("mgdl");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             return Profile.fromMgdlToUnits(mbg, units);
         }
@@ -155,7 +155,7 @@ public class CareportalEvent implements DataPointWithLabelInterface {
                 units = object.getString("units");
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         if (glucose != 0d) {
             double mmol = 0d;
@@ -186,7 +186,7 @@ public class CareportalEvent implements DataPointWithLabelInterface {
             if (object.has("notes"))
                 return object.getString("notes");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return Translator.translate(eventType);
     }
@@ -198,7 +198,7 @@ public class CareportalEvent implements DataPointWithLabelInterface {
             if (object.has("duration"))
                 return object.getInt("duration") * 60 * 1000L;
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 2b4cc87f20..55533aeb4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -207,7 +207,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, ProfileSwitch.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         VirtualPumpPlugin.setFakingStatus(true);
         scheduleBgChange(); // trigger refresh
@@ -234,7 +234,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, Treatment.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleTreatmentChange();
     }
@@ -244,7 +244,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, TempTarget.class, true);
             TableUtils.createTableIfNotExists(connectionSource, TempTarget.class);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleTemporaryTargetChange();
     }
@@ -255,7 +255,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, TemporaryBasal.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         VirtualPumpPlugin.setFakingStatus(false);
         scheduleTemporaryBasalChange();
@@ -267,7 +267,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, ExtendedBolus.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleExtendedBolusChange();
     }
@@ -277,7 +277,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, CareportalEvent.class, true);
             TableUtils.createTableIfNotExists(connectionSource, CareportalEvent.class);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleCareportalEventChange();
     }
@@ -287,7 +287,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, ProfileSwitch.class, true);
             TableUtils.createTableIfNotExists(connectionSource, ProfileSwitch.class);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleProfileSwitchChange();
     }
@@ -353,7 +353,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -430,7 +430,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             bgReadings = daoBgreadings.query(preparedQuery);
             return bgReadings;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<BgReading>();
     }
@@ -441,7 +441,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoDbRequest().create(dbr);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -449,7 +449,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoDbRequest().delete(dbr);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -458,7 +458,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoDbRequest().deleteById(nsClientId);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -478,7 +478,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return delete(dbList.get(0));
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -487,7 +487,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             TableUtils.clearTable(connectionSource, DbRequest.class);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -495,7 +495,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoDbRequest().closeableIterator();
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             return null;
         }
     }
@@ -583,7 +583,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return true;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
@@ -593,7 +593,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoTreatments().delete(treatment);
             updateEarliestDataChange(treatment.date);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleTreatmentChange();
     }
@@ -603,7 +603,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoTreatments().update(treatment);
             updateEarliestDataChange(treatment.date);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleTreatmentChange();
     }
@@ -636,7 +636,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return trList.get(0);
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -685,7 +685,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             treatments = daoTreatments.query(preparedQuery);
             return treatments;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<Treatment>();
     }
@@ -715,7 +715,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             }
             createOrUpdate(treatment);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -733,7 +733,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempTargets = daoTempTargets.query(preparedQuery);
             return tempTargets;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<TempTarget>();
     }
@@ -787,7 +787,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return true;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
@@ -797,7 +797,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoTempTargets().delete(tempTarget);
             scheduleTemporaryTargetChange();
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -847,7 +847,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempTarget.source = Source.NIGHTSCOUT;
             createOrUpdate(tempTarget);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -874,7 +874,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -885,7 +885,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoDanaRHistory().createOrUpdate(record);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -900,7 +900,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             PreparedQuery<DanaRHistoryRecord> preparedQuery = queryBuilder.prepare();
             historyList = getDaoDanaRHistory().query(preparedQuery);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             historyList = new ArrayList<>();
         }
         return historyList;
@@ -927,7 +927,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 }
             }
         } catch (SQLException | JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1013,7 +1013,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return true;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
@@ -1023,7 +1023,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoTemporaryBasal().delete(tempBasal);
             updateEarliestDataChange(tempBasal.date);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleTemporaryBasalChange();
     }
@@ -1039,7 +1039,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempbasals = getDaoTemporaryBasal().query(preparedQuery);
             return tempbasals;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<TemporaryBasal>();
     }
@@ -1132,7 +1132,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 createOrUpdate(tempBasal);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1161,7 +1161,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return list.get(0);
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1242,7 +1242,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return true;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
@@ -1252,7 +1252,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoExtendedBolus().delete(extendedBolus);
             updateEarliestDataChange(extendedBolus.date);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleExtendedBolusChange();
     }
@@ -1268,7 +1268,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             extendedBoluses = getDaoExtendedBolus().query(preparedQuery);
             return extendedBoluses;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<ExtendedBolus>();
     }
@@ -1298,7 +1298,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1349,7 +1349,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             extendedBolus._id = trJson.getString("_id");
             createOrUpdate(extendedBolus);
         } catch (SQLException | JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1383,7 +1383,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoCareportalEvents().createOrUpdate(careportalEvent);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleCareportalEventChange();
     }
@@ -1392,7 +1392,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoCareportalEvents().delete(careportalEvent);
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         scheduleCareportalEventChange();
     }
@@ -1413,7 +1413,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             else
                 return null;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1429,7 +1429,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvents = getDaoCareportalEvents().query(preparedQuery);
             return careportalEvents;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<CareportalEvent>();
     }
@@ -1453,7 +1453,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     log.debug("CareportalEvent not found database: " + _id);
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1486,7 +1486,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvent._id = trJson.getString("_id");
             createOrUpdate(careportalEvent);
         } catch (SQLException | JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1521,7 +1521,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             profileSwitches = daoProfileSwitch.query(preparedQuery);
             return profileSwitches;
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return new ArrayList<ProfileSwitch>();
     }
@@ -1575,7 +1575,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return true;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
@@ -1585,7 +1585,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoProfileSwitch().delete(profileSwitch);
             scheduleProfileSwitchChange();
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1640,7 +1640,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 profileSwitch.profilePlugin = trJson.getString("profilePlugin");
             createOrUpdate(profileSwitch);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1667,7 +1667,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
index 203436661c..fcda5c9c04 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
@@ -77,7 +77,7 @@ public class DbRequest {
             if (_id != null) object.put("_id", _id);
             if (nsClientID != null) object.put("nsClientID", nsClientID);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return object;
     }
@@ -96,7 +96,7 @@ public class DbRequest {
             if (jsonObject.has("nsClientID"))
                 result.nsClientID = jsonObject.getString("nsClientID");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return result;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index fb99934382..cd5efc7465 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -60,7 +60,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
             try {
                 profile = new Profile(new JSONObject(profileJson));
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         return profile;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
index 8a4d4001cb..f434a08d96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
@@ -21,6 +21,9 @@ import android.widget.TextView;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.Constants;
@@ -37,6 +40,7 @@ import info.nightscout.utils.SP;
 import info.nightscout.utils.SafeParse;
 
 public class FillDialog extends DialogFragment implements OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(FillDialog.class);
 
     Button deliverButton;
     TextView insulin;
@@ -183,8 +187,8 @@ public class FillDialog extends DialogFragment implements OnClickListener {
             builder.setNegativeButton(getString(R.string.cancel), null);
             builder.show();
             dismiss();
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (RuntimeException e) {
+            log.error("Unhandled exception", e);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
index c85d5c4540..1bfab76993 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
@@ -17,6 +17,9 @@ import android.widget.RadioButton;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.Constants;
@@ -28,6 +31,7 @@ import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 
 public class NewExtendedBolusDialog extends DialogFragment implements View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(NewExtendedBolusDialog.class);
 
     PlusMinusEditText editInsulin;
     PlusMinusEditText editDuration;
@@ -115,7 +119,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                     dismiss();
 
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 break;
             case R.id.cancel:
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
index 9582dced87..9bd6cd26c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
@@ -19,6 +19,9 @@ import android.widget.RelativeLayout;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.MainApp;
@@ -32,6 +35,7 @@ import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 
 public class NewTempBasalDialog extends DialogFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener {
+    private static Logger log = LoggerFactory.getLogger(NewTempBasalDialog.class);
 
     RadioButton percentRadio;
     RadioButton absoluteRadio;
@@ -180,7 +184,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
                     dismiss();
 
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 break;
             case R.id.cancel:
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index b10ab5dab8..cc337d6c00 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -482,7 +482,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(editSplit.getText())) / 100 / SafeParse.stringToDouble(editDuration.getText()) * 60);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return data;
     }
@@ -577,7 +577,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 ret += "\n";
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         return ret;
@@ -596,7 +596,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                         try {
                             doProfileSwitch(profileStore, data.getString("profile"), data.getInt("duration"));
                         } catch (JSONException e) {
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                         }
                     }
                 } else if (options.executeTempTarget) {
@@ -623,13 +623,13 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                                         NSUpload.uploadCareportalEntryToNS(data);
                                         Answers.getInstance().logCustom(new CustomEvent("TempTarget"));
                                     } catch (JSONException e) {
-                                        e.printStackTrace();
+                                        log.error("Unhandled exception", e);
                                     }
                                 }
                             });
                         }
                     } catch (JSONException e) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                     }
                 } else {
                     NSUpload.uploadCareportalEntryToNS(data);
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 6bc0e1e807..aa603286f4 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
@@ -185,7 +185,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
                     if (SP.contains(settingVisible))
                         p.setFragmentVisible(type, SP.getBoolean(settingVisible, true) && SP.getBoolean(settingEnabled, true));
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
             }
         }
@@ -989,7 +989,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
             MainApp.bus().post(new EventNewNotification(notarget));
             return new Profile(new JSONObject("{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"20\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"20\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"6\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"8\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}}"));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
index e04efb70cb..81e0493746 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
@@ -227,7 +227,7 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
                 o.started = new Date(SP.getLong("Objectives" + num + "started", 0L));
                 o.accomplished = new Date(SP.getLong("Objectives" + num + "accomplished", 0L));
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         bgIsAvailableInNS = SP.getBoolean("Objectives" + "bgIsAvailableInNS", false);
@@ -235,7 +235,7 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
         try {
             manualEnacts = SP.getInt("Objectives" + "manualEnacts", 0);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         if (Config.logPrefsChange)
             log.debug("Objectives loaded");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensResult.java
index 1e40005b36..4e0f8ef107 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensResult.java
@@ -2,11 +2,14 @@ package info.nightscout.androidaps.plugins.IobCobCalculator;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created by mike on 06.01.2017.
  */
 public class AutosensResult {
+    private static Logger log = LoggerFactory.getLogger(AutosensResult.class);
 
     //default values to show when autosens algorithm is not called
     public double ratio = 1d;
@@ -24,7 +27,7 @@ public class AutosensResult {
             ret.put("sensResult", sensResult);
             ret.put("ratio", ratio);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return ret;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
index 69e161524f..a1a3d9c904 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
@@ -7,6 +7,8 @@ import android.text.Spanned;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -17,6 +19,8 @@ import info.nightscout.utils.DecimalFormatter;
  * Created by mike on 09.06.2016.
  */
 public class APSResult {
+    private static Logger log = LoggerFactory.getLogger(APSResult.class);
+
     public String reason;
     public double rate;
     public int duration;
@@ -72,7 +76,7 @@ public class APSResult {
                 json.put("reason", reason);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return json;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/DeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/DeviceStatus.java
index 3080717773..acf59865d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/DeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/DeviceStatus.java
@@ -397,7 +397,7 @@ public class DeviceStatus {
             if (uploaderBattery != 0) record.put("uploaderBattery", uploaderBattery);
             if (created_at != null) record.put("created_at" , created_at);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return record;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java
index 76a2855478..6e1c02db4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java
@@ -90,7 +90,7 @@ public class UploadQueue {
                             log.debug("Removed item from UploadQueue. " + UploadQueue.status());
                         }
                     } catch (JSONException e) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                     }
                 }
             });
@@ -126,7 +126,7 @@ public class UploadQueue {
                 iterator.close();
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return result;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAddAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAddAck.java
index b4ba0c3364..709c53f6d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAddAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAddAck.java
@@ -49,7 +49,7 @@ public class NSAddAck implements Ack {
             }
             return;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSPingAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSPingAck.java
index 2824e922aa..1ec6e3991c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSPingAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSPingAck.java
@@ -1,7 +1,11 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.acks;
 
+import android.os.SystemClock;
+
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.socket.client.Ack;
 
@@ -9,6 +13,8 @@ import io.socket.client.Ack;
  * Created by mike on 29.12.2015.
  */
 public class NSPingAck  implements Ack {
+    private static Logger log = LoggerFactory.getLogger(NSPingAck.class);
+
     public long mills = 0;
     public boolean received = false;
     public boolean auth_received = false;
@@ -27,7 +33,7 @@ public class NSPingAck  implements Ack {
                 write = authorization.optBoolean("write");
                 write_treatment = authorization.optBoolean("write_treatment");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         received = true;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
index 7c6862cb14..4ee2427af8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
@@ -32,7 +32,7 @@ public class BroadcastStatus {
             bundle.putString("nsclientversionname", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionName);
             bundle.putInt("nsclientversioncode", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionCode);
         } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         bundle.putString("nightscoutversionname", NSClientService.nightscoutVersionName);
         bundle.putInt("nightscoutversioncode", NSClientService.nightscoutVersionCode);
@@ -49,7 +49,7 @@ public class BroadcastStatus {
                 bundle.putString("nsclientversionname", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionName);
                 bundle.putInt("nsclientversioncode", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionCode);
             } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             bundle.putString("nightscoutversionname", NSClientService.nightscoutVersionName);
             bundle.putInt("nightscoutversioncode", NSClientService.nightscoutVersionCode);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
index 99644c7ba3..572cf7e055 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
@@ -192,7 +192,7 @@ public class BroadcastTreatment {
                 ret.add(newarr);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             ret = new ArrayList<>();
             ret.add(array);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSAlarm.java
index f7a7f79303..1c28b790d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSAlarm.java
@@ -2,12 +2,16 @@ package info.nightscout.androidaps.plugins.NSClientInternal.data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created by mike on 11.06.2017.
  */
 
 public class NSAlarm {
+    private static Logger log = LoggerFactory.getLogger(NSAlarm.class);
+
     JSONObject data;
 
     public NSAlarm(JSONObject data) {
@@ -20,7 +24,7 @@ public class NSAlarm {
             try {
                 retval = data.getInt("level");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
          return retval;
@@ -32,7 +36,7 @@ public class NSAlarm {
             try {
                 retval = data.getString("group");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
          return retval;
@@ -44,7 +48,7 @@ public class NSAlarm {
             try {
                 retval = data.getString("title");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
          return retval;
@@ -56,7 +60,7 @@ public class NSAlarm {
             try {
                 retval = data.getString("message");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
          return retval;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSCal.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSCal.java
index 74b5f688d9..93d46fa18e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSCal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSCal.java
@@ -19,7 +19,7 @@ public class NSCal {
             intercept = json.getDouble("intercept");
             scale = json.getDouble("scale");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             log.debug("Data: " + json.toString());
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
index 8ce3fc87e2..2a2e1b8044 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
@@ -5,6 +5,8 @@ import android.text.Spanned;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -70,6 +72,7 @@ import info.nightscout.utils.SP;
 }
  */
 public class NSDeviceStatus {
+    private static Logger log = LoggerFactory.getLogger(NSDeviceStatus.class);
 
     private static NSDeviceStatus instance = null;
 
@@ -102,7 +105,7 @@ public class NSDeviceStatus {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return "";
     }
@@ -237,7 +240,7 @@ public class NSDeviceStatus {
                 deviceStatusPumpData.extended = Html.fromHtml(exteneded.toString());
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -278,7 +281,7 @@ public class NSDeviceStatus {
                 deviceStatusOpenAPSData.clockEnacted = clock;
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -315,7 +318,7 @@ public class NSDeviceStatus {
                 string.append("<b>").append(DateUtil.minAgo(deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested.getString("reason")).append("<br>");
             return Html.fromHtml(string.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return Html.fromHtml("");
     }
@@ -353,7 +356,7 @@ public class NSDeviceStatus {
                 uploaders.put(device, uploader);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSMbg.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSMbg.java
index 79fa60c3bb..353dd49b74 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSMbg.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSMbg.java
@@ -17,7 +17,7 @@ public class NSMbg {
             mbg = json.getDouble("mgdl");
             this.json = json.toString();
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             log.debug("Data: " + json.toString());
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
index c2c3aa036f..3feced94cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
@@ -4,6 +4,8 @@ import android.support.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 import java.util.Objects;
@@ -99,6 +101,8 @@ import java.util.Objects;
  }
  */
 public class NSSettingsStatus {
+    private static Logger log = LoggerFactory.getLogger(NSSettingsStatus.class);
+
     private static NSSettingsStatus instance = null;
 
     public static NSSettingsStatus getInstance() {
@@ -160,7 +164,7 @@ public class NSSettingsStatus {
                 return new JSONObject(extended);
 
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
 
@@ -195,7 +199,7 @@ public class NSSettingsStatus {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -207,7 +211,7 @@ public class NSSettingsStatus {
             try {
                 ret = data.getString(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -219,7 +223,7 @@ public class NSSettingsStatus {
             try {
                 ret = data.getInt(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -231,7 +235,7 @@ public class NSSettingsStatus {
             try {
                 ret = data.getLong(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -243,7 +247,7 @@ public class NSSettingsStatus {
             try {
                 ret = new Date(data.getString(key));
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -255,7 +259,7 @@ public class NSSettingsStatus {
             try {
                 ret = data.getBoolean(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -301,7 +305,7 @@ public class NSSettingsStatus {
                     return pump != null  && pump.has(setting) ? pump.getDouble(setting) : 30;
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0d;
     }
@@ -317,7 +321,7 @@ public class NSSettingsStatus {
                 return pump;
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -329,7 +333,7 @@ public class NSSettingsStatus {
                 return pump.getBoolean("enableAlerts");
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
@@ -341,7 +345,7 @@ public class NSSettingsStatus {
                 return pump.getString("fields");
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return "";
     }
@@ -353,7 +357,7 @@ public class NSSettingsStatus {
                 return pump.getBoolean("enableAlerts");
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return false;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java
index 78ddc7a8f7..af134ea50d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java
@@ -2,12 +2,16 @@ package info.nightscout.androidaps.plugins.NSClientInternal.data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  * {"mgdl":105,"mills":1455136282375,"device":"xDrip-BluetoothWixel","direction":"Flat","filtered":98272,"unfiltered":98272,"noise":1,"rssi":100}
  */
 public class NSSgv {
+    private static Logger log = LoggerFactory.getLogger(NSSgv.class);
+
     private JSONObject data;
 
     public NSSgv(JSONObject obj) {
@@ -20,7 +24,7 @@ public class NSSgv {
             try {
                 ret = data.getString(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -32,7 +36,7 @@ public class NSSgv {
             try {
                 ret = data.getInt(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -44,7 +48,7 @@ public class NSSgv {
             try {
                 ret = data.getLong(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java
index 1b48f27e2f..a9f960edd0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java
@@ -2,10 +2,14 @@ package info.nightscout.androidaps.plugins.NSClientInternal.data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
 public class NSTreatment {
+    private static Logger log = LoggerFactory.getLogger(NSTreatment.class);
+
     private JSONObject data;
     private String action = null; // "update", "remove" or null (add)
 
@@ -21,7 +25,7 @@ public class NSTreatment {
             try {
                 ret = data.getString(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -33,7 +37,7 @@ public class NSTreatment {
             try {
                 ret = data.getDouble(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -45,7 +49,7 @@ public class NSTreatment {
             try {
                 ret = data.getInt(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -57,7 +61,7 @@ public class NSTreatment {
             try {
                 ret = data.getLong(key);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
@@ -69,7 +73,7 @@ public class NSTreatment {
             try {
                 ret = new Date(data.getString(key));
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return ret;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
index 3546a1d5e0..a9f3509213 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
@@ -50,9 +50,18 @@ public class DBAccessReceiver extends BroadcastReceiver {
             String _id = null;
             JSONObject data = null;
             String action = bundles.getString("action");
-            try { collection = bundles.getString("collection"); } catch (Exception e) {}
-            try { _id = bundles.getString("_id"); } catch (Exception e) {}
-            try { data = new JSONObject(bundles.getString("data")); } catch (Exception e) {}
+            try {
+                collection = bundles.getString("collection");
+            } catch (Exception e) {
+            }
+            try {
+                _id = bundles.getString("_id");
+            } catch (Exception e) {
+            }
+            try {
+                data = new JSONObject(bundles.getString("data"));
+            } catch (Exception e) {
+            }
 
             if (data == null && !action.equals("dbRemove") || _id == null && action.equals("dbRemove")) {
                 log.debug("DBACCESS no data inside record");
@@ -67,7 +76,7 @@ public class DBAccessReceiver extends BroadcastReceiver {
             try {
                 data.put("NSCLIENT_ID", nsclientid);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
 
             if (!isAllowedCollection(collection)) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
index d171f87fc8..465d5e42c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
@@ -258,7 +258,7 @@ public class NSClientService extends Service {
             authMessage.put("from", latestDateInReceivedData); // send data newer than
             authMessage.put("secret", nsAPIhashCode);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             return;
         }
         MainApp.bus().post(new EventNSClientNewLog("AUTH", "requesting auth"));
@@ -326,7 +326,7 @@ public class NSClientService extends Service {
                 try {
                     MainApp.bus().post(new EventNSClientNewLog("ANNOUNCEMENT", data.has("message") ? data.getString("message") : "received"));
                 } catch (JSONException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
             BroadcastAnnouncement.handleAnnouncement(data, getApplicationContext());
             log.debug(data.toString());
@@ -561,7 +561,7 @@ public class NSClientService extends Service {
                             }
                             MainApp.bus().post(new EventNSClientNewLog("LAST", DateUtil.dateAndTimeString(latestDateInReceivedData)));
                         } catch (JSONException e) {
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                         }
                         //MainApp.bus().post(new EventNSClientNewLog("NSCLIENT", "onDataUpdate end");
                     } finally {
@@ -583,7 +583,7 @@ public class NSClientService extends Service {
             mSocket.emit("dbUpdate", message, ack);
             MainApp.bus().post(new EventNSClientNewLog("DBUPDATE " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -597,7 +597,7 @@ public class NSClientService extends Service {
             mSocket.emit("dbUpdateUnset", message, ack);
             MainApp.bus().post(new EventNSClientNewLog("DBUPDATEUNSET " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -610,7 +610,7 @@ public class NSClientService extends Service {
             mSocket.emit("dbRemove", message, ack);
             MainApp.bus().post(new EventNSClientNewLog("DBREMOVE " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -633,7 +633,7 @@ public class NSClientService extends Service {
             mSocket.emit("dbAdd", message, ack);
             MainApp.bus().post(new EventNSClientNewLog("DBADD " + dbr.collection, "Sent " + dbr.nsClientID));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -709,7 +709,7 @@ public class NSClientService extends Service {
                         iterator.close();
                     }
                 } catch (SQLException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
 
                 MainApp.bus().post(new EventNSClientNewLog("QUEUE", "Resend ended: " + reason));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
index 7833dbf54e..44ab8ecb14 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -103,7 +103,7 @@ public class DetermineBasalAdapterAMAJS {
         try {
             result = new DetermineBasalResultAMA(v8ObjectReuslt, new JSONObject(ret));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         return result;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
index c2a55ff894..31501b7032 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
@@ -5,6 +5,8 @@ import com.eclipsesource.v8.V8Object;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -15,6 +17,8 @@ import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.data.IobTotal;
 
 public class DetermineBasalResultAMA extends APSResult {
+    private static Logger log = LoggerFactory.getLogger(DetermineBasalResultAMA.class);
+
     public Date date;
     public JSONObject json = new JSONObject();
     public double eventualBG;
@@ -69,7 +73,7 @@ public class DetermineBasalResultAMA extends APSResult {
         try {
             newResult.json = new JSONObject(json.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         newResult.eventualBG = eventualBG;
         newResult.snoozeBG = snoozeBG;
@@ -83,7 +87,7 @@ public class DetermineBasalResultAMA extends APSResult {
             JSONObject ret = new JSONObject(this.json.toString());
             return ret;
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -126,7 +130,7 @@ public class DetermineBasalResultAMA extends APSResult {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return array;
     }
@@ -151,7 +155,7 @@ public class DetermineBasalResultAMA extends APSResult {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         return latest;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java
index 419a55f057..c0d0662747 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java
@@ -112,7 +112,7 @@ public class OpenAPSAMAFragment extends SubscriberFragment implements View.OnCli
                             JSONArray iobArray = new JSONArray(determineBasalAdapterAMAJS.getIobDataParam());
                             iobDataView.setText(String.format(MainApp.sResources.getString(R.string.array_of_elements), iobArray.length()) + "\n" + JSONFormatter.format(iobArray.getString(0)));
                         } catch (JSONException e) {
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                             iobDataView.setText("JSONException");
                         }
                         profileView.setText(JSONFormatter.format(determineBasalAdapterAMAJS.getProfileParam()));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
index 53bcfcf1ec..28bc0f9e4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
@@ -160,8 +160,8 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
 
         double maxIob = SP.getDouble("openapsma_max_iob", 1.5d);
         double maxBasal = SP.getDouble("openapsma_max_basal", 1d);
-        double minBg =  Profile.toMgdl(profile.getTargetLow(), units);
-        double maxBg =  Profile.toMgdl(profile.getTargetHigh(), units);
+        double minBg = Profile.toMgdl(profile.getTargetLow(), units);
+        double maxBg = Profile.toMgdl(profile.getTargetHigh(), units);
         double targetBg = (minBg + maxBg) / 2;
 
         minBg = Round.roundTo(minBg, 0.1d);
@@ -242,7 +242,7 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         try {
             determineBasalResultAMA.json.put("timestamp", DateUtil.toISOString(now));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         lastDetermineBasalAdapterAMAJS = determineBasalAdapterAMAJS;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
index a03ef9731b..a8f797f8c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
@@ -135,7 +135,7 @@ public class DetermineBasalAdapterMAJS {
         try {
             result = new DetermineBasalResultMA(v8ObjectReuslt, new JSONObject(ret));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         storedGlucoseStatus = mV8rt.executeStringScript("JSON.stringify(" + PARAM_glucoseStatus + ");");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java
index a0cd1a75b0..23f7c14a88 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java
@@ -7,11 +7,14 @@ import com.eclipsesource.v8.V8Object;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 
 public class DetermineBasalResultMA extends APSResult {
+    private static Logger log = LoggerFactory.getLogger(DetermineBasalResultMA.class);
 
     public JSONObject json = new JSONObject();
     public double eventualBG;
@@ -70,7 +73,7 @@ public class DetermineBasalResultMA extends APSResult {
         try {
             newResult.json = new JSONObject(json.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         newResult.eventualBG = eventualBG;
         newResult.snoozeBG = snoozeBG;
@@ -84,7 +87,7 @@ public class DetermineBasalResultMA extends APSResult {
             JSONObject ret = new JSONObject(this.json.toString());
             return ret;
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
index 95f1235161..a5c2276a2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
@@ -160,8 +160,8 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
 
         double maxIob = SP.getDouble("openapsma_max_iob", 1.5d);
         double maxBasal = SafeParse.stringToDouble(SP.getString("openapsma_max_basal", "1"));
-        double minBg =  Profile.toMgdl(profile.getTargetLow(), units);
-        double maxBg =  Profile.toMgdl(profile.getTargetHigh(), units);
+        double minBg = Profile.toMgdl(profile.getTargetLow(), units);
+        double maxBg = Profile.toMgdl(profile.getTargetHigh(), units);
         double targetBg = (minBg + maxBg) / 2;
 
         minBg = Round.roundTo(minBg, 0.1d);
@@ -196,7 +196,8 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
 
         if (!checkOnlyHardLimits(profile.getDia(), "dia", 2, 7)) return;
         if (!checkOnlyHardLimits(profile.getIc(), "carbratio", 2, 100)) return;
-        if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf().doubleValue(), units), "sens", 2, 900)) return;
+        if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf().doubleValue(), units), "sens", 2, 900))
+            return;
         if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, 10)) return;
         if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, 5)) return;
 
@@ -224,7 +225,7 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
         try {
             determineBasalResultMA.json.put("timestamp", DateUtil.toISOString(now));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         lastDetermineBasalAdapterMAJS = determineBasalAdapterMAJS;
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 f536af5860..0977cf3b9a 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
@@ -171,7 +171,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
                                     try {
                                         dismiss();
                                     } catch (Exception e) {
-                                        e.printStackTrace(); // TODO: do this better way
+                                        log.error("Unhandled exception", e);
                                     }
                                 }
                             });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java
index 1179841098..95bcea7908 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java
@@ -14,6 +14,8 @@ import android.widget.EditText;
 import android.widget.Spinner;
 
 import org.json.JSONException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -27,6 +29,7 @@ import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SafeParse;
 
 public class EditQuickWizardDialog extends DialogFragment implements View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(EditQuickWizardDialog.class);
 
     QuickWizard.QuickWizardEntry entry = new QuickWizard().newEmptyItem();
     QuickWizard quickWizard = MainApp.getSpecificPlugin(OverviewPlugin.class).quickWizard;
@@ -104,7 +107,7 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
                     int validToInt = DateUtil.toSeconds(toSpinner.getSelectedItem().toString());
                     entry.storage.put("validTo", validToInt);
                 } catch (JSONException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 quickWizard.addOrUpdate(entry);
                 dismiss();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index e2edb1e76a..ccc2d277bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -19,6 +19,9 @@ import android.widget.TextView;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.text.DecimalFormat;
 import java.util.Objects;
 
@@ -35,6 +38,7 @@ import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 
 public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(NewTreatmentDialog.class);
 
     NumberPicker editCarbs;
     NumberPicker editInsulin;
@@ -130,7 +134,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     builder.show();
                     dismiss();
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 break;
             case R.id.cancel:
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index bda03a8a27..a4b6310c8d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -550,7 +550,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
             boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
             boluscalcJSON.put("insulin", calculatedTotalInsulin);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index d871bd4c40..ac5a57d963 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -664,7 +664,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
                 boluscalcJSON.put("insulin", wizard.calculatedTotalInsulin);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             if (wizard.calculatedTotalInsulin > 0d && quickWizardEntry.carbs() > 0d) {
                 DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java
index 30148f94c2..bb89a70fdf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java
@@ -4,6 +4,8 @@ import com.squareup.otto.Subscribe;
 
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -17,6 +19,7 @@ import info.nightscout.utils.SP;
  * Created by mike on 05.08.2016.
  */
 public class OverviewPlugin implements PluginBase {
+    private static Logger log = LoggerFactory.getLogger(OverviewPlugin.class);
 
     public static double bgTargetLow = 80d;
     public static double bgTargetHigh = 180d;
@@ -30,7 +33,7 @@ public class OverviewPlugin implements PluginBase {
         try {
             quickWizard.setData(new JSONArray(storedData));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         MainApp.bus().register(this);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/QuickWizard.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/QuickWizard.java
index 63ad14ab6b..2962575a68 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/QuickWizard.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/QuickWizard.java
@@ -6,6 +6,8 @@ import android.preference.PreferenceManager;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
@@ -18,6 +20,7 @@ import info.nightscout.utils.DateUtil;
  */
 
 public class QuickWizard {
+    private static Logger log = LoggerFactory.getLogger(QuickWizard.class);
 
     public class QuickWizardEntry {
         public JSONObject storage;
@@ -36,7 +39,7 @@ public class QuickWizard {
             try {
                 storage = new JSONObject(emptyData);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             position = -1;
         }
@@ -54,7 +57,7 @@ public class QuickWizard {
             try {
                 return storage.getString("buttonText");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             return "";
         }
@@ -63,7 +66,7 @@ public class QuickWizard {
             try {
                 return storage.getInt("carbs");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             return 0;
         }
@@ -80,7 +83,7 @@ public class QuickWizard {
             try {
                 return storage.getInt("validFrom");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             return 0;
         }
@@ -89,7 +92,7 @@ public class QuickWizard {
             try {
                 return storage.getInt("validTo");
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             return 0;
         }
@@ -117,7 +120,7 @@ public class QuickWizard {
         try {
             return new QuickWizardEntry((JSONObject) storage.get(position), position);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -127,7 +130,7 @@ public class QuickWizard {
             try {
                 if (new QuickWizardEntry((JSONObject) storage.get(i), i).isActive()) return true;
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return false;
@@ -157,7 +160,7 @@ public class QuickWizard {
             try {
                 storage.put(newItem.position, newItem.storage);
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         save();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
index 768cdf90e7..6158a00978 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
@@ -253,7 +253,7 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
             profile.put("units", mgdl ? Constants.MGDL : Constants.MMOL);
             store.put(profileName, profile);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         convertedProfile = new ProfileStore(json);
         convertedProfileName = profileName;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java
index 8aca0a8dbc..51d231edeb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java
@@ -229,7 +229,7 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
             profile.put("units", mgdl ? Constants.MGDL : Constants.MMOL);
             store.put("LocalProfile", profile);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         convertedProfile = new ProfileStore(json);
         convertedProfileName = "LocalProfile";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
index 758521d5a8..cb9a189ff7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
@@ -134,7 +134,7 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
                 try {
                     profile = new ProfileStore(new JSONObject(profileString));
                 } catch (JSONException e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                     profile = null;
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java
index e02f4918c2..687f45ee97 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java
@@ -191,7 +191,7 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
             profile.put("units", mgdl ? Constants.MGDL : Constants.MMOL);
             store.put("SimpleProfile", profile);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         convertedProfile = new ProfileStore(json);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
index 96871ac128..9b85807cd1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
@@ -703,7 +703,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
             pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
             pumpjson.put("clock", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return pumpjson;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
index 55fdc7ad04..7948d00d96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
@@ -3,6 +3,8 @@ package info.nightscout.androidaps.plugins.PumpDanaR;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.util.Date;
@@ -16,6 +18,8 @@ import info.nightscout.utils.SP;
  * Created by mike on 04.07.2016.
  */
 public class DanaRPump {
+    private static Logger log = LoggerFactory.getLogger(DanaRPump.class);
+
     private static DanaRPump instance = null;
 
     public static DanaRPump getInstance() {
@@ -189,7 +193,7 @@ public class DanaRPump {
             profile.put("units", units == UNITS_MGDL ? Constants.MGDL : Constants.MMOL);
             store.put(PROFILE_PREFIX + (activeProfile + 1), profile);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         } catch (Exception e) {
             return null;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
index 461b353c3e..9cac697486 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
@@ -44,7 +44,7 @@ public class SerialIOThread extends Thread {
             mOutputStream = mRfCommSocket.getOutputStream();
             mInputStream = mRfCommSocket.getInputStream();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         this.start();
     }
@@ -158,7 +158,7 @@ public class SerialIOThread extends Thread {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
             log.error("sendMessage write exception: ", e);
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         synchronized (message) {
@@ -166,7 +166,7 @@ public class SerialIOThread extends Thread {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java
index 0668a74c1d..e7813fac10 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java
@@ -220,7 +220,7 @@ public class DanaRNSHistorySync {
             MainApp.bus().post(ev);
 
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
index 606eab3794..56d07b1892 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
@@ -209,9 +209,9 @@ public class DanaRExecutionService extends Service {
                 try {
                     mRfcommSocket.connect();
                 } catch (IOException e) {
-                    //e.printStackTrace();
+                    //log.error("Unhandled exception", e);
                     if (e.getMessage().contains("socket closed")) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                         break;
                     }
                 }
@@ -352,7 +352,7 @@ public class DanaRExecutionService extends Service {
                 NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return true;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
index e912eac0b4..d688010de6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
@@ -700,7 +700,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
             pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
             pumpjson.put("clock", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return pumpjson;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
index 597a49a676..2c1cf901d6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
@@ -45,7 +45,7 @@ public class SerialIOThread extends Thread {
             mOutputStream = mRfCommSocket.getOutputStream();
             mInputStream = mRfCommSocket.getInputStream();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         this.start();
     }
@@ -159,7 +159,7 @@ public class SerialIOThread extends Thread {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
             log.error("sendMessage write exception: ", e);
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         synchronized (message) {
@@ -167,7 +167,7 @@ public class SerialIOThread extends Thread {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
index b7c9f8ca2c..15f8b82c91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
@@ -205,9 +205,9 @@ public class DanaRKoreanExecutionService extends Service {
                 try {
                     mRfcommSocket.connect();
                 } catch (IOException e) {
-                    //e.printStackTrace();
+                    //log.error("Unhandled exception", e);
                     if (e.getMessage().contains("socket closed")) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                         break;
                     }
                 }
@@ -345,7 +345,7 @@ public class DanaRKoreanExecutionService extends Service {
                 NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return true;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
index 82bbc23e5c..65d3917381 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
@@ -632,7 +632,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
             pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
             pumpjson.put("clock", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return pumpjson;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
index 0b67b6acc6..b5a0b4768e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
@@ -45,7 +45,7 @@ public class SerialIOThread extends Thread {
             mOutputStream = mRfCommSocket.getOutputStream();
             mInputStream = mRfCommSocket.getInputStream();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         this.start();
     }
@@ -159,7 +159,7 @@ public class SerialIOThread extends Thread {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
             log.error("sendMessage write exception: ", e);
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         synchronized (message) {
@@ -167,7 +167,7 @@ public class SerialIOThread extends Thread {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
index 0ac333787a..0a4ebcfac0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
@@ -180,9 +180,9 @@ public class DanaRv2ExecutionService extends Service {
                 try {
                     mRfcommSocket.connect();
                 } catch (IOException e) {
-                    //e.printStackTrace();
+                    //log.error("Unhandled exception", e);
                     if (e.getMessage().contains("socket closed")) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                         break;
                     }
                 }
@@ -325,7 +325,7 @@ public class DanaRv2ExecutionService extends Service {
                 NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return true;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
index c04ec9b12f..b87b219556 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
@@ -415,7 +415,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
             pump.put("reservoir", reservoirInUnits);
             pump.put("clock", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return pump;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java
index bff2e6695a..c4a9fa89b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java
@@ -7,6 +7,8 @@ import android.os.Bundle;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.Services.Intents;
@@ -16,6 +18,7 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 public class NSAlarmReceiver extends BroadcastReceiver {
+    private static Logger log = LoggerFactory.getLogger(NSAlarmReceiver.class);
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -27,7 +30,7 @@ public class NSAlarmReceiver extends BroadcastReceiver {
         try {
             json = new JSONObject(data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             return;
         }
         NSAlarm nsAlarm = new NSAlarm(json);
diff --git a/app/src/main/java/info/nightscout/utils/ImportExportPrefs.java b/app/src/main/java/info/nightscout/utils/ImportExportPrefs.java
index 1e501fbdf0..b8eb49e98e 100644
--- a/app/src/main/java/info/nightscout/utils/ImportExportPrefs.java
+++ b/app/src/main/java/info/nightscout/utils/ImportExportPrefs.java
@@ -76,9 +76,9 @@ public class ImportExportPrefs {
                             ToastUtils.showToastInUiThread(c, MainApp.sResources.getString(R.string.exported));
                         } catch (FileNotFoundException e) {
                             ToastUtils.showToastInUiThread(c, MainApp.sResources.getString(R.string.filenotfound) + " " + file);
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                         } catch (IOException e) {
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                         }
                     }
                 })
@@ -127,9 +127,9 @@ public class ImportExportPrefs {
                             });
                         } catch (FileNotFoundException e) {
                             ToastUtils.showToastInUiThread(c, MainApp.sResources.getString(R.string.filenotfound) + " " + file);
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                         } catch (IOException e) {
-                            e.printStackTrace();
+                            log.error("Unhandled exception", e);
                         }
                     }
                 })
diff --git a/app/src/main/java/info/nightscout/utils/JSONFormatter.java b/app/src/main/java/info/nightscout/utils/JSONFormatter.java
index a37169f061..499ba01652 100644
--- a/app/src/main/java/info/nightscout/utils/JSONFormatter.java
+++ b/app/src/main/java/info/nightscout/utils/JSONFormatter.java
@@ -6,6 +6,8 @@ import android.text.Spanned;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Iterator;
 
@@ -13,6 +15,7 @@ import java.util.Iterator;
  * Created by mike on 11.07.2016.
  */
 public class JSONFormatter {
+    private static Logger log = LoggerFactory.getLogger(JSONFormatter.class);
 
     public static Spanned format(final String jsonString) {
         final JsonVisitor visitor = new JsonVisitor(4, ' ');
@@ -24,7 +27,7 @@ public class JSONFormatter {
             else
                 return Html.fromHtml(visitor.visit(new JSONObject(jsonString), 0));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             return Html.fromHtml("");
         }
     }
@@ -34,7 +37,7 @@ public class JSONFormatter {
         try {
             return Html.fromHtml(visitor.visit(object, 0));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
             return Html.fromHtml("");
         }
     }
diff --git a/app/src/main/java/info/nightscout/utils/NSUpload.java b/app/src/main/java/info/nightscout/utils/NSUpload.java
index 09ecbc9370..e6cb358ac1 100644
--- a/app/src/main/java/info/nightscout/utils/NSUpload.java
+++ b/app/src/main/java/info/nightscout/utils/NSUpload.java
@@ -61,7 +61,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, data.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -98,7 +98,7 @@ public class NSUpload {
                 DbLogger.dbAdd(intent, data.toString());
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -123,7 +123,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, data.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -151,7 +151,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, data.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -179,7 +179,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, data.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -240,7 +240,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, deviceStatus.mongoRecord().toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -264,7 +264,7 @@ public class NSUpload {
             if (detailedBolusInfo.carbTime != 0)
                 data.put("preBolus", detailedBolusInfo.carbTime);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         uploadCareportalEntryToNS(data);
     }
@@ -286,7 +286,7 @@ public class NSUpload {
             data.put("enteredBy", MainApp.instance().getString(R.string.app_name));
             uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -315,7 +315,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, data.toString());
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
     }
@@ -333,7 +333,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbRemove(intent, _id);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
     }
@@ -356,7 +356,7 @@ public class NSUpload {
             context.sendBroadcast(intent);
             DbLogger.dbAdd(intent, data.toString());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -372,7 +372,7 @@ public class NSUpload {
             data.put("notes", error);
             data.put("isAnnouncement", true);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         bundle.putString("data", data.toString());
         Intent intent = new Intent(Intents.ACTION_DATABASE);
@@ -394,7 +394,7 @@ public class NSUpload {
                 data.put("created_at", DateUtil.toISOString(new Date()));
                 data.put("notes", MainApp.sResources.getString(R.string.androidaps_start));
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
             bundle.putString("data", data.toString());
             Intent intent = new Intent(Intents.ACTION_DATABASE);
diff --git a/app/src/main/java/info/nightscout/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/utils/TimeListEdit.java
index 2ad591b1ef..8a1fac75a3 100644
--- a/app/src/main/java/info/nightscout/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/utils/TimeListEdit.java
@@ -253,7 +253,7 @@ public class TimeListEdit {
                 return item.getInt("timeAsSeconds");
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -265,7 +265,7 @@ public class TimeListEdit {
                 return item.getDouble("value");
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return 0d;
     }
@@ -278,7 +278,7 @@ public class TimeListEdit {
                     return item.getDouble("value");
                 }
             } catch (JSONException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
         return 0d;
@@ -305,7 +305,7 @@ public class TimeListEdit {
             }
             if (save != null) save.run();
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
     }
@@ -322,7 +322,7 @@ public class TimeListEdit {
             editItem(index, timeAsSeconds, value1, value2);
             if (save != null) save.run();
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
     }
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
index f9df8eb97e..e7b11400ff 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
@@ -507,7 +507,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh
                     try {
                         Thread.sleep(40);
                     } catch (InterruptedException e) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                     }
                 }
                 setIsAnimated(false);
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
index ab283e8656..8e810d86ae 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
@@ -430,7 +430,7 @@ public class NOChart extends WatchFace implements SharedPreferences.OnSharedPref
                     try {
                         Thread.sleep(40);
                     } catch (InterruptedException e) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                     }
                 }
                 mSgv.getPaint().setShader(null);

From 5c3ec9a0860079959708a7481d28d9b9f0efa03d Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 6 Sep 2017 20:00:36 +0200
Subject: [PATCH 30/53] Use SystemClock.sleep instead of Thread.sleep.

Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
---
 .../java/info/nightscout/androidaps/MainApp.java |  6 ++----
 .../plugins/NSClientInternal/UploadQueue.java    |  6 ++----
 .../Overview/Dialogs/BolusProgressDialog.java    |  7 ++-----
 .../plugins/PumpDanaR/SerialIOThread.java        |  6 ++----
 .../services/DanaRExecutionService.java          |  7 ++-----
 .../plugins/PumpDanaRKorean/SerialIOThread.java  |  6 ++----
 .../services/DanaRKoreanExecutionService.java    |  7 ++-----
 .../plugins/PumpDanaRv2/SerialIOThread.java      |  6 ++----
 .../services/DanaRv2ExecutionService.java        |  7 ++-----
 .../plugins/PumpVirtual/VirtualPumpPlugin.java   | 16 ++++------------
 .../java/info/nightscout/utils/OKDialog.java     | 11 +++--------
 .../androidaps/data/ListenerService.java         |  7 ++-----
 .../androidaps/watchfaces/BIGChart.java          |  7 ++-----
 .../androidaps/watchfaces/CircleWatchface.java   |  7 ++-----
 .../androidaps/watchfaces/NOChart.java           |  7 ++-----
 15 files changed, 33 insertions(+), 80 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 18727d87f0..fcd92331b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
+import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 
@@ -167,10 +168,7 @@ public class MainApp extends Application {
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
-                try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException e) {
-                }
+                SystemClock.sleep(5000);
                 PumpInterface pump = MainApp.getConfigBuilder();
                 if (pump != null)
                     pump.refreshDataFromPump("Initialization");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java
index 6e1c02db4c..114ace4c30 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/UploadQueue.java
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.NSClientInternal;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.SystemClock;
 
 import com.j256.ormlite.dao.CloseableIterator;
 
@@ -35,10 +36,7 @@ public class UploadQueue {
         if (NSClientService.handler == null) {
             Context context = MainApp.instance();
             context.startService(new Intent(context, NSClientService.class));
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-            }
+            SystemClock.sleep(2000);
         }
     }
 
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 0977cf3b9a..de0d73e706 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
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.Overview.Dialogs;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -156,11 +157,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
-                try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+                SystemClock.sleep(5000);
                 BolusProgressDialog.bolusEnded = true;
                 Activity activity = getActivity();
                 if (activity != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
index 9cac697486..fabda4e26a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.PumpDanaR;
 
 import android.bluetooth.BluetoothSocket;
+import android.os.SystemClock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -170,10 +171,7 @@ public class SerialIOThread extends Thread {
             }
         }
 
-        try {
-            Thread.sleep(200);
-        } catch (InterruptedException e) {
-        }
+        SystemClock.sleep(200);
         if (!message.received) {
             log.warn("Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
index 56d07b1892..3f91fd659a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
@@ -11,6 +11,7 @@ import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.os.SystemClock;
 
 import com.squareup.otto.Subscribe;
 
@@ -552,10 +553,6 @@ public class DanaRExecutionService extends Service {
     }
 
     private void waitMsec(long msecs) {
-        try {
-            Thread.sleep(msecs);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        SystemClock.sleep(msecs);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
index 2c1cf901d6..5a8b7fe564 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.PumpDanaRKorean;
 
 import android.bluetooth.BluetoothSocket;
+import android.os.SystemClock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -171,10 +172,7 @@ public class SerialIOThread extends Thread {
             }
         }
 
-        try {
-            Thread.sleep(200);
-        } catch (InterruptedException e) {
-        }
+        SystemClock.sleep(200);
         if (!message.received) {
             log.warn("Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
index 15f8b82c91..648159f214 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
@@ -11,6 +11,7 @@ import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.os.SystemClock;
 
 import com.squareup.otto.Subscribe;
 
@@ -524,10 +525,6 @@ public class DanaRKoreanExecutionService extends Service {
     }
 
     private void waitMsec(long msecs) {
-        try {
-            Thread.sleep(msecs);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        SystemClock.sleep(msecs);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
index b5a0b4768e..130657b14d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.PumpDanaRv2;
 
 import android.bluetooth.BluetoothSocket;
+import android.os.SystemClock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -171,10 +172,7 @@ public class SerialIOThread extends Thread {
             }
         }
 
-        try {
-            Thread.sleep(200);
-        } catch (InterruptedException e) {
-        }
+        SystemClock.sleep(200);
         if (!message.received) {
             log.warn("Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
index 0a4ebcfac0..e73c9d65f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
@@ -11,6 +11,7 @@ import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.os.SystemClock;
 
 import com.squareup.otto.Subscribe;
 
@@ -554,10 +555,6 @@ public class DanaRv2ExecutionService extends Service {
     }
 
     private void waitMsec(long msecs) {
-        try {
-            Thread.sleep(msecs);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        SystemClock.sleep(msecs);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
index b87b219556..3f7e689275 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.PumpVirtual;
 
 import android.content.SharedPreferences;
+import android.os.SystemClock;
 import android.preference.PreferenceManager;
 
 import org.json.JSONException;
@@ -222,28 +223,19 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         Double delivering = 0d;
 
         while (delivering < detailedBolusInfo.insulin) {
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-            }
+            SystemClock.sleep(200);
             EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
             bolusingEvent.status = String.format(MainApp.sResources.getString(R.string.bolusdelivering), delivering);
             bolusingEvent.percent = Math.min((int) (delivering / detailedBolusInfo.insulin * 100), 100);
             MainApp.bus().post(bolusingEvent);
             delivering += 0.1d;
         }
-        try {
-            Thread.sleep(200);
-        } catch (InterruptedException e) {
-        }
+        SystemClock.sleep(200);
         EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
         bolusingEvent.status = String.format(MainApp.sResources.getString(R.string.bolusdelivered), detailedBolusInfo.insulin);
         bolusingEvent.percent = 100;
         MainApp.bus().post(bolusingEvent);
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-        }
+        SystemClock.sleep(1000);
         if (Config.logPumpComm)
             log.debug("Delivering treatment insulin: " + detailedBolusInfo.insulin + "U carbs: " + detailedBolusInfo.carbs + "g " + result);
         MainApp.bus().post(new EventVirtualPumpUpdateGui());
diff --git a/app/src/main/java/info/nightscout/utils/OKDialog.java b/app/src/main/java/info/nightscout/utils/OKDialog.java
index 72e0ddd8d2..6bd84cbe71 100644
--- a/app/src/main/java/info/nightscout/utils/OKDialog.java
+++ b/app/src/main/java/info/nightscout/utils/OKDialog.java
@@ -2,6 +2,7 @@ package info.nightscout.utils;
 
 import android.app.Activity;
 import android.content.DialogInterface;
+import android.os.SystemClock;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.view.ContextThemeWrapper;
 import android.text.Spanned;
@@ -28,10 +29,7 @@ public class OKDialog {
                 public void onClick(DialogInterface dialog, int which) {
                     dialog.dismiss();
                     if (runnable != null) {
-                        try {
-                            Thread.sleep(100);
-                        } catch (InterruptedException e) {
-                        }
+                        SystemClock.sleep(100);
                         activity.runOnUiThread(runnable);
                     }
                 }
@@ -52,10 +50,7 @@ public class OKDialog {
                 public void onClick(DialogInterface dialog, int which) {
                     dialog.dismiss();
                     if (runnable != null) {
-                        try {
-                            Thread.sleep(100);
-                        } catch (InterruptedException e) {
-                        }
+                        SystemClock.sleep(100);
                         activity.runOnUiThread(runnable);
                     }
                 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
index 711e6a76f4..af1b2f7bac 100644
--- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
+++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.app.NotificationCompat;
@@ -400,11 +401,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp
 
         @Override
         public void run() {
-            try {
-                Thread.sleep(seconds * 1000);
-            } catch (InterruptedException e) {
-                //e.printStackTrace();
-            }
+            SystemClock.sleep(seconds * 1000);
             synchronized (this) {
                 if(valid) {
                     NotificationManagerCompat notificationManager =
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
index 510382b20b..25fe619b2a 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
@@ -15,6 +15,7 @@ import android.graphics.Rect;
 import android.graphics.Shader;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
@@ -473,11 +474,7 @@ public class BIGChart extends WatchFace implements SharedPreferences.OnSharedPre
                 setIsAnimated(true);
                 for (int i = 0; i <= 8 * 1000 / 40; i++) {
                     updateRainbow();
-                    try {
-                        Thread.sleep(40);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
+                    SystemClock.sleep(40);
                 }
                 mSgv.getPaint().setShader(null);
                 setIsAnimated(false);
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
index e7b11400ff..73930d8365 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
@@ -15,6 +15,7 @@ import android.graphics.RectF;
 import android.graphics.Shader;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.wearable.watchface.WatchFaceStyle;
@@ -504,11 +505,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh
                 setIsAnimated(true);
                 for (int i = 0; i <= 8 * 1000 / 40; i++) {
                     animationStep();
-                    try {
-                        Thread.sleep(40);
-                    } catch (InterruptedException e) {
-                        log.error("Unhandled exception", e);
-                    }
+                    SystemClock.sleep(40);
                 }
                 setIsAnimated(false);
                 prepareDrawTime();
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
index 8e810d86ae..9bb452c480 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
@@ -15,6 +15,7 @@ import android.graphics.Rect;
 import android.graphics.Shader;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
@@ -427,11 +428,7 @@ public class NOChart extends WatchFace implements SharedPreferences.OnSharedPref
                 setIsAnimated(true);
                 for (int i = 0; i <= 8 * 1000 / 40; i++) {
                     updateRainbow();
-                    try {
-                        Thread.sleep(40);
-                    } catch (InterruptedException e) {
-                        log.error("Unhandled exception", e);
-                    }
+                    SystemClock.sleep(40);
                 }
                 mSgv.getPaint().setShader(null);
                 setIsAnimated(false);

From c227e0e5faf4319c164ca19df0114ba70cdc7acd Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 9 Sep 2017 00:53:26 +0200
Subject: [PATCH 31/53] Dead code be gone.

(cherry picked from commit bb626ce)
---
 .../plugins/Overview/Dialogs/BolusProgressDialog.java     | 8 --------
 .../plugins/PumpDanaR/services/DanaRExecutionService.java | 2 --
 .../services/DanaRKoreanExecutionService.java             | 2 --
 .../PumpDanaRv2/services/DanaRv2ExecutionService.java     | 2 --
 4 files changed, 14 deletions(-)

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 de0d73e706..192bffba3c 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
@@ -23,7 +23,6 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRBolusStart;
 
 public class BolusProgressDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(BolusProgressDialog.class);
@@ -37,8 +36,6 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     public static boolean bolusEnded = false;
     public static boolean running = true;
 
-    boolean started = false;
-
     public BolusProgressDialog() {
         super();
     }
@@ -124,11 +121,6 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         }
     }
 
-    @Subscribe
-    public void onStatusEvent(final EventDanaRBolusStart ev) {
-        started = true;
-    }
-
     @Subscribe
     public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) {
         if(BolusProgressDialog.running){
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
index 3f91fd659a..419d5feb2c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
@@ -76,7 +76,6 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRBolusStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.Overview.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
@@ -416,7 +415,6 @@ public class DanaRExecutionService extends Service {
         }
 
         MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
-        MainApp.bus().post(new EventDanaRBolusStart());
         long startTime = System.currentTimeMillis();
 
         if (!stop.stopped) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
index 648159f214..470d526360 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
@@ -67,7 +67,6 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRBolusStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.SerialIOThread;
@@ -409,7 +408,6 @@ public class DanaRKoreanExecutionService extends Service {
         }
 
         MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
-        MainApp.bus().post(new EventDanaRBolusStart());
 
         if (!stop.stopped) {
             mSerialIOThread.sendMessage(start);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
index e73c9d65f8..618549a4ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
@@ -38,7 +38,6 @@ import info.nightscout.androidaps.plugins.Overview.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.*;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRBolusStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.SerialIOThread;
@@ -413,7 +412,6 @@ public class DanaRv2ExecutionService extends Service {
         }
         if (amount > 0) {
             MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
-            MainApp.bus().post(new EventDanaRBolusStart());
 
             if (!stop.stopped) {
                 mSerialIOThread.sendMessage(start);

From c11455dff1f72ade66313b7725929141f5689aea Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 9 Sep 2017 01:31:24 +0200
Subject: [PATCH 32/53] Make the BolusProgress dialog a bit more
 self-contained.

(cherry picked from commit 75db72a)
---
 .../plugins/ConfigBuilder/ConfigBuilderPlugin.java           | 1 -
 .../plugins/Overview/Dialogs/BolusProgressDialog.java        | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 aa603286f4..af5eeb6376 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
@@ -455,7 +455,6 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
 
         result = activePump.deliverTreatment(detailedBolusInfo);
 
-        BolusProgressDialog.bolusEnded = true;
         MainApp.bus().post(new EventDismissBolusprogressIfRunning(result));
 
         mWakeLock.release();
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..50a2a8b50f 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
@@ -33,8 +33,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     BolusProgressHelperActivity helperActivity;
 
     static double amount;
-    public static boolean bolusEnded = false;
-    public static boolean running = true;
+    private static boolean bolusEnded = false;
+    private static boolean running = true;
 
     public BolusProgressDialog() {
         super();
@@ -124,6 +124,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     @Subscribe
     public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) {
         if(BolusProgressDialog.running){
+            bolusEnded = true;
             dismiss();
         }
     }

From 612efa6a133a9ff2edda71df7a4061d08da3d402 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 9 Sep 2017 18:16:13 +0200
Subject: [PATCH 33/53] Revert "Make the BolusProgress dialog a bit more
 self-contained."

Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).

This reverts commit c11455dff1f72ade66313b7725929141f5689aea.
---
 .../plugins/ConfigBuilder/ConfigBuilderPlugin.java           | 1 +
 .../plugins/Overview/Dialogs/BolusProgressDialog.java        | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

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 af5eeb6376..aa603286f4 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
@@ -455,6 +455,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
 
         result = activePump.deliverTreatment(detailedBolusInfo);
 
+        BolusProgressDialog.bolusEnded = true;
         MainApp.bus().post(new EventDismissBolusprogressIfRunning(result));
 
         mWakeLock.release();
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 50a2a8b50f..192bffba3c 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
@@ -33,8 +33,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     BolusProgressHelperActivity helperActivity;
 
     static double amount;
-    private static boolean bolusEnded = false;
-    private static boolean running = true;
+    public static boolean bolusEnded = false;
+    public static boolean running = true;
 
     public BolusProgressDialog() {
         super();
@@ -124,7 +124,6 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     @Subscribe
     public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) {
         if(BolusProgressDialog.running){
-            bolusEnded = true;
             dismiss();
         }
     }

From 936ce42cc0fb255f383e4438923a42c84ea1af5e Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sun, 10 Sep 2017 14:24:00 +0200
Subject: [PATCH 34/53] Remove duplicate logging.

---
 .../nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java | 2 --
 .../androidaps/plugins/PumpDanaRKorean/SerialIOThread.java      | 2 --
 .../androidaps/plugins/PumpDanaRv2/SerialIOThread.java          | 2 --
 3 files changed, 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
index fabda4e26a..af3b852aa6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
@@ -159,7 +159,6 @@ public class SerialIOThread extends Thread {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
             log.error("sendMessage write exception: ", e);
-            log.error("Unhandled exception", e);
         }
 
         synchronized (message) {
@@ -167,7 +166,6 @@ public class SerialIOThread extends Thread {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                log.error("Unhandled exception", e);
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
index 5a8b7fe564..566b32831f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
@@ -160,7 +160,6 @@ public class SerialIOThread extends Thread {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
             log.error("sendMessage write exception: ", e);
-            log.error("Unhandled exception", e);
         }
 
         synchronized (message) {
@@ -168,7 +167,6 @@ public class SerialIOThread extends Thread {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                log.error("Unhandled exception", e);
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
index 130657b14d..244014f3d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
@@ -160,7 +160,6 @@ public class SerialIOThread extends Thread {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
             log.error("sendMessage write exception: ", e);
-            log.error("Unhandled exception", e);
         }
 
         synchronized (message) {
@@ -168,7 +167,6 @@ public class SerialIOThread extends Thread {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                log.error("Unhandled exception", e);
             }
         }
 

From 07b04b8abfad42a9e13553395b88b7d0069b45ec Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Tue, 12 Sep 2017 01:23:38 +0200
Subject: [PATCH 35/53] Use correct units for low/high from TT.

---
 app/src/main/java/info/nightscout/utils/BolusWizard.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/BolusWizard.java b/app/src/main/java/info/nightscout/utils/BolusWizard.java
index 984454005c..ec5c0ec02b 100644
--- a/app/src/main/java/info/nightscout/utils/BolusWizard.java
+++ b/app/src/main/java/info/nightscout/utils/BolusWizard.java
@@ -67,8 +67,8 @@ public class BolusWizard {
         targetBGLow = specificProfile.getTargetLow();
         targetBGHigh = specificProfile.getTargetHigh();
         if (tempTarget != null) {
-            targetBGLow = tempTarget.low;
-            targetBGHigh = tempTarget.high;
+            targetBGLow = Profile.fromMgdlToUnits(tempTarget.low, specificProfile.getUnits());
+            targetBGHigh = Profile.fromMgdlToUnits(tempTarget.high, specificProfile.getUnits());
         }
         if (bg <= targetBGLow) {
             bgDiff = bg - targetBGLow;

From cb3b472488871b08fdf42f5c557f058a5de3f6d9 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 13 Sep 2017 12:59:29 +0200
Subject: [PATCH 36/53] VirtualPump: set PumpEnactResult.enacted.

(cherry picked from commit ec49bc3)
---
 .../androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
index c04ec9b12f..3a281d01b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
@@ -217,6 +217,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         result.success = true;
         result.bolusDelivered = detailedBolusInfo.insulin;
         result.carbsDelivered = detailedBolusInfo.carbs;
+        result.enacted = result.bolusDelivered > 0 || result.carbsDelivered > 0;
         result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
 
         Double delivering = 0d;

From e350c8c3c3e3e646c6f14471cee3ff98166e24c9 Mon Sep 17 00:00:00 2001
From: Wouter Lagerweij <wouter@lagerweij.com>
Date: Sun, 17 Sep 2017 00:53:16 +0200
Subject: [PATCH 37/53] Rounding fix

---
 .../java/info/nightscout/utils/Round.java     | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/utils/Round.java b/app/src/main/java/info/nightscout/utils/Round.java
index 26a4d5abce..d8bc76502b 100644
--- a/app/src/main/java/info/nightscout/utils/Round.java
+++ b/app/src/main/java/info/nightscout/utils/Round.java
@@ -1,15 +1,42 @@
 package info.nightscout.utils;
 
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.math.BigDecimal;
+
 /**
  * Created by mike on 20.06.2016.
  */
 public class Round {
-    public static Double roundTo(double x, Double step) {
+    public static Double roundTo(Double x, Double step) {
+
+        if (step > 1) {
+            return roundToWhole(x, step);
+        } else {
+            return roundToNrOfDecimals(x, getDecimalsFromStep(step));
+        }
+    }
+
+    private static int getDecimalsFromStep(Double step) {
+        String stepString = Double.toString(step);
+        return stepString.substring(stepString.indexOf('.') + 1).length();
+    }
+
+    private static Double roundToNrOfDecimals(Double x, int decimals) {
+        BigDecimal number = new BigDecimal(Double.toString(x));
+        number = number.setScale(decimals, BigDecimal.ROUND_HALF_UP);
+
+        return number.doubleValue();
+    }
+
+    private static Double roundToWhole(Double x, Double step) {
         if (x != 0d) {
             return Math.round(x / step) * step;
         }
         return 0d;
     }
+
     public static Double floorTo(Double x, Double step) {
         if (x != 0d) {
             return Math.floor(x / step) * step;

From aaa3f648d071964aab4871bd3593be5a4c7785a1 Mon Sep 17 00:00:00 2001
From: Wouter Lagerweij <wouter@lagerweij.com>
Date: Sun, 17 Sep 2017 00:56:00 +0200
Subject: [PATCH 38/53] Removed unused imports

---
 app/src/main/java/info/nightscout/utils/Round.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/Round.java b/app/src/main/java/info/nightscout/utils/Round.java
index d8bc76502b..9cd2ea0acb 100644
--- a/app/src/main/java/info/nightscout/utils/Round.java
+++ b/app/src/main/java/info/nightscout/utils/Round.java
@@ -1,8 +1,5 @@
 package info.nightscout.utils;
 
-import android.support.annotation.NonNull;
-import android.util.Log;
-
 import java.math.BigDecimal;
 
 /**

From 4bda2227868eb4f5d4bc67e71ab36364c2b6b73d Mon Sep 17 00:00:00 2001
From: Dylan Leonard <dylan.a.leonard@gmail.com>
Date: Sat, 16 Sep 2017 19:27:10 -0400
Subject: [PATCH 39/53] Merge branch 'dev' of
 C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1d3591c8a4..6cbe7a6222 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

From 91f0c2130684ad5d50806c9932d062dbed98f8d5 Mon Sep 17 00:00:00 2001
From: Dylan Leonard <dylan.a.leonard@gmail.com>
Date: Sat, 16 Sep 2017 19:30:07 -0400
Subject: [PATCH 40/53] Changed how time strings are parsed to fix a problem
 where PM times were being saved as the AM version any time toSeconds was
 called

---
 app/src/main/java/info/nightscout/utils/DateUtil.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java
index bf2c1ba1fd..e94188f826 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/utils/DateUtil.java
@@ -85,15 +85,15 @@ public class DateUtil {
     }
 
     public static int toSeconds(String hh_colon_mm) {
-        Pattern p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.|)");
+        Pattern p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM | PM)");
         Matcher m = p.matcher(hh_colon_mm);
         int retval = 0;
 
         if (m.find()) {
             retval = SafeParse.stringToInt(m.group(1)) * 60 * 60 + SafeParse.stringToInt(m.group(2)) * 60;
-            if (m.group(3).equals(" .a.m") && m.group(1).equals("12"))
+            if (m.group(3).equals(" AM") && m.group(1).equals("12"))
                 retval -= 12 * 60 * 60;
-            if (m.group(3).equals(" p.m.") && !m.group(1).equals("12"))
+            if (m.group(3).equals(" PM") && !(m.group(1).equals("12")))
                 retval += 12 * 60 * 60;
         }
         return retval;

From db4d203437e82921c0f2f2d0969950dfdb988e97 Mon Sep 17 00:00:00 2001
From: Dylan Leonard <dylan.a.leonard@gmail.com>
Date: Sat, 16 Sep 2017 20:02:08 -0400
Subject: [PATCH 41/53] Revert "Merge branch 'dev' of
 C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."

This reverts commit 4bda2227868eb4f5d4bc67e71ab36364c2b6b73d.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6cbe7a6222..1d3591c8a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

From 02c2213545d703e3a5861b83e54ffad8cc33c310 Mon Sep 17 00:00:00 2001
From: Wouter Lagerweij <wouter@lagerweij.com>
Date: Sun, 17 Sep 2017 14:27:49 +0200
Subject: [PATCH 42/53] Changed rounding to use BigDecimals to avoid noisy long
 doubles in output

---
 .../java/info/nightscout/utils/Round.java     | 52 +++++++------------
 .../java/info/nightscout/utils/RoundTest.java |  3 +-
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/Round.java b/app/src/main/java/info/nightscout/utils/Round.java
index 9cd2ea0acb..a45714ad45 100644
--- a/app/src/main/java/info/nightscout/utils/Round.java
+++ b/app/src/main/java/info/nightscout/utils/Round.java
@@ -7,43 +7,31 @@ import java.math.BigDecimal;
  */
 public class Round {
     public static Double roundTo(Double x, Double step) {
+        return round(x, step, BigDecimal.ROUND_HALF_UP);
+    }
 
-        if (step > 1) {
-            return roundToWhole(x, step);
-        } else {
-            return roundToNrOfDecimals(x, getDecimalsFromStep(step));
-        }
+    public static Double floorTo(Double x, Double step) {
+        return round(x, step, BigDecimal.ROUND_FLOOR);
+    }
+
+    public static Double ceilTo(Double x, Double step) {
+        return round(x, step, BigDecimal.ROUND_CEILING);
+    }
+
+    private static Double round(Double x, Double step, int roundingMode) {
+        BigDecimal numberToRound = new BigDecimal((Double.toString(x)));
+        BigDecimal stepSize = new BigDecimal((Double.toString(step)));
+        int scale = getDecimalsFromStep(step);
+
+        numberToRound.setScale(scale, BigDecimal.ROUND_HALF_UP);
+
+        BigDecimal rounded = numberToRound.divide(stepSize, 0, roundingMode).multiply(stepSize);
+
+        return rounded.doubleValue();
     }
 
     private static int getDecimalsFromStep(Double step) {
         String stepString = Double.toString(step);
         return stepString.substring(stepString.indexOf('.') + 1).length();
     }
-
-    private static Double roundToNrOfDecimals(Double x, int decimals) {
-        BigDecimal number = new BigDecimal(Double.toString(x));
-        number = number.setScale(decimals, BigDecimal.ROUND_HALF_UP);
-
-        return number.doubleValue();
-    }
-
-    private static Double roundToWhole(Double x, Double step) {
-        if (x != 0d) {
-            return Math.round(x / step) * step;
-        }
-        return 0d;
-    }
-
-    public static Double floorTo(Double x, Double step) {
-        if (x != 0d) {
-            return Math.floor(x / step) * step;
-        }
-        return 0d;
-    }
-    public static Double ceilTo(Double x, Double step) {
-        if (x != 0d) {
-            return Math.ceil(x / step) * step;
-        }
-        return 0d;
-    }
 }
diff --git a/app/src/test/java/info/nightscout/utils/RoundTest.java b/app/src/test/java/info/nightscout/utils/RoundTest.java
index d95ab2b391..4ef1be054c 100644
--- a/app/src/test/java/info/nightscout/utils/RoundTest.java
+++ b/app/src/test/java/info/nightscout/utils/RoundTest.java
@@ -14,6 +14,8 @@ public class RoundTest {
     public void roundToTest() throws Exception {
         assertEquals( 0.55d, Round.roundTo(0.54d, 0.05d), 0.00000001d );
         assertEquals( 1d, Round.roundTo(1.49d, 1d), 0.00000001d );
+        assertEquals( 80d, Round.roundTo(65d, 40d), 0.00000001d );
+        assertEquals( 0d, Round.roundTo(0d, 0.1d), 0.00000001d);
     }
 
     @Test
@@ -27,5 +29,4 @@ public class RoundTest {
         assertEquals( 0.6d, Round.ceilTo(0.54d, 0.1d), 0.00000001d );
         assertEquals( 2d, Round.ceilTo(1.49999d, 1d), 0.00000001d );
     }
-
 }
\ No newline at end of file

From 81aadcc1be5442c533b626f6429c09f5c87171ee Mon Sep 17 00:00:00 2001
From: boysim <18055382+boysim@users.noreply.github.com>
Date: Sun, 17 Sep 2017 17:02:27 +0200
Subject: [PATCH 43/53] Update strings.xml

---
 app/src/main/res/values-nl/strings.xml | 54 +++++++++++++-------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d35103cb36..e46d349236 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -39,7 +39,7 @@
     <string name="waitingforpumpclicktorefresh">Wacht op pomp. Klik om te vernieuwen.</string>
     <string name="waitingforpump">Wacht op pomp</string>
     <string name="vitualpump_label">VIRTUELE POMP</string>
-    <string name="visible">Zichtbaar</string>
+    <string name="visible">Toon</string>
     <string name="virtualpump_uploadstatus_title">Upload status naar NS</string>
     <string name="virtualpump_tempbasal_label">Tijdelijk basaal</string>
     <string name="virtualpump_sqlerror">SQL Storing</string>
@@ -79,7 +79,7 @@
     <string name="button1">Knop 1</string>
     <string name="button2">Knop 2</string>
     <string name="button3">Knop 3</string>
-    <string name="calibrationsent">Kalibratie naat xDrip verzonden</string>
+    <string name="calibrationsent">Kalibratie naar xDrip verzonden</string>
     <string name="cancel">Annuleer</string>
     <string name="canceltemp">Annuleer tijdelijk basaal</string>
     <string name="carbs">Koolhydraten</string>
@@ -91,12 +91,12 @@
     <string name="careportal_carbsandbolus_label">KOOLHYDRATEN &amp; BOLUS</string>
     <string name="careportal_carbscorrection">Koolhydraten correctie</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
-    <string name="careportal_cgmsensorinsert">CGM Sensor geplaatst</string>
-    <string name="careportal_cgmsensorstart">CGM Sensor Start</string>
+    <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
+    <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
     <string name="careportal_combobolus">Multiwave bolus</string>
     <string name="careportal_correctionbolus">Correctie bolus</string>
     <string name="careportal_exercise">Sport</string>
-    <string name="careportal_insulinage_label">Insuline leeftijd</string>
+    <string name="careportal_insulinage_label">Ouderdom insuline</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_insulincartridgechange">Insuline ampul wissel</string>
     <string name="careportal_mealbolus">Maaltijd bolus</string>
@@ -118,19 +118,19 @@
     <string name="careportal_newnstreatment_split_label">Splitzen</string>
     <string name="careportal_note">Notitie</string>
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_pbage_label">Leeftijd batterij</string>
+    <string name="careportal_pbage_label">Ouderdom batterij</string>
     <string name="careportal_profileswitch">Profiel wissel</string>
     <string name="careportal_pump_label">Pomp</string>
-    <string name="careportal_pumpbatterychange">Pomp batterij wissel</string>
-    <string name="careportal_pumpsitechange">Infusieplaats wissel</string>
+    <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
+    <string name="careportal_pumpsitechange">Infuus wissel</string>
     <string name="careportal_question">Vraag</string>
-    <string name="careportal_sensorage_label">Leeftijd sensor</string>
+    <string name="careportal_sensorage_label">Ouderdom sensor</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_shortname">CP</string>
     <string name="careportal_snackbolus">Snack bolus</string>
-    <string name="careportal_tempbasalend">Einde tijdelijk basaal</string>
-    <string name="careportal_tempbasalstart">Begin tijdelijk basaal</string>
-    <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
+    <string name="careportal_tempbasalend">Einde tijd. basaal</string>
+    <string name="careportal_tempbasalstart">Start tijd. basaal</string>
+    <string name="careportal_temporarytarget">Tijd. streefdoel</string>
     <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
     <string name="changeyourinput">Wijzig het ingegevene!</string>
     <string name="child">Kind</string>
@@ -143,7 +143,7 @@
     <string name="configbuilder_bgsource">BG bron</string>
     <string name="configbuilder_constraints">Beperkingen</string>
     <string name="configbuilder_general">Algemeen</string>
-    <string name="configbuilder_insulin">insuline</string>
+    <string name="configbuilder_insulin">Insuline curve</string>
     <string name="clear_queue">Ledig wachtrij</string>
     <string name="configbuilder_loop">Loop</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout versie:</string>
@@ -213,7 +213,7 @@
     <string name="smscommunicator_bolusreplywithcode" formatted="false">Om de bolus %.2fU toe te dienen antwoord met de code %s</string>
     <string name="smscommunicator_calibrationfailed">XDrip ontvangt geen callibraties</string>
     <string name="smscommunicator_calibrationreplywithcode" formatted="false">Om calibratie %.2f te verzenden antwoord met de code %s</string>
-    <string name="smscommunicator_calibrationsent">Callibratie verzonden. Het ontvangen van callibraties moet actief zijn in xDrip.</string>
+    <string name="smscommunicator_calibrationsent">Kalibratie verzonden. Het ontvangen van kalibraties moet actief zijn in xDrip.</string>
     <string name="ko_lang">한국어</string>
     <string name="language">Taal</string>
     <string name="localprofile">Lokaal profiel</string>
@@ -269,7 +269,7 @@
     <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
     <string name="enablesuperbolus_summary">Activeer de superbolus functie in de wizard. Activeer deze niet tot je begrijpt wat dit doet. OVERDOSISEN ZIJN MOGELIJK BIJ ONWETENDHEID</string>
     <string name="enablesuperbolus">Activeer superbolus in de wizard</string>
-    <string name="enabled">Geactiveerd</string>
+    <string name="enabled">Actief</string>
     <string name="dont_show_again">Toon niet opnieuw</string>
     <string name="eatingsoon">Eet binnenkort</string>
     <string name="edit_base_basal">Verander basaal patroon</string>
@@ -306,7 +306,7 @@
     <string name="nsclientinternal_url">URL:</string>
     <string name="nsclientinternal_url_dialogmessage">Nightscout URL ingeven</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
-    <string name="nsprofileview_target_label">Doelstelling</string>
+    <string name="nsprofileview_target_label">Streefdoel</string>
     <string name="nsprofileview_isf_label">ISF</string>
     <string name="nsclientinternal_secret_dialogtitle">NS API geheim</string>
     <string name="danar_invalidinput">Verkeerde ingave</string>
@@ -341,13 +341,13 @@
     <string name="nightscout">Nightscout</string>
     <string name="ok">Ok</string>
     <string name="danar_stats_basalrate">Basaal</string>
-    <string name="loopdisabled">Loop gedeactiveerd door beperkingen</string>
+    <string name="loopdisabled">Loop gedeactiveerd door doelen tab</string>
     <string name="loopmenu">Loop menu</string>
     <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
     <string name="loopsuspended">Loop pauzeren</string>
     <string name="loopsuspendedfor" formatted="false">Pauzeer (%d m)</string>
     <string name="lowbattery">Batterij bijna leeg</string>
-    <string name="manual">Maneel</string>
+    <string name="manual">Manueel</string>
     <string name="mdi">MDI</string>
     <string name="mdtp_cancel">Afbreken</string>
     <string name="mdtp_ok">OK</string>
@@ -430,17 +430,17 @@
     <string name="duration">Periode</string>
     <string name="openapsma_scriptdebugdata_label">Script debug</string>
     <string name="openapsma_mealdata_label">Maaltijd gegevens</string>
-    <string name="nsprofileview_units_label">éénheid</string>
+    <string name="nsprofileview_units_label">Eénheid</string>
     <string name="objectives">Doelen</string>
-    <string name="objectives_0_gate">Controleren dat BG beschikbaar is op Nightscout en dat de insulinepomp data is geupload</string>
-    <string name="objectives_0_objective">Opzetten van visualisatie en monitoring eveneens onalyze van basaal en ratio\'s</string>
-    <string name="objectives_1_gate">Werking in Open Loop modus voor enkele dagen, manueel vele tijdelijke basalen instellen</string>
+    <string name="objectives_0_gate">Controleren van beschikbaarheid BG en insuline pomp data op Nightscout</string>
+    <string name="objectives_0_objective">Opzetten van visualisatie en monitoring eveneens analyze van basaal en ratio\'s</string>
+    <string name="objectives_1_gate">In Open Loop modus werken voor enkele dagen, manueel tijdelijke basaal instellen</string>
     <string name="objectives_1_objective">Starten met de Open Loop modus</string>
-    <string name="objectives_2_gate">Gebaseerd op deze ervarinegen beslissen wat het maximale basaal mag zijn en dit in de pomp instellen</string>
+    <string name="objectives_2_gate">Gebaseerd op deze ervaringen beslissen wat het maximale basaal mag zijn en dit in de pomp instellen</string>
     <string name="objectives_2_objective">De Open Loop begrijpen, inclusief de voorgestelde tijdelijke basalen</string>
-    <string name="objectives_3_gate">In gesloten Loop werken met een max. IOB = 0 voor enkele dagen met een beperkt aantal LBG</string>
-    <string name="objectives_3_objective">Starten met gesloten Loop met lage glucose begrenzing</string>
-    <string name="objectives_4_gate">Gebruik enkele dagen en ten miinste 1 naght zonder een laag BG alarm voordat je je BG doel laat dalen</string>
+    <string name="objectives_3_gate">In closed Loop werken met een max. IOB = 0 gedurende enkele dagen met een beperkt aantal lage BG</string>
+    <string name="objectives_3_objective">Starten met closed Loop met bescherming tegen lage BG</string>
+    <string name="objectives_4_gate">Verhoog max. IOB en test enkele dagen alsook minstens 1 nacht zonder een laag BG alarm voordat je jouw BG doel laat dalen</string>
     <string name="objectives_bgavailableinns">BG beschikbaar op NS</string>
     <string name="objectives_5_objective">Pas het basaal en de ratios aan indien nodig, activeer hierna de auto-sens optie</string>
     <string name="openapsma_run">Bereken nu</string>
@@ -627,7 +627,7 @@
     <string name="openapsama_autosens_min_summary">Standaard waarde: 0.7 Dit is de andere kan van de autosens veiligheid limiet. Dit zet een limiet op hoe laag het basaal kan aangepast worden, en hoe hoog het ISF en het BG doel</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standaard waarde: 2 Bolus snooze is actief nadat je een maaltijd bolus toegediend hebt, zodat de loop geen tegenvoorstel met een verlaagd tijdelijk basaal doet nadat je gegeten hebt. Het voorbeeld hier van van standaard 2; dus een 3 u DIA betekent dat de bolus snooze gemiddeld 1.5u actief is (3DIA/2).</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal ; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft.Dit is een veiligheidsmaatregel om te vermijden dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
-    <string name="objectives_5_gate">1 week succesvol loop gedurende de dag met geregeld KH ingave</string>
+    <string name="objectives_5_gate">Gedurende 1 week succesvol closed loop met KH ingave</string>
     <string name="syncprofiletopump_title">Synchroniseer profiel met de pomp</string>
     <string name="careportal_activity_label">ACTIVITIJD &amp; FEEDBACK</string>
     <string name="danar_model" formatted="false">Model: %02X Protokoll: %02X Code: %02X</string>

From 3f7819937bed4b5efcb9996c39fdec8b17accbf0 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 20:10:53 +0200
Subject: [PATCH 44/53] split JSON arrays to 50 elements

---
 .../plugins/NSClientInternal/broadcasts/BroadcastTreatment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
index 572cf7e055..9dd63a83fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
@@ -183,7 +183,7 @@ public class BroadcastTreatment {
                         ret.add(newarr);
                     }
                     newarr = new JSONArray();
-                    count = 100;
+                    count = 50;
                 }
                 newarr.put(array.get(i));
                 --count;

From 4f5987b72aedde6e4732aba89680aaa16cd5d306 Mon Sep 17 00:00:00 2001
From: Dylan Leonard <dylan.a.leonard@gmail.com>
Date: Mon, 18 Sep 2017 14:20:28 -0400
Subject: [PATCH 45/53] Added cases to accept both a.m./p.m. and AM/PM

---
 app/src/main/java/info/nightscout/utils/DateUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java
index e94188f826..ccaae130b7 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/utils/DateUtil.java
@@ -91,9 +91,9 @@ public class DateUtil {
 
         if (m.find()) {
             retval = SafeParse.stringToInt(m.group(1)) * 60 * 60 + SafeParse.stringToInt(m.group(2)) * 60;
-            if (m.group(3).equals(" AM") && m.group(1).equals("12"))
+            if (m.group(3).equals(" a.m.") || m.group(3).equals(" AM") && m.group(1).equals("12"))
                 retval -= 12 * 60 * 60;
-            if (m.group(3).equals(" PM") && !(m.group(1).equals("12")))
+            if (m.group(3).equals(" p.m.") || m.group(3).equals(" PM") && !(m.group(1).equals("12")))
                 retval += 12 * 60 * 60;
         }
         return retval;

From 17fa2617f7b4bd7274bcf67c961021eed0e2349d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 20:23:05 +0200
Subject: [PATCH 46/53] fix null pointer exception

---
 .../androidaps/plugins/XDripStatusline/StatuslinePlugin.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
index 45b5867886..8830ca2f6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
@@ -192,6 +192,10 @@ public class StatuslinePlugin implements PluginBase {
                     + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
         }
         Profile profile = MainApp.getConfigBuilder().getProfile();
+
+        if (profile == null)
+            return status;
+
         if (!mPrefs.getBoolean("xdripstatus_showbgi", false)) {
             return status;
         }

From 8daf9e5c2cf165606840895eae5b84dca47cae89 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 20:40:03 +0200
Subject: [PATCH 47/53] use notification for bolus delivery failed message when
 window has been destroyed

---
 .../plugins/Actions/dialogs/FillDialog.java   | 18 +++++++---
 .../dialogs/NewExtendedBolusDialog.java       |  9 +++++
 .../Overview/Dialogs/NewTreatmentDialog.java  | 29 +++++++++-------
 .../Overview/Dialogs/WizardDialog.java        | 17 ++++++++--
 .../plugins/Overview/Notification.java        |  1 +
 .../plugins/Overview/OverviewFragment.java    | 33 +++++++++++--------
 6 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
index f434a08d96..9c6b65acd5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
@@ -34,6 +34,8 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SP;
@@ -172,11 +174,17 @@ public class FillDialog extends DialogFragment implements OnClickListener {
                                 detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
                                 PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
                                 if (!result.success) {
-                                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                                    builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                    builder.setMessage(result.comment);
-                                    builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
-                                    builder.show();
+                                    try {
+                                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                        builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                        builder.setMessage(result.comment);
+                                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                        builder.show();
+                                    } catch (WindowManager.BadTokenException e) {
+                                        // window has been destroyed
+                                        Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                        MainApp.bus().post(new EventNewNotification(notification));
+                                    }
                                 }
                             }
                         });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
index 1bfab76993..4102cb4b1d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
@@ -10,6 +10,7 @@ import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioButton;
@@ -27,6 +28,8 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 
@@ -103,11 +106,17 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                                 public void run() {
                                     PumpEnactResult result = pump.setExtendedBolus(finalInsulin, finalDurationInMinutes);
                                     if (!result.success) {
+                                        try {
                                         AlertDialog.Builder builder = new AlertDialog.Builder(context);
                                         builder.setTitle(context.getString(R.string.treatmentdeliveryerror));
                                         builder.setMessage(result.comment);
                                         builder.setPositiveButton(context.getString(R.string.ok), null);
                                         builder.show();
+                                        } catch (WindowManager.BadTokenException e) {
+                                            // window has been destroyed
+                                            Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                            MainApp.bus().post(new EventNewNotification(notification));
+                                        }
                                     }
                                 }
                             });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index faa3ff0785..c7845f1f15 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -14,8 +14,6 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.TextView;
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
@@ -34,8 +32,9 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 
 public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
@@ -90,7 +89,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(insulin);
                     Integer carbsAfterConstraints = MainApp.getConfigBuilder().applyCarbsConstraints(carbs);
 
-                    confirmMessage += getString(R.string.bolus) + ": " + "<font color='"+ MainApp.sResources.getColor(R.color.bolus) + "'>" + insulinAfterConstraints + "U" + "</font>";
+                    confirmMessage += getString(R.string.bolus) + ": " + "<font color='" + MainApp.sResources.getColor(R.color.bolus) + "'>" + insulinAfterConstraints + "U" + "</font>";
                     confirmMessage += "<br/>" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
                     if (insulinAfterConstraints - insulin != 0 || !Objects.equals(carbsAfterConstraints, carbs))
                         confirmMessage += "<br/>" + getString(R.string.constraintapllied);
@@ -112,19 +111,27 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                                     @Override
                                     public void run() {
                                         DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                        if (finalInsulinAfterConstraints == 0) detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
-                                        if (finalCarbsAfterConstraints == 0) detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
+                                        if (finalInsulinAfterConstraints == 0)
+                                            detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
+                                        if (finalCarbsAfterConstraints == 0)
+                                            detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
                                         detailedBolusInfo.insulin = finalInsulinAfterConstraints;
                                         detailedBolusInfo.carbs = finalCarbsAfterConstraints;
                                         detailedBolusInfo.context = context;
                                         detailedBolusInfo.source = Source.USER;
                                         PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
                                         if (!result.success) {
-                                            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                                            builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                            builder.setMessage(result.comment);
-                                            builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
-                                            builder.show();
+                                            try {
+                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                builder.setMessage(result.comment);
+                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                builder.show();
+                                            } catch (WindowManager.BadTokenException e) {
+                                                // window has been destroyed
+                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                MainApp.bus().post(new EventNewNotification(notification));
+                                            }
                                         }
                                     }
                                 });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 98428f9493..4751dcbdb3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -57,6 +57,8 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
+import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.BolusWizard;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
@@ -281,11 +283,10 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                     Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(calculatedTotalInsulin);
                     Integer carbsAfterConstraints = MainApp.getConfigBuilder().applyCarbsConstraints(calculatedCarbs);
 
-                    confirmMessage += "<br/>" + getString(R.string.bolus) + ": " + "<font color='"+ MainApp.sResources.getColor(R.color.bolus) + "'>" + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U" + "</font>";
+                    confirmMessage += "<br/>" + getString(R.string.bolus) + ": " + "<font color='" + MainApp.sResources.getColor(R.color.bolus) + "'>" + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U" + "</font>";
                     confirmMessage += "<br/>" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
 
 
-
                     if (insulinAfterConstraints - calculatedTotalInsulin != 0 || !carbsAfterConstraints.equals(calculatedCarbs)) {
                         AlertDialog.Builder builder = new AlertDialog.Builder(context);
                         builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
@@ -336,7 +337,17 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                         detailedBolusInfo.source = Source.USER;
                                         result = pump.deliverTreatment(detailedBolusInfo);
                                         if (!result.success) {
-                                            OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.treatmentdeliveryerror), result.comment, null);
+                                            try {
+                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                builder.setMessage(result.comment);
+                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                builder.show();
+                                            } catch (WindowManager.BadTokenException e) {
+                                                // window has been destroyed
+                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                MainApp.bus().post(new EventNewNotification(notification));
+                                            }
                                         }
                                     }
                                 });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Notification.java
index 13b85e08fc..0201d9cabe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Notification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Notification.java
@@ -49,6 +49,7 @@ public class Notification {
     public static final int NSURGENTALARM = 20;
     public static final int SHORT_DIA = 21;
     public static final int TOAST_ALARM = 22;
+    public static final int BOLUS_DELIVERY_ERROR = 24;
 
 
     public int id;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index ac5a57d963..e363158556 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -26,6 +26,7 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -110,6 +111,7 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.CalibrationDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.NewTreatmentDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.WizardDialog;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.AreaGraphSeries;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
@@ -127,9 +129,8 @@ import info.nightscout.utils.Profiler;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
+
 //Added By Rumen for staledata alarm
-import info.nightscout.androidaps.plugins.Overview.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 public class OverviewFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
     private static Logger log = LoggerFactory.getLogger(OverviewFragment.class);
@@ -707,11 +708,17 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                                     detailedBolusInfo.source = Source.USER;
                                     PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
                                     if (!result.success) {
-                                        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                                        builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                        builder.setMessage(result.comment);
-                                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
-                                        builder.show();
+                                        try {
+                                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                                            builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                            builder.setMessage(result.comment);
+                                            builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                            builder.show();
+                                        } catch (WindowManager.BadTokenException e) {
+                                            // window has been destroyed
+                                            Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                            MainApp.bus().post(new EventNewNotification(notification));
+                                        }
                                     }
                                 }
                             });
@@ -1746,7 +1753,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         public void onBindViewHolder(NotificationsViewHolder holder, int position) {
             Notification notification = notificationsList.get(position);
             holder.dismiss.setTag(notification);
-            if(Objects.equals(notification.text, MainApp.sResources.getString(R.string.nsalarm_staledata)))
+            if (Objects.equals(notification.text, MainApp.sResources.getString(R.string.nsalarm_staledata)))
                 holder.dismiss.setText("snooze");
             holder.text.setText(notification.text);
             holder.time.setText(DateUtil.timeString(notification.date));
@@ -1797,12 +1804,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             BroadcastAckAlarm.handleClearAlarm(notification.nsAlarm, MainApp.instance().getApplicationContext(), 60 * 60 * 1000L);
                         }
                         // Adding current time to snooze if we got staleData
-                        log.debug("Notification text is: "+notification.text);
-                        if(notification.text.equals(MainApp.sResources.getString(R.string.nsalarm_staledata))){
+                        log.debug("Notification text is: " + notification.text);
+                        if (notification.text.equals(MainApp.sResources.getString(R.string.nsalarm_staledata))) {
                             NotificationStore nstore = getPlugin().notificationStore;
-                            long msToSnooze = SP.getInt("nsalarm_staledatavalue",15)*60*1000L;
-                            log.debug("snooze nsalarm_staledatavalue in minutes is "+SP.getInt("nsalarm_staledatavalue",15)+"\n in ms is: "+msToSnooze+" currentTimeMillis is: "+System.currentTimeMillis());
-                            nstore.snoozeTo(System.currentTimeMillis()+(SP.getInt("nsalarm_staledatavalue",15)*60*1000L));
+                            long msToSnooze = SP.getInt("nsalarm_staledatavalue", 15) * 60 * 1000L;
+                            log.debug("snooze nsalarm_staledatavalue in minutes is " + SP.getInt("nsalarm_staledatavalue", 15) + "\n in ms is: " + msToSnooze + " currentTimeMillis is: " + System.currentTimeMillis());
+                            nstore.snoozeTo(System.currentTimeMillis() + (SP.getInt("nsalarm_staledatavalue", 15) * 60 * 1000L));
                         }
                         break;
                 }

From 8785bc63d5b83e432de3955b21a7d2cc5e269c46 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 20:54:53 +0200
Subject: [PATCH 48/53] loadEvents after bolus in separate thread

---
 .../services/DanaRv2ExecutionService.java            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
index 618549a4ac..0e96987728 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
@@ -428,9 +428,17 @@ public class DanaRv2ExecutionService extends Service {
                 }
             }
         }
-        waitMsec(3000);
         bolusingTreatment = null;
-        loadEvents();
+        // run loading history in separate thread and allow bolus dialog to be closed
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                waitMsec(4000);
+                if (!(isConnected()))
+                    connect("loadEvents");
+                loadEvents();
+            }
+        }).start();
         return true;
     }
 

From d8590fe8f14d011007e80d68b647145fc7e730b2 Mon Sep 17 00:00:00 2001
From: Dylan Leonard <dylan.a.leonard@gmail.com>
Date: Mon, 18 Sep 2017 15:04:46 -0400
Subject: [PATCH 49/53] Clarified boolean logic with parentheses :)

---
 app/src/main/java/info/nightscout/utils/DateUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java
index ccaae130b7..2410014808 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/utils/DateUtil.java
@@ -91,9 +91,9 @@ public class DateUtil {
 
         if (m.find()) {
             retval = SafeParse.stringToInt(m.group(1)) * 60 * 60 + SafeParse.stringToInt(m.group(2)) * 60;
-            if (m.group(3).equals(" a.m.") || m.group(3).equals(" AM") && m.group(1).equals("12"))
+            if ((m.group(3).equals(" a.m.") || m.group(3).equals(" AM")) && m.group(1).equals("12"))
                 retval -= 12 * 60 * 60;
-            if (m.group(3).equals(" p.m.") || m.group(3).equals(" PM") && !(m.group(1).equals("12")))
+            if ((m.group(3).equals(" p.m.") || m.group(3).equals(" PM")) && !(m.group(1).equals("12")))
                 retval += 12 * 60 * 60;
         }
         return retval;

From d7f8d75d06ca82a52cfda3bb59e17387017d0bf2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 21:24:22 +0200
Subject: [PATCH 50/53] Revert "Rounding issues visible in nightscout insulin
 field"

---
 .../java/info/nightscout/utils/Round.java     | 38 +++++++------------
 .../java/info/nightscout/utils/RoundTest.java |  3 +-
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/Round.java b/app/src/main/java/info/nightscout/utils/Round.java
index a45714ad45..26a4d5abce 100644
--- a/app/src/main/java/info/nightscout/utils/Round.java
+++ b/app/src/main/java/info/nightscout/utils/Round.java
@@ -1,37 +1,25 @@
 package info.nightscout.utils;
 
-import java.math.BigDecimal;
-
 /**
  * Created by mike on 20.06.2016.
  */
 public class Round {
-    public static Double roundTo(Double x, Double step) {
-        return round(x, step, BigDecimal.ROUND_HALF_UP);
+    public static Double roundTo(double x, Double step) {
+        if (x != 0d) {
+            return Math.round(x / step) * step;
+        }
+        return 0d;
     }
-
     public static Double floorTo(Double x, Double step) {
-        return round(x, step, BigDecimal.ROUND_FLOOR);
+        if (x != 0d) {
+            return Math.floor(x / step) * step;
+        }
+        return 0d;
     }
-
     public static Double ceilTo(Double x, Double step) {
-        return round(x, step, BigDecimal.ROUND_CEILING);
-    }
-
-    private static Double round(Double x, Double step, int roundingMode) {
-        BigDecimal numberToRound = new BigDecimal((Double.toString(x)));
-        BigDecimal stepSize = new BigDecimal((Double.toString(step)));
-        int scale = getDecimalsFromStep(step);
-
-        numberToRound.setScale(scale, BigDecimal.ROUND_HALF_UP);
-
-        BigDecimal rounded = numberToRound.divide(stepSize, 0, roundingMode).multiply(stepSize);
-
-        return rounded.doubleValue();
-    }
-
-    private static int getDecimalsFromStep(Double step) {
-        String stepString = Double.toString(step);
-        return stepString.substring(stepString.indexOf('.') + 1).length();
+        if (x != 0d) {
+            return Math.ceil(x / step) * step;
+        }
+        return 0d;
     }
 }
diff --git a/app/src/test/java/info/nightscout/utils/RoundTest.java b/app/src/test/java/info/nightscout/utils/RoundTest.java
index 4ef1be054c..d95ab2b391 100644
--- a/app/src/test/java/info/nightscout/utils/RoundTest.java
+++ b/app/src/test/java/info/nightscout/utils/RoundTest.java
@@ -14,8 +14,6 @@ public class RoundTest {
     public void roundToTest() throws Exception {
         assertEquals( 0.55d, Round.roundTo(0.54d, 0.05d), 0.00000001d );
         assertEquals( 1d, Round.roundTo(1.49d, 1d), 0.00000001d );
-        assertEquals( 80d, Round.roundTo(65d, 40d), 0.00000001d );
-        assertEquals( 0d, Round.roundTo(0d, 0.1d), 0.00000001d);
     }
 
     @Test
@@ -29,4 +27,5 @@ public class RoundTest {
         assertEquals( 0.6d, Round.ceilTo(0.54d, 0.1d), 0.00000001d );
         assertEquals( 2d, Round.ceilTo(1.49999d, 1d), 0.00000001d );
     }
+
 }
\ No newline at end of file

From d2815e404578d8eb5bb063ff368e0806a684e2b1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 21:52:06 +0200
Subject: [PATCH 51/53] check for NaN

---
 .../SensitivityWeightedAveragePlugin.java                     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java
index b957e21bda..a10905dbc1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java
@@ -172,6 +172,10 @@ public class SensitivityWeightedAveragePlugin implements PluginBase, Sensitivity
             weightedsum += weight * value;
         }
 
+        if (weights == 0) {
+            return new AutosensResult();
+        }
+
         Profile profile = MainApp.getConfigBuilder().getProfile();
 
         double sens = profile.getIsf();

From b797530c9d817f2835855d19254367c3d398ade6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 21:57:35 +0200
Subject: [PATCH 52/53] BG & IOB contribution on by default in wizard

---
 .../plugins/Overview/Dialogs/WizardDialog.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 6892d8859b..b1b629d339 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -268,19 +268,19 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     }
 
     private void saveCheckedStates() {
-        SP.putBoolean(getString(R.string.key_wizard_include_bg), bgCheckbox.isChecked());
+        //SP.putBoolean(getString(R.string.key_wizard_include_bg), bgCheckbox.isChecked());
         SP.putBoolean(getString(R.string.key_wizard_include_cob), cobCheckbox.isChecked());
         SP.putBoolean(getString(R.string.key_wizard_include_trend_bg), bgtrendCheckbox.isChecked());
-        SP.putBoolean(getString(R.string.key_wizard_include_bolus_iob), bolusIobCheckbox.isChecked());
-        SP.putBoolean(getString(R.string.key_wizard_include_basal_iob), basalIobCheckbox.isChecked());
+        //SP.putBoolean(getString(R.string.key_wizard_include_bolus_iob), bolusIobCheckbox.isChecked());
+        //SP.putBoolean(getString(R.string.key_wizard_include_basal_iob), basalIobCheckbox.isChecked());
     }
 
     private void loadCheckedStates() {
-        bgCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bg), true));
+        //bgCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bg), true));
         bgtrendCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_trend_bg), false));
         cobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_cob), false));
-        bolusIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bolus_iob), true));
-        basalIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_basal_iob), true));
+        //bolusIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_bolus_iob), true));
+        //basalIobCheckbox.setChecked(SP.getBoolean(getString(R.string.key_wizard_include_basal_iob), true));
     }
 
     @Override

From cd7c7733ea5c0b88e8ef66dcf63e05d87d92cbb8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 18 Sep 2017 21:59:01 +0200
Subject: [PATCH 53/53] bump 1.53

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

diff --git a/app/build.gradle b/app/build.gradle
index 8d62dbe7f3..e39d8beca9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1500
-        version "1.52"
+        version "1.53"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
     }