Commit graph

12644 commits

Author SHA1 Message Date
Dominik Dzienia 9dca938698 Refactored CryptoUtil to make it injectable and more testable
Added checks for vanilla JVM AES 256 issues in tests
2020-04-06 23:48:25 +02:00
Tim Gunn babb97df24
remove old determine_basal 2020-04-06 22:26:21 +12:00
Tim Gunn b009c7bed2
Move the APS logger to its own package 2020-04-06 22:01:15 +12:00
Tim Gunn bebe9015e8
Remove MA 2020-04-06 22:00:17 +12:00
Tim Gunn a88db5b457
Revert "Remove oref0"
This reverts commit 785b4540c9.
2020-04-06 21:11:47 +12:00
Milos Kozak a8d76cef4c fix SmsPluginCommunicatorTest 2020-04-06 10:36:08 +02:00
Milos Kozak 0d89262dfa fix SmsPluginCommunicatorTest 2020-04-06 10:35:00 +02:00
Milos Kozak aa8ddc67e5 Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-06 09:53:20 +02:00
Milos Kozak 731bd1c8cb
Merge pull request #2228 from Tornado-Tim/update-oref
Update Oref to 0.7.0
2020-04-06 09:45:15 +02:00
Milos Kozak 9f58270f88
Merge pull request #2553 from dlvoy/dagger3-patient-name
Introduced Patient name, refactored SMS OTP and Prefs Export to use it
2020-04-06 09:44:20 +02:00
Tim Gunn f0bdafc1d6
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-04-06 18:46:58 +12:00
Tim Gunn a87681a31a
fix variable 2020-04-06 18:45:47 +12:00
Milos Kozak 2995999989 Merge remote-tracking branch 'origin/dev' into dagger3 2020-04-06 00:19:12 +02:00
Milos Kozak 0f6f344f63
Merge pull request #2552 from MilosKozak/2.6.1.1
2.6.1.1
2020-04-05 23:41:28 +02:00
Milos Kozak d64edd486b
Merge branch 'master' into 2.6.1.1 2020-04-05 21:37:05 +02:00
Milos Kozak 27b433d773
bump 2.6.1.1 2020-04-05 21:36:01 +02:00
Dominik Dzienia f1770c093b Introduced Patient name, refactored SMS OTP and Prefs Export to use it 2020-04-05 21:35:19 +02:00
Winfried Kuiper 98af8531f0
Typo in log message (#2547) 2020-04-05 21:11:13 +02:00
Milos Kozak 93523d5828
Merge pull request #2551 from MilosKozak/l10n_dev
New Crowdin translations
2020-04-05 21:09:26 +02:00
Milos Kozak 970f553a9e
Merge pull request #2533 from jotomo/2742-2
SMS Carb command update
2020-04-05 21:09:12 +02:00
Milos Kozak 856ef12f16 New translations objectives.xml (Dutch) 2020-04-05 18:33:39 +02:00
Tim Gunn 91e36e01ba
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-04-05 23:04:49 +12:00
Tim Gunn 6d064fb56c
fix preference screen to conform to norms 2020-04-05 23:03:19 +12:00
Tim Gunn 63fb50a2e6
Update oref1 text. 2020-04-05 22:35:49 +12:00
Tim Gunn 785b4540c9
Remove oref0 2020-04-05 22:33:20 +12:00
Tim Gunn d960cb038f
Remove options from exam that are no longer available 2020-04-05 22:10:25 +12:00
Tim Gunn f707c72634
Remove oref0 sensitivity 2020-04-05 22:02:37 +12:00
Milos Kozak e664ee027d
Merge pull request #2548 from dlvoy/dagger3-otpfix
Fixed crash on pre-26 API due to lack of java.time.Duration in depenent OTP lib
2020-04-05 10:04:59 +02:00
Milos Kozak 312d863e38 OverviewFragment refactor 2020-04-05 10:04:21 +02:00
Tim Gunn 1509fe2dea
merge into dagger 2020-04-05 14:22:19 +12:00
Tim Gunn 0a8d456d01
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-04-05 14:21:20 +12:00
Dominik Dzienia 033ca414f7 Fixed crash on pre-26 API due tu lack of java.time.Duration in dependent OTP lib 2020-04-05 01:37:05 +02:00
Andy Rozman 88554ee376 Merge branch 'dev' into omnipod_eros_dev 2020-04-04 20:25:09 +01:00
Andy Rozman b689ddfc99 - changed PumpType 2020-04-04 17:15:06 +01:00
Tim Gunn cf35fc52cd
cherry pick big fix: cb8e94990301277fb1016c778b4e9efa55a6edbc 2020-04-05 02:46:24 +13:00
Tim Gunn acab0b87be
Merge branch 'dagger3' of github.com:MilosKozak/AndroidAPS into update-oref 2020-04-05 00:45:47 +13:00
Milos Kozak 3a2d486976 Move Overview menus to separate class 2020-04-03 21:47:23 +02:00
Milos Kozak aeb18e0b7c Fix others flavors 2020-04-03 12:09:57 +02:00
Milos Kozak 013018ac7b Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-02 22:06:17 +02:00
Milos Kozak 58fe62c45a concurrency extension 2020-04-02 21:46:30 +02:00
Milos Kozak ff67c44e8f process passwords in preferences correctly 2020-04-02 19:14:50 +02:00
Milos Kozak 7ab5bea93d allow multiple user notifications 2020-04-02 19:04:22 +02:00
Milos Kozak dbc199d00c Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2020-04-02 18:48:49 +02:00
Milos Kozak 615b025600 Merge branch 'pull/2542' into dagger3 2020-04-02 18:48:37 +02:00
Milos Kozak 64ee80b48b
Merge pull request #2545 from dlvoy/dagger3-encprefs
Preferences Encryption
2020-04-01 23:31:29 +02:00
Dominik Dzienia 3565ef9fbc Code cleanup 2020-04-01 22:12:52 +02:00
Milos Kozak e05f9f2a87 Merge remote-tracking branch 'origin/dev' into dagger3 2020-04-01 21:33:04 +02:00
Milos Kozak c765654d6a MainActivity -> kt 2020-04-01 21:10:48 +02:00
Dominik Dzienia f532341ccc Post review fixes 2020-04-01 20:34:05 +02:00
Milos Kozak 447c05f05f
New Crowdin translations (#2543)
* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations objectives.xml (Bulgarian)

* New translations strings.xml (Portuguese, Brazilian)
2020-04-01 18:13:48 +02:00