Commit graph

2441 commits

Author SHA1 Message Date
Johannes Mockenhaupt
5bd2911754
wip .. 2017-11-07 09:36:21 +01:00
Johannes Mockenhaupt
445392ee69
add pretty time dep. 2017-11-07 09:22:29 +01:00
AdrianLxM
4e53b4b1a4 upper case literals 2017-11-07 00:00:38 +01:00
AdrianLxM
d6b534b3b6 use correct setting 2017-11-06 23:47:39 +01:00
Johannes Mockenhaupt
be5f7e68a7
unsafe usage checks update. 2017-11-06 23:15:16 +01:00
AdrianLxM
a864703c76 Don't alarm while disconnected 2017-11-06 22:24:25 +01:00
AdrianLxM
b9ad90a51b disconnect state 2017-11-06 22:04:48 +01:00
AdrianLxM
ccad0c18b1 remove deprecated wear notification settings 2017-11-06 21:44:01 +01:00
AdrianLxM
f2e44e8ab9 no-urgent notification title 2017-11-06 21:38:42 +01:00
AdrianLxM
2e6a136de6 presnooze missed readings/pump on startup 2017-11-06 20:32:33 +01:00
AdrianLxM
2f56687e82 system notifications for non-urgent 2017-11-06 20:16:17 +01:00
AdrianLxM
2b06e9e63e Notification bugfixes 2017-11-06 17:12:33 +01:00
AdrianLxM
ef425563bf use ID as request code 2017-11-06 15:24:52 +01:00
AdrianLxM
e4f15c0e0d guard double clicks 2017-11-06 15:07:39 +01:00
AdrianLxM
8c8674ed63 refactor notifications: subpackage 2017-11-06 14:26:06 +01:00
AdrianLxM
3ea4bfaf37 initialized only when maxBasal >0 2017-11-06 14:16:50 +01:00
AdrianLxM
d990d59ddf Dismiss notification service 2017-11-06 14:09:03 +01:00
AdrianLxM
87ea412516 local alert thresholds as settings 2017-11-06 12:58:44 +01:00
AdrianLxM
ffd912e32b Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings 2017-11-06 11:56:41 +01:00
Johannes Mockenhaupt
8b7725c076
add pretty time dep
(cherry picked from commit 8ac2aba)
2017-11-05 21:52:45 +01:00
Johannes Mockenhaupt
7c44761f25
WIP 2017-11-04 17:42:47 +01:00
Johannes Mockenhaupt
011409a6e5
Minor cleanups. 2017-11-03 23:40:57 +01:00
Johannes Mockenhaupt
6ba57ff1f7
WIP Cleaning up ComboPlugin/Ruffyscripter.cancelTbr 2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
598fbe40cc
Unsource ruffy. 2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
142878a22b
Fix getting resources string in fragment. 2017-11-03 21:41:20 +01:00
Johannes Mockenhaupt
f9a7d6fe20
Use PumpEnactResult's fluent interface in Combo plugin. 2017-11-03 14:40:01 +01:00
Johannes Mockenhaupt
49885afb39
Refresh entire pump state when long-pressing Combo tab's refresh button. 2017-11-03 14:23:47 +01:00
Milos Kozak
5ad564e0e3 CS translation 2017-11-03 10:13:23 +01:00
Milos Kozak
e063f3a2cb removed unneeded code 2017-11-02 18:03:40 +01:00
Milos Kozak
a7077a8a6a long click on name to open settings 2017-11-02 17:47:41 +01:00
Milos Kozak
20c66e3b6f add link to advanced settings 2017-11-02 17:39:25 +01:00
Johannes Mockenhaupt
604a9e664a
Reject requests to bolus the same amount within 60s. 2017-11-02 15:37:19 +01:00
Johannes Mockenhaupt
fe45b917be
Align Combo with recent preferences updates. 2017-11-01 23:25:37 +01:00
Johannes Mockenhaupt
f569163d19
Merge remote-tracking branch 'origin/dev2' into combo-v2
* origin/dev2: (26 commits)
  add getPreferenceId to food plugin
  preferences update
  use DateUtil#agoString
  use DateUtil#untilString
  timeframe strings
  Show remaining time of TT
  NSTreatments NPE fix
  Cleanup.
  Revert "Debug: wider thread column in log to improve readability."
  Disable event logging by default.
  Log summary after 10s, then every 60s.
  Log receivers of event.
  Log source of event.
  Debug: wider thread column in log to improve readability.
  Better log messages for events.
  Group events in type hierarchy related to the LoopPlugin.
  Remove dead NSPingAck class.
  Let event classes extend Event(UpdageGui) classes.
  Add base event class.
  Log posted events.
  ...
