Commit graph

6231 commits

Author SHA1 Message Date
Bart Sopers b944c51372 Process review findings from upstream merge 2020-09-06 15:25:56 +02:00
AdrianLxM 54be27e76a
Merge pull request #2950 from MilosKozak/feature/oh-uploader-2_7
Open Humans Uploader for v2.7
2020-09-05 21:31:43 +02:00
Tebbe Ubben 1d88d16545
Set maxProgress to correct value 2020-09-05 11:55:38 +02:00
Bart Sopers 503fc9dbf9 Allow to continue in Setup Wizard when Omnipod has been selected and a RL connection has been established 2020-09-05 04:26:22 +02:00
TebbeUbben f3d8690f5c Change term 2020-09-04 23:24:20 +02:00
TebbeUbben 3745525489 Remove debugging call 2020-09-04 23:18:14 +02:00
TebbeUbben 45fd5264b0 Fix queue size view 2020-09-04 23:11:27 +02:00
TebbeUbben 71b13917c4 Segmental upload 2020-09-04 23:11:11 +02:00
Geoffrey Hansen 354e77e733 indeterminate progress bar OH uploader 2020-09-04 21:19:00 +02:00
Geoffrey Hansen e6f8da32cc correct text on worker foreground 2020-09-04 21:14:38 +02:00
Geoffrey Hansen f24e69dfc8 correct text on worker foreground 2020-09-04 21:13:40 +02:00
Dominik Dzienia 651c3fc426 Add additional prompt for old master password
Prompt for old master password (used to encrypt exported preferences) if current master password is different and cannot decrypt file.
2020-09-04 03:55:02 +02:00
Bart Sopers 02583c2612 Prepare Omnipod branch for upstream merge 2020-09-04 00:07:37 +02:00
Bart Sopers cd5bc21b17 Add BatteryReplaceable PumpCapability and hide Battery change button in Actions tab for pumps without this capability (Omnipod); create battery change and insulin change careportal event after activating new Pod 2020-09-03 23:35:03 +02:00
Geoffrey Hansen 25164eab01 remove artificial delay for testing 2020-09-03 22:16:02 +02:00
Geoffrey Hansen 02f85398d7 cleanup 2020-09-03 21:22:33 +02:00
Geoffrey Hansen ae980e12f4 oh foreground worker and some edgecases 2020-09-03 19:39:43 +02:00
Geoffrey Hansen 8a6a3d2283 OH uploader enqueue Treatments and don_t load historical values 2020-09-03 18:01:42 +02:00
Geoffrey Hansen e69966ad47 exclude OH uploader on NSClient flavor 2020-09-02 15:48:17 +02:00
Geoffrey Hansen 2c2e01dee6 Merge remote-tracking branch 'origin/openhumans_old_db' into HEAD 2020-09-02 15:32:11 +02:00
Bart Sopers 898100a0e1 Move RileyLink dagger module class to RileyLink gradle module 2020-09-02 02:22:18 +02:00
Bart Sopers d994f2a184 Move Omnipod dagger module class to Omnipod gradle module 2020-09-02 02:04:31 +02:00
Bart Sopers fead64aa16 Revert "Prepare Omnipod for upstream merge"
This reverts commit 7c82dbdf93.
2020-09-01 22:19:08 +02:00
Bart Sopers 5bd623e322 Remove unresolved Omnipod import after merge 2020-09-01 22:05:59 +02:00
Bart Sopers b0d0ea3476 Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge 2020-09-01 21:57:40 +02:00
Milos Kozak 3457f8f511 remove language setting from wizard 2020-09-01 10:02:35 +02:00
Milos Kozak 7c7d115612 ns_upload_only true everywhere 2020-09-01 09:53:24 +02:00
Bart Sopers 01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Bart Sopers aa7e57512a Move Omnipod RileyLink classes into subpackages 2020-08-28 01:22:50 +02:00
Bart Sopers d26cd9f069 Create fake 0 TBR when Pod is not running 2020-08-28 01:18:32 +02:00
Milos Kozak 134b79dd8a show tir range 2020-08-27 10:38:53 +02:00
Milos Kozak d7817792ca show correct constraint in loop plugin 2020-08-26 18:12:03 +02:00
Bart Sopers 5a7c14fb2e Fix dependency injection in RLHistoryItemOmnipod 2020-08-26 14:30:36 +02:00
Bart Sopers 2fdbbd9057 Check in files forgotten in previous commit 2020-08-25 14:00:04 +02:00
Milos Kozak f2d89ac428 lint recommendations 2020-08-24 21:54:53 +02:00
Milos Kozak 20e7020b07
Merge pull request #2917 from GermanBluefox/patch-3
Show time string instead of ms in JSON structures
2020-08-24 21:51:27 +02:00
Milos Kozak cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab
Add Manual BG or Calibration in CarePortal Tab of Treatment
2020-08-24 21:45:56 +02:00
Bart Sopers ddd9687425 Reorganized packages and removed a few unused classes 2020-08-23 19:21:01 +02:00
Bart Sopers 4a10a04f79 Remove OmnipodUiComm and OmnipodUiTask 2020-08-23 16:15:35 +02:00
Philoul 0d3d83806b Add Calibration in Translator.kt
Replace strings by Constants defined in CareportalEvent (most of them already defined)
8 Constants added in CareportalEvent file (3 types used in CareDialog.kt and Translator.kt, 5 only used in translator.kt)
=> I don't know if these types still exists now without CarePortal Plugin...
2020-08-22 18:33:13 +02:00
Bluefox f224cb1af1
Show time string instead of ms in JSON structures 2020-08-22 17:17:43 +02:00
Bart Sopers 7c82dbdf93 Prepare Omnipod for upstream merge 2020-08-22 11:06:33 +02:00
Bart Sopers 1f3e8a4102 Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev 2020-08-21 15:34:47 +02:00
Milos Kozak e7627f4f6c try to fix IllegalStateException 2020-08-21 13:41:48 +02:00
Milos Kozak 8c987c8be9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-08-21 10:30:41 +02:00
Milos Kozak 7282f460fc better synchronize graph rendering 2020-08-21 10:29:23 +02:00
Bart Sopers c22119bb85 Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields 2020-08-20 18:39:16 +02:00
Bart Sopers 7d63671d7b fix import 2020-08-20 02:30:15 +02:00
Bart Sopers 0e9adda3a4 Make sure that after restart, bolus treatment is added when the app is killed during a bolus 2020-08-20 02:20:05 +02:00
Milos Kozak 09e5c82d4d unify units spacing 2020-08-19 21:24:01 +02:00
Milos Kozak 9ca20f425f BG input in wizard improvement 2020-08-19 10:58:45 +02:00
bartsopers 6c3e7a8f43
Merge pull request #143 from smuething/move-protection-to-core
Move protection to core
2020-08-18 20:00:57 +02:00
Steffen Müthing d0cbaeeb32 Move protection infrastructure to core
The protection infrastructure is useful for other modules like pump drivers,
so it should be in core.
2020-08-18 19:33:50 +02:00
Steffen Müthing 75cbc87b4a Move SingleClickButton to core
SingleClickButton is a utility used in a number of modules and such should be
in core. While the app seems to built with the button in app, this wrong
structure should be fixed.

