Commit graph

6165 commits

Author SHA1 Message Date
Milos Kozak ba4f599242 include EB in statistics 2020-07-28 13:51:03 +02:00
Milos Kozak ed969300ef fix tests 2020-07-27 22:27:47 +02:00
Milos Kozak 400e9399a5 MinutesNumberPicker 2020-07-27 21:11:57 +02:00
Milos Kozak b7221aa286 prevent missing pump status in NS 2020-07-27 15:21:36 +02:00
Andy Rozman 6ad35510f3 - moved tests
- some other minor changes
2020-07-26 14:36:00 +01:00
Milos Kozak 007df3aab3 make SMB prefs more clear 2020-07-26 12:56:47 +02:00
Milos Kozak 1edef7fb4e prevent stack overflow 2020-07-26 11:11:14 +02:00
Andy Rozman 996417bb47 Merge branch 'dev' into medtronic_modules 2020-07-25 00:44:09 +01:00
Andy Rozman 8e438f05fe - some changes with package fixes 2020-07-25 00:39:56 +01:00
Milos Kozak bad7a584c6 cleanup nsclient settings 2020-07-24 13:30:19 +02:00
Milos Kozak 7bf9b8d588 better info in nsclient mode 2020-07-24 13:00:11 +02:00
Milos Kozak 80f2467694 remove logging 2020-07-24 12:42:28 +02:00
Milos Kozak d51a7c9461 scheduleBgHistoryChange 2020-07-24 12:39:18 +02:00
Milos Kozak 6b676a1dfd prevent NPE 2020-07-24 10:18:19 +02:00
Milos Kozak fc69e851d1
Merge pull request #2849 from dlvoy/fix-prefs-import-crash
Fix preferences import/export related crashes
2020-07-24 10:06:46 +02:00
Milos Kozak f9806162e1 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-24 07:48:00 +02:00
Milos Kozak 0a6cd80257 fix keepalive 2020-07-24 07:47:54 +02:00
Dominik Dzienia 310c0b9137 Refactor hardcoded error messages to be translatable 2020-07-23 13:42:55 +02:00
Dominik Dzienia 3d0c214f44 Fix crash when user insist on exporting preferences while denying granting storage permission
* Handles IO errors and display toast about FS / permission errors
* Clarify text - storage permissions are needed not only for logs, but for export too
2020-07-23 13:33:15 +02:00
Dominik Dzienia 4068cd72ca Fix crash when preferences import list is opened for the second time (due to buggy implementation of ActivityResult and Contracts in early androidx)
* updated to newest version of fragments where bug is fixed
* catched exception and inform user with Toast
* refactor duplicated code in ImportExportPrefs
2020-07-23 12:59:42 +02:00
Milos Kozak 66a19cce22 remove unneeded variable 2020-07-21 22:24:13 +02:00
Milos Kozak 74ca36bb6e fix NPE 2020-07-21 22:14:46 +02:00
Milos Kozak 05eee2ebb9 fix user message time 2020-07-20 13:28:07 +02:00
Milos Kozak 35a2692d25
Merge pull request #2822 from Philoul/ProfileHelperImprovement
Profile helper UI improvement (color & icon)
2020-07-20 12:57:54 +02:00
Milos Kozak 15586abe52 fix AS calculation 2020-07-20 12:33:35 +02:00
Milos Kozak 3174b8219e
Merge pull request #2821 from Philoul/FixOverviewTBRIcon
Fix TBR icon even with 100% percent set
2020-07-20 08:14:12 +02:00
Andy Rozman 23cd1d9143 - some minor changes on dependency (removed full path)
- removed some logging
- fixed DailyTotalsDTO toString
- changed level of some logging
2020-07-18 15:18:25 +01:00
Philoul 507e04a30b Compare Profile icon and tab2 color
Change tab 2 color (to red) and Profile type label color (to red when tab 2 selected)
2020-07-17 01:09:30 +02:00
Milos Kozak e3cd61cffc DPV profile 2020-07-16 17:30:04 +02:00
Milos Kozak 39b4eac60f add delay to executing automations 2020-07-15 22:46:59 +02:00
Philoul 61c3391eb5 Fix TBR icon even with TBR 100% set 2020-07-15 21:15:49 +02:00
Milos Kozak 9ff3011514 fix current location button 2020-07-15 20:06:45 +02:00
Milos Kozak 24f60ebc65 profile helper 2020-07-14 16:51:13 +02:00
Andy Rozman 6e50c3651d Merge branch 'dev' into medtronic_modules 2020-07-12 20:21:03 +01:00
Andy Rozman ea80eb3c9b - created 2 modules: rileylink and medtronic
- refactored some classes
2020-07-12 20:15:11 +01:00
Milos Kozak 639e5b8302 Merge branch 'dev' into profilehelper 2020-07-09 18:59:25 +02:00
Milos Kozak 1d8120d051 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-09 18:58:58 +02:00
Milos Kozak c2e5470da7 prevent ArrayIndexOutOfBoundsException 2020-07-09 18:52:09 +02:00
Milos Kozak f39df8e8eb check for input data 2020-07-09 18:48:28 +02:00
Milos Kozak 4b967d237c Merge branch 'dev' into profilehelper 2020-07-09 18:40:48 +02:00
Milos Kozak 112032ab0e fix nullable params 2020-07-09 14:26:19 +02:00
Milos Kozak 9401fd0d80 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-09 14:21:58 +02:00
Milos Kozak 950e3a677b
Merge pull request #2804 from Tornado-Tim/greenbox-fix
Fix: Green Glucose Target override
2020-07-08 23:07:31 +02:00
Milos Kozak 45f168d427 fix nsclient layout 2020-07-08 22:29:26 +02:00
Tim Gunn a93485a3c0
Fix the greenbox 2020-07-09 00:46:10 +12:00
Milos Kozak 2b7cb0d558 prevent kotlin exceptions 2020-07-07 17:16:22 +02:00
Milos Kozak 2c884821e0 ProfileHelper 2020-07-06 21:14:00 +02:00
Milos Kozak b91f8e668a Profile comparator 2020-07-06 13:52:10 +02:00
AdrianLxM 73cb485607 Warn user of insecure fallback on missing master password and activated fingerprint 2020-07-04 21:57:27 +02:00
Milos Kozak 91bc31ba1b fix tablet mode 2020-07-04 10:22:37 +02:00
Milos Kozak b02992e46b fix tests 2020-07-03 21:07:20 +02:00
Milos Kozak 888e7f4ab6 keep reference time for cached values 2020-07-03 20:10:47 +02:00
Milos Kozak 9c57e6b9b9 prevent NPE 2020-07-03 10:46:19 +02:00
Milos Kozak 1f71da4346 overview target logging 2020-07-03 10:38:16 +02:00
Milos Kozak 045b79d22f do not run RandomBgPlugin in main thread 2020-07-03 00:24:01 +02:00
Milos Kozak 9361010e46 do not run automation in main thread 2020-07-03 00:19:51 +02:00
Milos Kozak c2ae713cc4 prevent NPE: 2020-07-02 23:50:38 +02:00
Milos Kozak e9670dd20a fix displaying cob for nsclient 2020-07-02 23:35:19 +02:00
Milos Kozak 6e88d127e5 fix grabbing SSID info 2020-07-02 22:45:47 +02:00
Milos Kozak 3a2790acc3 remove BgSource from setup wizard 2020-07-02 20:28:42 +02:00
Milos Kozak b13c39ebc5 set predefined values for nsclient 2020-07-02 16:41:48 +02:00
Milos Kozak a08c1d5269 fix clash comming from RS history 2020-07-01 20:54:49 +02:00
Milos Kozak d66d362aa3
Merge pull request #2775 from Philoul/BGDeltaConsistency
BG Deltas consistency enhancement
2020-06-30 23:01:56 +02:00
Tim Gunn c4a317f515
Dismiss carb notifications automatically if no longer needed, crossfingers fix double wear OS notifications 2020-06-27 01:06:28 +12:00
Tim Gunn 2391ebe399
Remove the amount of carbs required from the main overview if a carb treatment has been made after APS run 2020-06-27 01:03:25 +12:00
Milos Kozak d04cf567b8
Merge pull request #2776 from Philoul/AutomationTempTargetMmol
Fix mmol units in automation Temp Target Action
2020-06-26 10:59:48 +02:00
Philoul 5f02a1cc84 Fix units in Automation TT Action 2020-06-26 09:28:12 +02:00
Philoul d28770ac08 Forgotten prediction lines 2020-06-25 21:33:45 +02:00
Philoul 2656e6a12c BG Deltas consistency enhancement
- Delta after minutes and label right aligned in layout (hard coded for label as it was in OverviewFragment)
- Signed delta avg values
2020-06-25 18:16:10 +02:00
Philoul 2606e51eb1 Second Fix, send all raw values sent in mg/dl (BG values, lowline and highline)
It's hard coded in mg/dl in Wear
Minor improvement in Wear code (just increase a little bit highest BG value in graphs, 400 mg/dl is sometimes too low => updated to 450 mg/dl)
2020-06-25 17:02:18 +02:00
Milos Kozak 0b0b4fc637 handle NS announcements properly 2020-06-24 19:15:35 +02:00
Milos Kozak 4d5880f034
Merge pull request #2741 from Philoul/Vector_Icons
Vector icons
2020-06-23 10:31:52 +02:00
Milos Kozak be6c184061 try to catch startup error 2020-06-22 23:31:13 +02:00
Milos Kozak 3305a5979d fix displaying profile switches 2020-06-22 22:55:50 +02:00
Milos Kozak 6783c78d32 remove TODO 2020-06-22 22:20:11 +02:00
Milos Kozak 6cbdd6b98a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-06-22 22:19:34 +02:00
Milos Kozak 6a1394b7b9 activate correct profile 2020-06-22 22:19:27 +02:00
Milos Kozak 63bf758636
Merge pull request #2747 from Philoul/Fix_Color_Watch_mmol
Fix "always yellow" in watch even if within range (mmol unit)
2020-06-22 21:06:30 +02:00
Milos Kozak 500de5fa2d fix status lights 2020-06-22 21:01:32 +02:00
Philoul 7f32881e10 Fix "always yellow" in watch 2020-06-20 14:54:54 +02:00
Philoul d55c9d9ff6 Update Layout and code with new icons 2020-06-19 14:24:31 +02:00
Milos Kozak c66084d3ab revert RandomBg safety 2020-06-19 11:13:30 +02:00
Dominik Dzienia 7f62450d99 Fix prediction data sent to WearOS by properly reacalculating them into current app unit 2020-06-17 15:53:46 +02:00
Dominik Dzienia 6b7420d0b7 Fix data sent to WearOS by properly reacalculating them into current app unit 2020-06-17 15:10:25 +02:00
Milos Kozak 782b109ebe
Merge pull request #2716 from Philoul/Replace_Png_Icons
Replace some png icons by vector
2020-06-16 22:16:34 +02:00
Philoul 5c2c8b5190 Safe Delete done
Forgotten usage added
2020-06-16 19:46:42 +02:00
Philoul 87f7dc0422 Delta added and clone lightened 2020-06-15 19:15:06 +02:00
Philoul acfd9621b7 replace 4 LowRes Icons (add, remove, clone and as)
For add, remove and clone I set width and height to 16dp (automatically scaled in Local Profile layout but not in automation)
for as, I replaced low res icon by double arrows of overview fragment (size a little bit increased because in automation icons are very small)
2020-06-15 16:48:35 +02:00
Milos Kozak 0f971ebe29
Merge pull request #2712 from Philoul/Clean_double_string_names
Clean double string names
2020-06-15 12:34:01 +02:00
Milos Kozak dae39d4379 fix NPE 2020-06-15 11:23:06 +02:00
Milos Kozak bb5157bcca synchronized updateGui 2020-06-15 11:21:39 +02:00
Philoul 129c3d82d6 Seven loop icons done 2020-06-14 01:57:54 +02:00
Philoul 5ef52ea90f Some new vector icons again 2020-06-13 17:37:52 +02:00
Philoul d3e98fb09b Create vector icon to replace png 2020-06-12 22:17:15 +02:00
Milos Kozak dae717d524 try to fix crash 2020-06-11 23:33:29 +02:00
Milos Kozak b5c72cb4a9
Merge pull request #2614 from Tornado-Tim/carbs-required
Show Carbs required - Updated from #1974
2020-06-11 20:42:43 +02:00
Milos Kozak b73196a8d1 Merge branch 'dev' into insight-artificial-end-delay 2020-06-11 14:56:58 +02:00
Milos Kozak 6826bed92f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-06-11 14:56:38 +02:00
Milos Kozak 17d71d218b allow RandomBg upload 2020-06-11 14:55:29 +02:00
Milos Kozak e09fd75a9b
Merge pull request #2680 from Lexsus/dev_Milos
add PUMP CONNECT and PUMP DISCONNECT commands
2020-06-11 14:14:39 +02:00
Milos Kozak deb99f236b better automation logging 2020-06-11 12:26:38 +02:00
Milos Kozak 8d2139fb59 history browser x-axis fix 2020-06-11 11:34:33 +02:00
Philoul ac98f2e144 Rename Exam double Strings 2020-06-10 15:38:26 +02:00
Milos Kozak 8b45464f30 secondary graphs layout improvements 2020-06-04 16:24:53 +02:00
Milos Kozak 064389d066 fix HistoryBrowser crash 2020-06-04 14:34:40 +02:00
Tim Gunn 3b3df40ef5
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-03 20:54:29 +12:00
Milos Kozak 15378fb2b8 InMemoryGlucoseValue 2020-06-02 21:59:51 +02:00
Milos Kozak 484f3a2a98 invalidate cache including bg after bg change 2020-06-02 19:28:56 +02:00
Tim Gunn 2c2201129b
Remove oref SMB carbs required preference 2020-06-03 00:17:05 +12:00
Tim Gunn 8142df9487
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-02 23:57:15 +12:00
Lexsus 94390ca32f fixed after review. 2020-06-01 19:29:37 +03:00
Milos Kozak 3f97530b02
Merge pull request #2691 from Philoul/AbsCurveBackgroung
ABS Curve in background
2020-06-01 13:28:03 +02:00
Tim Gunn ec188f1329
revert change 2020-06-01 12:14:45 +12:00
Milos Kozak 4efeb77fdc remove deprecation 2020-06-01 00:06:05 +02:00
Tim Gunn 8fefa0b5aa
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-01 02:14:17 +12:00
Milos Kozak 55bccafef5 Large display skin 2020-05-31 12:02:42 +02:00
Milos Kozak 09de329934 libs update & cleanup 2020-05-31 11:27:12 +02:00
Milos Kozak 95e6b02873 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-31 10:12:45 +02:00
Milos Kozak 31b3177561 upgrade fabric to firebase 2020-05-31 10:12:36 +02:00
Tim Gunn f69c11af40
Refractor to use new function 2020-05-31 16:43:32 +12:00
Tim Gunn 8aabf15dfe
snooze carb alerts for 15 min after treatments 2020-05-31 16:43:07 +12:00
Tim Gunn 28f2630a91
Eliminate Double notifications 2020-05-31 16:42:13 +12:00
Tim Gunn 04bd98e0e5
Add Last Carb Time 2020-05-31 16:41:19 +12:00
Philoul a39b7be520 Order in menu changed too for consistency
So it's necessary to select again curves in secondary graphs...
2020-05-31 00:52:32 +02:00
Philoul 51739c31b7 ABS Curve in background
I didn't change order in selection menu (otherwise selected curves are changed in secondary graphs...)
2020-05-31 00:18:23 +02:00
Milos Kozak f4293d4183
Merge pull request #2688 from Philoul/Add_Translation_Secondary_Graph_Title
Add translation for secondary graph title
2020-05-30 21:50:02 +02:00
Tebbe Ubben 5395ca4e71
Update LocalInsightPlugin.java 2020-05-29 19:51:13 +02:00
Lexsus 4af06620fb add tests for PUMP DISCONNECT sms command 2020-05-29 19:15:11 +03:00
Tim Gunn 15717f0271
fix duplicate vals 2020-05-29 22:42:54 +12:00
Tim Gunn 0dfdf6c68a
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-29 21:51:05 +12:00
Milos Kozak df0e46f47b remove duplicated files 2020-05-28 22:00:16 +02:00
Milos Kozak 02aff75dff
change delay to 1.5s 2020-05-28 21:33:36 +02:00
Milos Kozak 458efe467f
Merge pull request #2689 from Philoul/FixCOBHistoryBrowser
Fix Missing COB in history browser
2020-05-28 21:21:19 +02:00
Philoul bef8b38b76 Fix Missing COB in history browser
But more calculation and slower :(
2020-05-28 18:06:32 +02:00
Lexsus 9a1993c5f6 corrections.
add some test for sms commands
2020-05-28 17:33:51 +03:00
Philoul 1a94d3d55e Add Strings for secondary graph title for translation 2020-05-28 16:26:57 +02:00
TebbeUbben 79cafc14f5 Insight: Log end events five seconds earlier 2020-05-28 15:24:53 +02:00
TebbeUbben fa8e784733 Fix Open Humans Uploader 2020-05-28 15:19:35 +02:00
Milos Kozak 0abfb4c4f3
Merge branch 'dev' into carbs-required 2020-05-27 23:19:24 +02:00
Milos Kozak 49274ac0ef
Merge pull request #2602 from Tornado-Tim/skip-neutral-temps
WIP: Add skip Neutral Temps preference
2020-05-27 23:16:42 +02:00
Milos Kozak 77df5cdc10
Merge pull request #2679 from andyrozman/bug_2654_1
Bug 2654 (2)
2020-05-26 20:16:46 +02:00
Milos Kozak c5aa12c5ba double SMB fix 2020-05-26 19:58:50 +02:00
Lexsus 11f768636e add PUMP CONNECT and PUMP DISCONNECT commands 2020-05-26 12:48:21 +03:00
TebbeUbben 5533f87bbc Also upload APS data 2020-05-26 01:42:33 +02:00
Andy Rozman 3bbbeed07d - There are few fields hidden between implementations MedtronicCommunicationManager and RileyLinkCommunicationManager. If there is error in packet (if MySentry is configugured on Pump), there is NPE when trying to write to log. 2020-05-25 22:40:55 +01:00
Milos Kozak ec3ebd17db History activity performance improvement 2020-05-25 13:54:43 +02:00
Tim Gunn 7622d272c3
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-25 21:16:32 +12:00
Milos Kozak 8a731a9187 SMSCommunicator LOOP command auth 2020-05-24 23:40:51 +02:00
Milos Kozak 0a33f4c0db fix TriggerRecurringTime #2 2020-05-24 21:10:44 +02:00
Milos Kozak 1cb648c09a fix TriggerRecurringTime 2020-05-24 20:23:22 +02:00
Milos Kozak 87eb8021de configbuilder fix 2020-05-23 22:49:05 +02:00
Milos Kozak 3d1b500395 fix ProfileSwitch loading 2020-05-23 22:16:55 +02:00
Milos Kozak 8ae817cdda nsalarm notifications fix 2020-05-23 21:54:01 +02:00
Milos Kozak 8e49717794
Merge pull request #2647 from Philoul/Insight_Pref_Vibration
Add vibration in Insight preferences
2020-05-23 18:08:53 +02:00
Milos Kozak 88adf04652
Merge pull request #2663 from Tornado-Tim/show-targets
Show oref internal overridden targets
2020-05-23 18:01:28 +02:00
Philoul 4f41890add Add additionnal setting for automated deliveries and add both in pumpcontrol pref
- previous setting is for manual bolus and extended bolus
- This new setting is for SMB and temp basal with TBR emulation
You can change settings name and summary if you find better...
2020-05-23 16:30:03 +02:00
Milos Kozak d40188f04e Default language option 2020-05-23 15:39:05 +02:00
Tim Gunn 72943a5236
Add back setting adjustment 2020-05-22 11:08:01 +12:00
TebbeUbben 3fc2aede23 Improve performance of copy operation 2020-05-21 00:21:31 +02:00
TebbeUbben db1f9366aa Increase maximum wakelock duration 2020-05-21 00:05:54 +02:00
TebbeUbben c7df607d97 Some UI candy 2020-05-20 23:59:14 +02:00
AdrianLxM 06e97400f7 Simplify show-targets view logic 2020-05-20 22:34:09 +02:00
TebbeUbben 09b81093dc Also upload preferences 2020-05-20 22:11:31 +02:00
TebbeUbben b239100c13 Open Humans Uploader: Initial commit 2020-05-20 21:49:01 +02:00
Tim Gunn bf412ea798
refractor 2020-05-21 04:19:22 +12:00
Tim Gunn 723c029228
Deal with 0.0 if AMA is used 2020-05-21 02:20:38 +12:00
Tim Gunn 77a5af75e2
Display when Target BG is overidden 2020-05-21 00:11:36 +12:00
Tim Gunn a20008c0db
Add TargetBG 2020-05-21 00:10:51 +12:00
Philoul 6229161c96 Add constraintChecker for autosens icon in overview 2020-05-19 19:32:27 +02:00
Tim Gunn 3ae1bb669d
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-20 00:09:57 +12:00
Milos Kozak b2b1485c27 fix Actions buttons visibility 2020-05-19 13:22:02 +02:00
Milos Kozak d9b8a32aea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-19 12:52:15 +02:00
Milos Kozak eeb4ce1686 fix HistoryBrowser injection 2020-05-19 12:52:01 +02:00
Philoul 72e541908c Revert "Fix Wear Control Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)"
=> Second proposal better than my first one, split works with regex if it is of type Regex (it doesn't recognize first \ as a regex string but as an escape character...)
This reverts commit 480542a1
2020-05-17 08:09:58 +02:00
Philoul 480542a143 Fix Wear Control
Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)
2020-05-17 01:58:07 +02:00
Milos Kozak 8729fe18bd fix urgent NS alarm preference 2020-05-16 22:43:18 +02:00
Milos Kozak ca94e6cc67 layout #2 2020-05-15 22:41:14 +02:00
Philoul 1dd579fd19 Add disable vibration in insight settings (local_full only)
Build works but as it related to pump communication, I prefer to not test it on my pump before Tebbe confirmation... (code is very simple, so it should work!)
2020-05-15 11:37:09 +02:00
Milos Kozak 51ab43416a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-15 08:20:24 +02:00
Milos Kozak c311d593c1 show actions tab in NSC 2020-05-15 08:20:09 +02:00
Tim Gunn b1c6b81bb7
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-15 16:26:23 +12:00
Tim Gunn 32e4bb1220
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-15 16:25:35 +12:00
Milos Kozak be883afabe
Merge pull request #2644 from Philoul/Sensitivity_Icon
Sensitivity icon
2020-05-14 21:13:33 +02:00
Milos Kozak 2d3f1323dd layout update 2020-05-14 21:07:51 +02:00
Philoul 66c2bab60f Sensitivity Icon end proposal with a new icon
Svg file added in icons folder
2020-05-14 14:39:27 +02:00
Philoul 47725ad5d5 Sensitivity Icon (50% alpha if autosens disable) 2020-05-14 12:42:33 +02:00
Milos Kozak a241a23c99 fix pref parsing 2020-05-13 23:28:07 +02:00
Milos Kozak bc217438e9 fix message call MDT 2020-05-13 21:16:29 +02:00
Tim Gunn bcfd5e0149
revert counter logic 2020-05-13 11:36:32 +12:00
Tim Gunn 81ea43b218
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-13 10:34:07 +12:00
Tim Gunn 15df6f3349
merge n fix 2020-05-13 10:14:02 +12:00
Milos Kozak c03a89db16 HistoryBrowser fix 2020-05-13 00:11:48 +02:00
Tim Gunn fa74cf4804
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-13 09:37:50 +12:00
Milos Kozak 903555ed9f Dana msg refactor 2020-05-12 23:33:42 +02:00
Milos Kozak 65982ab94a
Merge branch 'dev' into carbs-required 2020-05-12 17:01:29 +02:00
Milos Kozak 666ce54b1f lint & deprecation 2020-05-12 15:07:50 +02:00
Milos Kozak 7060c51681 lint & deprecation 2020-05-12 14:33:47 +02:00
Milos Kozak b7ef191003 lint & deprecation 2020-05-12 13:34:32 +02:00
Milos Kozak 9c472e4e05 simplify RL code 2020-05-12 12:58:59 +02:00
Milos Kozak 66c567f0e7 lint & deprecation 2020-05-12 12:33:23 +02:00
Milos Kozak 1d1d57a458 fix SPBackupAgent 2020-05-12 00:04:09 +02:00
Milos Kozak 1b625265d0 Merge remote-tracking branch 'origin/master' into dev 2020-05-11 23:53:20 +02:00
Milos Kozak b5770d8e1b
Merge pull request #2638 from MilosKozak/danarefactor
Dana: refactor to modules
2020-05-11 20:36:50 +02:00
Milos Kozak b0513be8bf remove crashing dump 2020-05-11 20:15:35 +02:00
Milos Kozak 9e8124bc29 fix dana bolusing dialog 2020-05-11 20:05:12 +02:00
Milos Kozak 14b9ee3798 update manifests 2020-05-11 17:32:02 +02:00
Milos Kozak 5dea964b89 final dana renaming 2020-05-11 16:58:59 +02:00
Milos Kozak 441e5fdf3e extend pump interface for neutral temps 2020-05-11 14:50:35 +02:00
AdrianLxM 28dd3dedac
fix Java -> Kotlin nullability issue 2020-05-11 13:34:10 +02:00
Tim Gunn a4f4894985
fixes 2020-05-11 21:54:32 +12:00
Tim Gunn add8b71ea3
Internationalisation 2020-05-11 21:51:32 +12:00
Tim Gunn ea3ce995d8
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-11 21:14:33 +12:00
Andy Rozman 19675b1951 - change onStart 2020-05-10 23:19:11 +01:00
Milos Kozak b24690c2fa move RSCommModule 2020-05-10 23:45:49 +02:00
Milos Kozak 2375b159fa resources cleanup 2020-05-10 22:31:36 +02:00
Milos Kozak b43e7e5930
Merge pull request #2627 from Philoul/TempBasal_Icon_Switched
Temp Basal new icons for temp basal in overview
2020-05-10 21:11:41 +02:00
Milos Kozak 9ac88f7def remove mdtp library 2020-05-10 21:07:58 +02:00
Milos Kozak 05f73cd3ff elimitate careportal 2020-05-10 20:10:08 +02:00
Andy Rozman 95ef79e8e0 - fix for FoodFragment (fixed by Adrian on dev) 2020-05-10 16:11:36 +01:00
AdrianLxM cd84597058
Kotlin interface not stricter than Java superclass
Intrinsic check in Kotlin if view is null lead to crashes.
view is not even used so we can accept null.
2020-05-10 16:56:48 +02:00
Andy Rozman 80f5b3cf4b - changes on service starting (moved from cnst to onStart method)
- change RileyLinkBLE to stop reader
- added log for start and stop of service
2020-05-10 14:08:56 +01:00
Milos Kozak 54e68ef248 clean up 2020-05-10 11:49:37 +02:00
Tim Gunn efc25ddcd5
Use preferences 2020-05-10 21:25:14 +12:00
Tim Gunn a501b37159
Show animation if carbs are required 2020-05-10 21:24:46 +12:00
Milos Kozak 311f9dd119 danar module 2020-05-10 11:03:19 +02:00
Tim Gunn c9cf2cbae4
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-10 13:05:30 +12:00
Milos Kozak a99be409eb dana module 2020-05-09 20:18:12 +02:00
Andy Rozman c00d6344e5 - added some code to RileyLinkBLE 2020-05-09 12:09:47 +01:00
Andy Rozman d177e08355 - changed build file
- some changes to RileyLinkBLE to handle displaying Error
- loadSessionState from util used
- remove driver specific identifier functionality from RileyLinkService
2020-05-09 12:03:17 +01:00
Milos Kozak 7fc631a729 RS -> danaRS finished 2020-05-09 10:52:20 +02:00
Andy Rozman e2e4c6a17f - show RL status 2020-05-08 18:38:04 +01:00
Philoul 84f032a7a2 Revert "Temp Basal icon switched"
I replace first proposal with a new one with 3 icons

This reverts commit 24112eb4
2020-05-08 17:58:01 +02:00
Andy Rozman 480aac2d18 - RL status refresh 2020-05-08 15:23:02 +01:00
Milos Kozak 040c76d839 move pass 1 2020-05-08 14:59:30 +02:00
Andy Rozman 2243ec6061 - dagger 2020-05-08 13:05:31 +01:00
Andy Rozman de78ceb080 - added dagger deps 2020-05-08 12:47:35 +01:00
Andy Rozman 745b59cbed -initpodtask possible fix 2020-05-08 12:20:29 +01:00
Milos Kozak 61a077542c DanaRPump -> danars 2020-05-08 11:56:02 +02:00
Andy Rozman 9a36e9def8 - added dagger dependency for InitPodTask 2020-05-08 10:47:12 +01:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Milos Kozak 15207d1bf1 Omni comments 2 2020-05-08 01:09:30 +02:00
Milos Kozak 7dc7c9528b Omni comments 2020-05-08 00:23:17 +02:00
Milos Kozak 25bf92300b Merge remote-tracking branch 'origin/dev' into dev2 2020-05-07 23:44:46 +02:00
Andy Rozman bd39e246f3 - refactor OmnipodUIComm to support Dagger injections
- added DeviceCommandExecutor interface
- added method to interface RileyLinkPumpDevice
2020-05-07 22:41:24 +01:00
Milos Kozak 70e9d3e88a fix tests 2020-05-07 23:40:59 +02:00
Andy Rozman a915c279d4 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-07 21:22:22 +01:00
Andy Rozman 6f3379037b - added logging at RfSpy where we select frequency 2020-05-07 21:21:47 +01:00
Bart Sopers 4dc3440637 Restore null check in RuleyLinkCommunicationManager 2020-05-07 22:09:23 +02:00
Bart Sopers 7f2448adeb Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-05-07 21:16:36 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 120c526b80 move to core 2020-05-07 09:54:36 +02:00
Philoul 24112eb437 Temp Basal icon switched 2020-05-07 08:29:03 +02:00
Andy Rozman 5527c3d70d - remove omnipod as option from config builder 2020-05-07 01:04:29 +01:00
Andy Rozman 674cd1c0ae Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-07 00:43:18 +01:00
Andy Rozman 4f79b49e10 - changed loader to OmnipodUtil
- Modules
2020-05-06 23:34:05 +01:00
Bart Sopers 25e0b8b190 Add dagger stuff 2020-05-06 23:38:56 +02:00
Bart Sopers bafffad44a Use transient keyword instead of Gson annotation for PodSessionState members that should be exluded of (de)serialization 2020-05-06 21:41:33 +02:00
Milos Kozak ad472beb4a danars di start 2020-05-06 01:27:38 +02:00
Milos Kozak cf291b3adc fix after lib update 2020-05-06 01:18:04 +02:00
Milos Kozak a02bd59dc0 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 23:28:22 +02:00
Milos Kozak 1f4f5600bc NoSplashAppCompatActivity -> core 2020-05-05 23:27:01 +02:00
Milos Kozak 25c1100330 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 22:49:49 +02:00
Milos Kozak d114be7344 revert debug code 2020-05-05 22:43:26 +02:00
Milos Kozak bba7adc9aa fix Runnables after protection check, cleanup 2020-05-05 22:42:16 +02:00
Milos Kozak 8858d3b5f9 Merge remote-tracking branch 'origin/dev' into layout 2020-05-05 22:00:54 +02:00
Milos Kozak bbf5e6564f new icons 2020-05-05 22:00:35 +02:00
Dominik Dzienia 9a3cc5af82 Adds support for preferences directory, list of preferences to import, additional check on imported preferences metadata 2020-05-05 18:42:53 +02:00
Andy Rozman f3c4b4e5e7 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-05 13:50:53 +01:00
Andy Rozman e51e3daeb1 - added Expose attribute to all varaiables in PodSessionState
- OmnipodUtil: Gson now uses only Expose fields
2020-05-05 13:49:55 +01:00
Bart Sopers 9b089621fa Use allowed default for SP.getString in RileyLinkOmnipodService 2020-05-05 13:35:49 +02:00
Andy Rozman 2de1761555 - look at current pump service (either MDT or POD), RL Boradcast Receiver worked with internal instance, which wasn't correct, might need to refactor RileyLinkBroadcastReceiver further to be singelton... 2020-05-05 10:32:25 +01:00
Bart Sopers 32ce3ee18a enable PUMPBTCOMM by default for Omnipod branch 2020-05-05 02:34:08 +02:00
Bart Sopers 53e6cd4ef2 Apply several fixed from @andyrozman after Omnipod dagger merge 2020-05-05 02:03:01 +02:00
Bart Sopers 20f9f88d4b Use allowed default for SP.getString 2020-05-05 01:05:57 +02:00
Bart Sopers f7f5e0ce19 Replace static reference with member reference 2020-05-05 00:28:27 +02:00
Andy Rozman 7db7e07a70 - added SP to OmnipodUtil 2020-05-04 23:25:03 +01:00
Bart Sopers 7fa1ebfe38 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_dagger_with_initialization_fixes 2020-05-05 00:15:44 +02:00
Milos Kozak 0a63e1f29d Merge branch 'dev' into rs 2020-05-05 00:08:29 +02:00
Bart Sopers 5e3e947d8e Restore more formatting 2020-05-04 23:55:01 +02:00
Bart Sopers e7fe05dbeb Restore more formatting 2020-05-04 23:52:51 +02:00
Bart Sopers d8eb777b4c Restore more formatting 2020-05-04 23:36:00 +02:00
Bart Sopers df2de82810 Apply @andyrozman's fixes for compilation errors 2020-05-04 23:06:15 +02:00
Bart Sopers 71d5409344 Revert "- removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent"
This reverts commit ea0b89cbf8.
2020-05-04 22:50:08 +02:00
Milos Kozak 4a17fdc9a0 Merge remote-tracking branch 'origin/dev' into layout 2020-05-04 21:55:20 +02:00
Andy Rozman ea0b89cbf8 - removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent
- fixed commpiling problem
- removed OmnipodService from Manifest
2020-05-04 17:51:06 +01:00
TebbeUbben 1c075c526e 2.6.1.4 2020-05-04 17:36:37 +02:00
Bart Sopers 1798d260eb Merge branch 'dev' into omnipod_eros_dev_dagger_history_fix 2020-05-04 17:36:29 +02:00
Andy Rozman 6aaca5899c - changed Omnipod module 2020-05-04 11:27:12 +01:00
Milos Kozak d0221c34aa
Merge pull request #2616 from Philoul/Fix_TemporaryBasal_Crash
Fix Crash TemporyBasal
2020-05-04 11:53:22 +02:00
Milos Kozak 948bb8dc33
Merge pull request #2617 from Philoul/DatabaseHelper_Missing_Function
Add missing function in DatabaseHelper
2020-05-04 11:52:50 +02:00
Milos Kozak ab9da6e2b6 AlertDialogs -> core 2020-05-04 10:49:19 +02:00
Philoul 3e63d32d60 Add missing function in DatabaseHelper
getExtendedBolusDataFromTime(long from, long to, boolean ascending)
=> I need it for autotune plugin...
2020-05-04 10:40:22 +02:00
Philoul d44bc87d1b Fix Crash TemporyBasal
Injector missing with extendedbolus
2020-05-04 10:15:21 +02:00
Milos Kozak 2fb0198418 RxBus -> core 2020-05-04 01:36:46 +02:00
Milos Kozak e1ddde9697 FabricPrivacy -> core 2020-05-04 01:27:47 +02:00
Milos Kozak 5be4a5dd97 AAPSLogger -> core 2020-05-04 00:42:13 +02:00
Milos Kozak 99907ed029 SP -> core 2020-05-04 00:33:27 +02:00
Milos Kozak 7e6f82d068 Lgging cleanup 2020-05-04 00:14:23 +02:00
Milos Kozak db16434154 build.gradle unify 2020-05-03 22:18:58 +02:00
Milos Kozak 53383461f0 core module 2020-05-03 21:27:42 +02:00