2017-11-01 21:39:45 +01:00
Milos Kozak
a162343cd4 add getPreferenceId to food plugin 2017-11-01 20:47:16 +01:00
Milos Kozak
f67bd291cd Merge branch 'dev' into dev2 2017-11-01 20:44:24 +01:00
Milos Kozak
60699eddbb preferences update 2017-11-01 20:43:59 +01:00
Milos Kozak
00152eaffa
Merge pull request #490 from MilosKozak/tt-remaining
Show remaining time of TT
2017-11-01 18:29:54 +01:00
Milos Kozak
f7871e64e0
Merge pull request #489 from MilosKozak/NPE-fix
NSTreatments NPE fix
2017-11-01 18:29:34 +01:00
Milos Kozak
440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
Johannes Mockenhaupt
4da160a951
Disable closed loop under unsafe conditions. 2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt
8d3947dc7f
Initial bolus syncing. 2017-10-31 19:30:25 +01:00
Johannes Mockenhaupt
744d24cbcf
DatabaseHelper: add getTreatmentByDate. 2017-10-31 19:28:32 +01:00
Johannes Mockenhaupt
74bbab9cf1
More bolus work. 2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt
ab900fda6c
Refresh tab after pump init. 2017-10-31 14:46:06 +01:00
Johannes Mockenhaupt
69648ecf30
Make bolusing safe. 2017-10-31 12:47:53 +01:00
Johannes Mockenhaupt
efc298bf90
Make PumpEnactResult fluent. 2017-10-31 12:47:41 +01:00
Johannes Mockenhaupt
f64e00fc79
Auto-retrying repeatable commands when there's a connection loss. 2017-10-31 11:05:07 +01:00
Johannes Mockenhaupt
88f500417d
Cleanup: ComboFragement. 2017-10-31 11:02:14 +01:00
Johannes Mockenhaupt
9121aa5217
Bolus cancellation for all stages. 2017-10-31 11:01:58 +01:00
Johannes Mockenhaupt
522b5e9e1b
Clean up string resource names. 2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt
2198747feb
NPE fix. 2017-10-30 19:52:26 +01:00
Johannes Mockenhaupt
75bc2cd940
NotificationStore: extract key string. 2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
9bae22f551
Tweaking ComboFragment's Last Connection. 2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
a920946cd1
Extract local alerts for unreachable pump, missed BG readings. 2017-10-30 17:48:22 +01:00
Johannes Mockenhaupt
79d7ec5467
Add prefs for local alerts. 2017-10-30 16:49:21 +01:00
Johannes Mockenhaupt
bffd1239c0
Disable reading history while incomplete. 2017-10-30 16:20:43 +01:00
Johannes Mockenhaupt
550ed57ca5
KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode. 2017-10-30 16:20:08 +01:00
Johannes Mockenhaupt
d423c8ae2a
Add pref to raise urgent alarms as system notifications. 2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt
bdc61765ce
KeepAliveReceiver: sanitize pump disconnected/missed readings alarms.
* Don't raise alarm on application start
* Re-raise alert only every ~30 min, not every 5 min.
2017-10-30 02:02:01 +01:00
Johannes Mockenhaupt
a2460180f9
Remove unclear error message field from CommandResult, use codes from pump warnings/errors. 2017-10-29 21:19:03 +01:00
Johannes Mockenhaupt
6b6d252173
Day 1
* Some UI rework
* Start removing (retry) logic from ruffyscripter to ComboPlugin
* Cleanups all over
* Remove TDD stuff, this can be done independently of a pump
* New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus
* Add warning and error codes from Combo manual
* Rework commands to just execute an action (verification will be in
  ComboPlugin eventually, together with retry logic)
* Rework commands to update state in field as command progresses
  rather than returnin/throwing.