As the button is a UI element, the patch also moves the class to the package
info.nightscout.androidaps.utils.ui.
2020-08-18 15:09:14 +02:00
bartsopers 228441f54c
Merge pull request #139 from smuething/more-daggerization
More daggerization
2020-08-18 12:44:21 +02:00
Steffen Müthing 80f1ed52b3 Move CryptoUtil to core
CryptoUtil is a dependency of ProtectionCheck, so it needs to move to core.
2020-08-18 12:36:25 +02:00
Bart Sopers 48ad85ae6a Move Omnipod tab closer to Overview tab 2020-08-18 12:33:26 +02:00
Steffen Müthing 3646ef083e Simplify provisioning of PodStateManager
PodStateManager can be provided by AapsPodStateManager, that's much easier than
getting the constructor signature right in the dependency injection module.
2020-08-18 00:25:14 +02:00
Steffen Müthing 7d52228e15 Move RileyLink components to a separate dependency injection module
Having them in the Medtronic module will only create confusion later on.
2020-08-18 00:22:24 +02:00
Bart Sopers 5c4b9846e6 WIP on moving Omnipod into a separate module 2020-08-17 19:53:43 +02:00
Bart Sopers 2a55c6413c Remove redundant DeviceCommandExecutor interface 2020-08-17 00:07:56 +02:00
Bart Sopers b5c46e3bcf WIP on moving Omnipod to a separate module 2020-08-16 23:54:41 +02:00
bartsopers a30ca700f7
Merge pull request #137 from smuething/protect-pod-management
Add protection to Pod management activity
2020-08-16 21:10:14 +02:00
Bart Sopers 100f8fe235 Some Omnipod cleanup after merge 2020-08-16 17:05:32 +02:00
Bart Sopers 5d3426dc70 Replace custom functional interfaces with built in types 2020-08-16 13:56:39 +02:00
Bart Sopers 5bd873cd0e Remove unused Dash code 2020-08-16 13:22:31 +02:00
Bart Sopers a3cb8ff648 Merge remote-tracking branch 'upstream/dev' into omnipod_eros_dev_merge_from_upstream 2020-08-16 12:37:28 +02:00
Steffen Müthing 1bae8526d0 Add protection to Pod management activity
Pod management should be protected, as it lets you stop the current
Pod. The available activities semm preferences-like to me, so that's
the protection type that I used.
2020-08-15 22:09:29 +02:00
Bart Sopers f37a2452fb Small cleanup and added some TODOs 2020-08-15 19:01:48 +02:00
Bart Sopers 59ad718969 Remove SetupProgress enum in favor of PodProgressStatus, which comes directly from the Pod 2020-08-15 11:23:45 +02:00
Milos Kozak d7f9208acf fix LP reset button 2020-08-14 17:22:06 +02:00
Milos Kozak 9318f0637a
Merge pull request #2887 from Philoul/ExtendedIOBCalc
Replace Default Dia by profile Dia in extendedBolus's Iob calculation
2020-08-14 13:57:26 +02:00
Milos Kozak 3dfa066cf5 MINDIA = 5.0 2020-08-14 11:25:30 +02:00
Philoul 5c7d0a8516 Replace Default Dia by profile Dia in extendedBolus Iob calculation 2020-08-14 10:00:53 +02:00
Milos Kozak f546fdf837 ignore Can not perform this action after onSaveInstanceState 2020-08-13 13:55:39 +02:00
Bart Sopers c56bc5ae61 Temporary workaround for pod activation and deactivation wizard crashes on rotation 2020-08-13 12:22:36 +02:00
Bart Sopers 159c1f941d Ignore IllegalPacketTypeException in AssignAddressAction if packetType is ACK and we already successfully assigned the address before 2020-08-12 18:30:57 +02:00
Bart Sopers 07d520313f Set String instead of int value for pod LOT in RileyLinkStatusGeneralFragment 2020-08-11 22:46:02 +02:00
Bart Sopers b5d55adb2e Store PodProgressStatus in PodState 2020-08-11 21:17:37 +02:00
Bart Sopers 0584cbd6af Use PodStateManager as a source for displaying info in Omnipod tab (and some other small changes) 2020-08-11 21:00:03 +02:00
Milos Kozak b8327f6b3a fix ABS IOB calculation 2020-08-11 14:32:48 +02:00
Bart Sopers 1b2c91a6f9 Fix message sequence numbers when resyncing nonce 2020-08-11 13:10:53 +02:00
Bart Sopers 84ce2d1790 Set pump driver to busy and set state to suspended when Pod has a fault event 2020-08-11 13:10:00 +02:00
Bart Sopers 1ba9244ecd Don't duplicately log request message when exchanging OmnipodMessage 2020-08-11 10:16:06 +02:00
Bart Sopers 0ba26e8b2c Update last failed communication time when an exception is thrown in OmnipodCommunicationManager.transportMessages and add log response from the Pod when exchanging messages 2020-08-11 10:16:05 +02:00
Andy Rozman 5e20444bf4 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-08-10 23:07:14 +01:00
Bart Sopers a55be8d33f - Fix local alerts
- Remove duplicate RL error from Pod tab
2020-08-10 22:27:52 +02:00
Bart Sopers 906b8c2585 Remove argument checks for piVersion in internal pod state representation 2020-08-10 20:49:48 +02:00
Bart Sopers 341474295f - Allow resetting pairingParameters in PodStateManager if the setup state is ADDRESS_ASSIGNED
- Improve pod status screen
- Improve event dispatching in AapsPodStateManager (send less events)
- Add more FIXMEs and TODOs
2020-08-10 20:15:52 +02:00
Bart Sopers a0ca8cf9cc - Partial fix for display of RL status
- Fix IllegalStateException when AssignAddressAction is executed when an address has already been assigned
- Improve (not yet used) custom unreachable alert check
- Remove hasFixedUnreachableAlert from PumpType
- Remove omnipodPumpStatus.podAvailable in favor of PodStateManager
- Remove some unused code / comments
- Add a bunch of TODOs
2020-08-10 17:58:54 +02:00
Andy Rozman 1ebb7144ec - reenable fabric events 2020-08-10 14:18:04 +01:00
Milos Kozak 4bacfad0db fix empty mgdl local profile 2020-08-10 13:06:27 +02:00
Milos Kozak 1bbca2787b BolusWizard typographic 2020-08-10 12:35:59 +02:00
Bart Sopers 8ed802d91b Improve information on Pod tab 2020-08-09 21:03:40 +02:00
Bart Sopers e74e80a4ce Inject RileyLinkServiceData in SetPreamble command and remove some unused code 2020-08-09 19:11:00 +02:00
Milos Kozak 817ec086a1 prevent IndexOutOfBoundsException 2020-08-09 17:43:51 +02:00
Bart Sopers 1787afda98 Daggerize AapsPodStateManager 2020-08-09 16:41:16 +02:00
Bart Sopers da2c2110da Load pod state after initializing PodStateManager 2020-08-09 14:06:45 +02:00
Bart Sopers 050816ddf9 Restore accidentally removed code 2020-08-09 14:04:24 +02:00
Bart Sopers 62bda451a0 Prevent NPE 2020-08-09 13:36:08 +02:00
Bart Sopers e5274e2d3a - Extract abstract class for PodStateManager on driver level
- Remove PodStateChangedHandler
- Add new fields to PodState
- Add Lot, Tid and Firmware Version in Pod tab
- Various small improvements
- Add some FIXMEs
2020-08-09 13:24:48 +02:00
Philoul b70c6c9f1b Update BGSourceFragment
Arrow color a little bit lighter than text (don't find exact text color)
Default color for arrows swtiched to white
2020-08-09 10:49:54 +02:00
Bart Sopers 31938547a5 Fixes for PodStateManager 2020-08-08 21:38:08 +02:00
Philoul adc71aae08 Update Overview Layout for Arrow icons
Add a directionToIcon function in BGReading
Move arrow icons to core
2020-08-08 19:09:21 +02:00
Bart Sopers 10cde3e744 More improvements for PodStateManager 2020-08-08 19:05:36 +02:00
Bart Sopers 2a73127202 Small code improvements for PodStateManager 2020-08-08 18:52:49 +02:00
Bart Sopers 76d267dce4 Prevent NPE 2020-08-08 18:44:33 +02:00
Bart Sopers 3bc53544a2 Bug fixes and improvements in PodStateManager stuff 2020-08-08 18:37:10 +02:00
Bart Sopers b50670cceb Replace PodState with PodStateManager 2020-08-08 18:16:37 +02:00
Andy Rozman 337c61d500 - added dependency 2020-08-08 15:16:50 +01:00
Bart Sopers a06d78b0b7 Add dagger annotations in AapsPodStateManager 2020-08-08 15:42:53 +02:00
Bart Sopers ffb518f50f Introduce PodStateManager 2020-08-08 15:26:51 +02:00
Bart Sopers 80e8d094df Improve pod status text 2020-08-06 23:01:28 +02:00
Bart Sopers d446751d8a Correctly load Pod state from Shared Preferences after startup 2020-08-06 20:19:15 +02:00
Andy Rozman eafb68d496 - small change init of RfSpyReader
- changed log in RfSpy
2020-08-02 15:28:07 +01:00
Andy Rozman 11c71149ad - added firmware versions
- changed faulty init in RadioResponse
- added some logging
2020-08-02 14:46:07 +01:00
Andy Rozman faeb2576a9 - added real pod status to pod status 2020-08-01 19:54:58 +01:00
Philoul 4bf1e886a4 Fix Plugin Preference enable for Overview 2020-08-01 19:14:38 +02:00
Andy Rozman 54d30cd8c4 - reverted some of my changes
- fixed problem that service doesn't start with AAPS, but with Tab click
2020-07-31 19:00:00 +01:00
Andy Rozman 557568b353 - fixed some cosmetical changes
- fixed problem with initialization, now MDT is initialized at once
2020-07-31 16:39:56 +01:00
Andy Rozman 20e2bf0b06 Merge branch 'dev' into medtronic_modules 2020-07-31 11:21:05 +01:00
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