Commit graph

11537 commits

Author SHA1 Message Date
Philoul
37777d7d82 Convert Long duration to min (TT from NS) 2021-03-04 00:22:40 +01:00
Philoul
e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +01:00
Philoul
4ce59b929a Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-03-03 22:49:31 +01:00
Milos Kozak
87f348fe5a
Merge pull request #390 from Tornado-Tim/window-perms-setup
Add Window Permission into Setup Wizard
2021-03-03 21:57:44 +01:00
Philoul
db1b3b7328 Add EventTime if changed (Carbs, TT, CP, PS) 2021-03-03 21:16:37 +01:00
Andrei Vereha
c2627176cf dash BleIO: s/let/also 2021-03-03 17:07:18 +01:00
Andrei Vereha
7976df596e dash eap-aka: use named parameters 2021-03-03 17:02:59 +01:00
Andrei Vereha
c3d7cf9483 dash LTK exchange: s/var/val 2021-03-03 17:02:12 +01:00
Tim Gunn
6688a2696e
add Window Permssion into Setup Wizard 2021-03-04 04:39:35 +13:00
Andrei Vereha
7c0e2af053 dash: rename EAP AKA to SessionEstablisher 2021-03-03 14:24:23 +01:00
Andrei Vereha
b2797fa57f dash: undo ktLint 2021-03-03 14:22:09 +01:00
Andrei Vereha
da84c35b31 format: CTRL+Alt+L 2021-03-03 14:18:20 +01:00
Milos Kozak
b0823bcfb8
Merge pull request #389 from swissalpine/patch-5
Fix for AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
2021-03-03 14:14:13 +01:00
Andrei Vereha
154e74fc22 dash ble: fix detekt issues 2021-03-03 14:10:33 +01:00
swissalpine
98e2d9ec86
Update XdripPlugin.kt 2021-03-03 11:06:55 +01:00
swissalpine
68a665bbeb
Fix for issue #380: AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
https://github.com/nightscout/AndroidAPS/issues/380
2021-03-03 11:00:48 +01:00
Philoul
a556df86c5 uel log, put name in value with unit 2021-03-03 08:53:48 +01:00
Philoul
e0610a8341 Fix 0 value not hidden and add separator for VWU 2021-03-03 00:31:28 +01:00
Milos Kozak
17ceb42df8 better message for out of limit 2021-03-03 00:07:02 +01:00
Milos Kozak
94edd017dd show TBR tab in engineering mode only 2021-03-02 23:32:30 +01:00
Milos Kozak
6eafda561c exclude dots from profile name 2021-03-02 23:22:15 +01:00
Philoul
efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +01:00
Milos Kozak
efddea0eee
Merge pull request #386 from nightscout/tt
TempTarget -> room
2021-03-02 22:41:36 +01:00
Andrei Vereha
c9beb21404 format: klintFormat 2021-03-02 22:22:03 +01:00
Andrei Vereha
ada3560f49 format: remove trailing commas 2021-03-02 22:20:30 +01:00
Andrei Vereha
e90bda0234 dash eap-aka: complete the session key exchange
Fake pod logs
```
INFO[0021] got CK: daff384a4098571975d136a480a71b36
INFO[0021] got Nonce: 33a0c6dd0a0a0a0a
```

The application logs:
```
[OmnipodDashBleManagerImpl$connect$1.subscribe():139]: CK: daff384a4098571975d136a480a71b36
 [OmnipodDashBleManagerImpl$connect$1.subscribe():140]: noncePrefix: 33a0c6dd0a0a0a0a
```
2021-03-02 22:17:11 +01:00
Andrei Vereha
db47554bad
Merge pull request #16 from 0pen-dash/format
code formatting
2021-03-02 20:21:28 +01:00
Andrei Vereha
9c42e5749f ble/milenage: fix and add tests 2021-03-02 18:39:03 +01:00
Andrei Vereha
099ec0a328 ble scan: improve log message 2021-03-02 18:37:45 +01:00
Philoul
f226a03c83 Fix Converters.kt
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
2021-03-02 13:31:07 +01:00
Andrei Vereha
b6692a5ac6 WIP: add Milenage
AUTN is not correct yet
2021-03-02 10:44:36 +01:00
Milos Kozak
46fbde9643 add project-dictionary 2021-03-02 00:11:05 +01:00
Milos Kozak
b5dcf27b07
New Crowdin updates (#378)
* New translations validator.xml (Dutch)

* New translations validator.xml (German)

* New translations alert_descriptions.xml (German)

* New translations alert_titles.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations validator.xml (Romanian)

* New translations alert_descriptions.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations validator.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)
2021-03-01 23:55:55 +01:00
Milos Kozak
56daa82735 bump 2.8.2.1-dev-c 2021-03-01 23:39:34 +01:00
Milos Kozak
69aa6cb496 Merge branch 'tt' of https://github.com/nightscout/AndroidAPS into tt 2021-03-01 23:37:19 +01:00
Milos Kozak
06f35dc522 small fixes 2021-03-01 23:37:14 +01:00
Milos Kozak
ae86cfea77 log errors without tags 2021-03-01 23:11:59 +01:00
Milos Kozak
56aaa0a90b
Merge pull request #385 from nightscout/adrian/tt
mocking with argThat
2021-03-01 19:01:16 +01:00
Milos Kozak
fdcb65e32c
Merge pull request #383 from nightscout/adrian/wear-events
call confirm wear event
2021-03-01 18:09:30 +01:00
Milos Kozak
e5b15a3f11
Merge branch 'tt' into adrian/tt 2021-03-01 17:24:07 +01:00
Milos Kozak
05d5f8217c fix tests 2021-03-01 17:22:12 +01:00
AdrianLxM
fc7f63d219 mocking with argThat 2021-03-01 16:28:08 +01:00
Andrei Vereha
e82826bf5a dash/ble: start implement EAP-AKA 2021-03-01 15:22:52 +01:00
Andrei Vereha
0523f7c17c format: remove trailing commas 2021-03-01 15:20:02 +01:00
AdrianLxM
f40450548f
Merge pull request #17 from 0pen-dash/adrian/linting
Adrian/linting
2021-03-01 14:38:16 +01:00
AdrianLxM
89ff502518 a bit more formatting 2021-03-01 14:35:50 +01:00
AdrianLxM
5ef07dd0be detekt resolve a few more 2021-03-01 13:52:43 +01:00
AdrianLxM
e7b3d85639 detekt resolve a few 2021-03-01 13:49:39 +01:00
AdrianLxM
77c816e813 ktlint format 2021-03-01 13:39:02 +01:00
AdrianLxM
3ebcc1c71e make detekt work 2021-03-01 13:34:34 +01:00