* Initial version reading bolus and error history (no DB sync yet).
2017-10-29 11:36:35 +01:00
AdrianLxM
f9ed104fe3
use DateUtil#agoString 2017-10-29 02:08:43 +02:00
AdrianLxM
3121fa3e84
use DateUtil#untilString 2017-10-29 02:07:17 +02:00
AdrianLxM
9e8752b096
timeframe strings 2017-10-29 02:06:06 +02:00
Johannes Mockenhaupt
394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt
255e9d0dff
Move initialized flag to ComoPump class. 2017-10-28 13:12:55 +02:00
Johannes Mockenhaupt
4befa38d46
Close bolus progress dialog better in case of error. 2017-10-28 11:46:54 +02:00
AdrianLxM
7d82870203
Show remaining time of TT 2017-10-28 02:16:30 +02:00
Johannes Mockenhaupt
36d5c4d806
Clean up ComboFragment, related string resources. 2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt
c53936a7ac
Revert inadvertent change to keepAlive interval. 2017-10-28 00:19:18 +02:00
Johannes Mockenhaupt
b6a62dedae
Fix merge conflict. 2017-10-27 22:26:47 +02:00
Johannes Mockenhaupt
d237c46ca8
Merge remote-tracking branch 'origin/dev' into combo-v2
* origin/dev: (26 commits)
  fix RS response code
  use max absorption time for AAPS and weighted average sensitivity detection
  log.debug -> log.error on RS comm
  read status after bolus
  RS connectivity & bolus improvement
  Better bolusing with different speeds (R & Rv2)
  Detailed onscreen history logging
  Split to smaller pieces
  Update strings.xml
  Sensitivity logging optional
  RS synchronized change
  fix displaying XX:30 time intervals
  CS translations
  allow to use actual profile in wizard
  getUnits from active profile not interface
  Update strings.xml
  Update strings.xml
  Update dutch
  Update strings.xml
  Update strings.xml
  ...
2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt
4bc970091e
More i18n. 2017-10-27 21:51:15 +02:00
Johannes Mockenhaupt
a8061b410c
Clean up pump init. 2017-10-27 19:40:44 +02:00
Johannes Mockenhaupt
a1d6834bce
KeepAliveReceiver: check pump only if initialized already. 2017-10-27 19:39:51 +02:00
Johannes Mockenhaupt
eed3773b49
Combo i18n. 2017-10-27 17:19:10 +02:00
AdrianLxM
88e22c5f17 NSTreatments NPE fix
When the dialog was open and the phone goes to sleep/lock screen, Android may garbage collect and options is no longer available. -> NPE

I think as quick fix it is ok to not show a dialog at all. If the user stopped using the dialog and lets the phone sleep for a longer while with the phone going to sleep... he can open it again, if he wants it.
2017-10-27 16:56:17 +02:00
Johannes Mockenhaupt
b47559647f
wip 2017-10-27 00:03:01 +02:00
Milos Kozak
8a6e811c95 Merge branch 'dev' into dev2 2017-10-26 21:13:10 +02:00
Milos Kozak
ae47183459 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-26 21:12:37 +02:00
Milos Kozak
26b216a8ee fix RS response code 2017-10-26 20:40:24 +02:00
Johannes Mockenhaupt
91df07ca8f
Cleanup. 2017-10-26 17:35:46 +02:00
Johannes Mockenhaupt
79316bf948
Revert "Debug: wider thread column in log to improve readability."
This reverts commit 5fe2d19e6363c4efcaad90fe5aa627b58d230cd1.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
e5cb5386e3
Disable event logging by default. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
82dd8c2c5e
Log summary after 10s, then every 60s. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
785a8f21de
Log receivers of event. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9a1d7fd512
Log source of event. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
a6ae3ddd2d
Debug: wider thread column in log to improve readability. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
d830096482
Better log messages for events. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9d10563bd9
Group events in type hierarchy related to the LoopPlugin. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
3e24a6069d
Remove dead NSPingAck class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
302ed69564
Let event classes extend Event(UpdageGui) classes. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
8ad223e5e1
Add base event class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
5a446c9ab5
Log posted events. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
e895ba65eb
KeepAliveReceiver: proper Notification ids. 2017-10-26 01:09:46 +02:00
Johannes Mockenhaupt
4539b5a9e5
KeepAliveReceiver: add alarm for missed readings. 2017-10-26 01:09:37 +02:00
Johannes Mockenhaupt
001a56728d
KeepAliveReceiver: add alarm sound to 'pump unreachable' notification. 2017-10-26 01:09:31 +02:00
Johannes Mockenhaupt
7b3f474b58
Upgrade to Android Studio 3.0. 2017-10-25 22:49:50 +02:00
AdrianLxM
707d2df345 No explicit service start 2017-10-25 20:10:59 +02:00