Commit graph

380 commits

Author SHA1 Message Date
Milos Kozak b3bcb778e0 check for NPE in posted dialogs 2017-09-23 20:12:53 +02:00
Milos Kozak b797530c9d BG & IOB contribution on by default in wizard 2017-09-18 21:57:35 +02:00
Milos Kozak c2afa328e3 Merge branch 'dev' into tt-in-wizard 2017-09-18 20:44:54 +02:00
Milos Kozak 8daf9e5c2c use notification for bolus delivery failed message when window has been destroyed 2017-09-18 20:40:03 +02:00
Milos Kozak 69b04fdf26 Merge pull request #413 from samihusseingit/dev
Dev
2017-09-11 20:12:51 +02:00
Johannes Mockenhaupt 612efa6a13
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 c11455dff1.
2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt c11455dff1
Make the BolusProgress dialog a bit more self-contained.
(cherry picked from commit 75db72a)
2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt c227e0e5fa
Dead code be gone.
(cherry picked from commit bb626ce)
2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt 5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt c50fad81bb
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)
2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt 627cb8e9b2
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).
2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt b1e3b45ce9
Add temp target to Wizard dialog
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
2017-09-09 16:30:17 +02:00
SMUSTAF1 1fd99a9582 changing the color of the bolus value, for visual clarify and confirmation. Reducing errors. 2017-09-05 13:29:43 +02:00
Milos Kozak c98cd3c834 Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak 0551f7f16d Merge pull request #387 from MilosKozak/invalid-overview
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak 5b17eee586 Merge pull request #389 from jotomo/cleanups
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt 56423028f6
Fix comparing non-primitives. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt 30372897c0
Generify MainApp.getSpecificPlugin. 2017-08-22 13:47:02 +02:00
AdrianLxM d5ea2a2f08 correct supercall 2017-08-22 13:26:48 +02:00
AdrianLxM 3f8dea1197 add invalid treatments to charts in "invalid" colour 2017-08-22 12:56:17 +02:00
AdrianLxM 6b0bf5860c Use bolusstep as step for insulin correction in wizard 2017-08-22 00:41:23 +02:00
Milos Kozak a18e2b4641 fix of fix :( 2017-08-20 19:42:41 +02:00
Susan 4f3b5f551a moved the code of the bg update to the top before all the loop logic happens, so there would be no delay 2017-08-18 20:58:54 +02:00
Milos Kozak ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
Milos Kozak 73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00
AdrianLxM e61d7a4442 show notification on toast alarm 2017-08-16 21:37:33 +02:00
Johannes Mockenhaupt 759afcec7a
Extract method Profile.toTargetRangeString. 2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt 754a0097b9
Simplify. 2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt 6dcdeb2bbc
Overview: format target using unit specific format. 2017-08-15 14:51:09 +02:00
AdrianLxM ee7b3cca22 insulincurves - notification on short DIA 2017-08-14 20:41:24 +02:00
Timm Korte 7839299530 add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50 2017-08-11 22:08:33 +02:00
RoumenGeorgiev 1dd9086924 added snoozing if bgReadingAgo is smaller than threshold 2017-08-07 18:53:56 +03:00
RoumenGeorgiev 4f054907cb Merge pull request #1 from MilosKozak/dev
Dev
2017-08-07 09:17:07 +03:00
Milos Kozak 848863aca5 calculateFromTreatmentsAndTempsSynchronized 2017-08-06 14:25:25 +02:00
Milos Kozak 1604b85d34 Merge branch 'dev' into move-to-range-in-profile 2017-08-05 14:48:41 +02:00
RoumenGeorgiev 222c357456 Added check for enabled openAPS stale data alarm in NS 2017-08-05 11:58:49 +03:00
RoumenGeorgiev 3d9df4e18e Using equals() instead of == on line 1811 2017-08-05 11:20:09 +03:00
RoumenGeorgiev cdee9bf703 Get staleData setting from NS first 2017-08-04 17:04:57 +03:00
RoumenGeorgiev aff62d86b1 Changed name of button to snooze if it's staleDataAlarm 2017-08-04 16:43:46 +03:00
RoumenGeorgiev 837dcdb23b If alarm is staledata dismis snoozes it 2017-08-04 14:51:25 +03:00
RoumenGeorgiev 82541a50e4 Added functions for snoozing and unsnoozing 2017-08-04 14:49:46 +03:00
RoumenGeorgiev a8b17a1f22 adding staleDataThreshold as snooze time 2017-08-04 14:48:44 +03:00
RoumenGeorgiev 74bb05a654 added staledataalarm 2017-08-03 17:14:14 +03:00
AdrianLxM 36e6cb8497 remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
AdrianLxM 0ac7357ee9 color for active temp 2017-08-03 03:12:47 +02:00
AdrianLxM 1ac1b77fd4 remove translated string not in default strings and add flag to cancel method 2017-08-03 02:01:52 +02:00
Milos Kozak 34d4bec556 move cancel temp to actions 2017-08-01 20:45:57 +02:00
Milos Kozak a24cbfda50 Disconnect pump: cancel temp before setting new to make sure it will last as expected 2017-08-01 17:37:32 +02:00
Milos Kozak 668008e1c1 cancel current temp before activating superbolus 2017-07-31 19:53:09 +02:00
AdrianLxM b72482601e remove unnecessary semicolons 2017-07-20 01:06:41 +02:00