Commit graph

12957 commits

Author SHA1 Message Date
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
Milos Kozak 3b5b945fea TemporaryTarget -> room database 2021-03-01 12:42:42 +01:00
AdrianLxM 9a6a81248d Merge remote-tracking branch 'origin/bart/implement-managers' into adrian/linting 2021-03-01 12:40:42 +01:00
AdrianLxM 070ba1cfc2 add ktlint and detekt 2021-03-01 12:34:47 +01:00
Andrei Vereha 07c6a95145
Merge pull request #15 from 0pen-dash/bart/improvements
Some improvements
2021-03-01 11:06:31 +01:00
Philoul df995724a7 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
# Conflicts:
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
2021-03-01 08:34:40 +01:00
Bart Sopers 59bfa7a04d Implement Pod activation command flow 2021-03-01 01:23:40 +01:00
Philoul 21784920de Fix witdth of Carbs Layout 2021-02-28 23:20:37 +01:00
Philoul a2c3ec3a7f Fix Constants.MGDL and Constants.MMOL
Fix .addMigrations(migration3to4) (I hope)
2021-02-28 22:05:03 +01:00
Bart Sopers 82d2f9ae36 Merge branch 'dash' into bart/improvements 2021-02-28 21:10:09 +01:00
bartsopers caa191ebf2
Merge pull request #10 from 0pen-dash/ble-message-receiving
Ble message receiving
2021-02-28 21:09:40 +01:00
AdrianLxM d098f81241 missing import 2021-02-28 20:02:36 +01:00
AdrianLxM d42e8fbe92 call confirm wear event 2021-02-28 19:48:33 +01:00
Andrei Vereha c8bded99ab remove tailing comma 2021-02-28 19:45:21 +01:00
Andrei Vereha a7ca5fd863 format code: Ctrl+Alt+L 2021-02-28 19:44:10 +01:00
Bart Sopers 8e7b1d3612 Review: use fold in AlertUtil.encodeAlerts 2021-02-28 19:28:52 +01:00
Andrei Vereha 57c2d2d9a1 Address review comments:
- move think dependency to core_dependencies and make it's version
   configurable: https://github.com/0pen-dash/AndroidAPS/pull/10#discussion_r584329468
 - add message string to exceptions. Renames
2021-02-28 19:11:42 +01:00
Bart Sopers 8e7e2450ae Update active alerts from default status response in Pod state 2021-02-28 18:46:49 +01:00
Bart Sopers bf060da878 Fix typo 2021-02-28 18:42:17 +01:00
Andrei Vereha b1f099c506 rename LTK to Pair 2021-02-28 18:38:43 +01:00
Andrei Vereha ee0ac46c5a Finish implementing the LTK exchange
On the fake pod:
```
INFO[0067] LTK 21f4a9d825ce5e57bad5b4958c6ff95e
```
Logcat:
```
2021-02-28 18:21:04.763 19530-22490/info.nightscout.androidaps I/PUMPCOMM: [AsyncTask #4]: [OmnipodDashBleManagerImpl.connect():86]: Got LTK: 21f4a9d825ce5e57bad5b4958c6ff95e
``
2021-02-28 18:37:36 +01:00
Andrei Vereha ddb1c18349 ble ltk: implement encryption and message parsing 2021-02-28 18:33:07 +01:00
Andrei Vereha ddfbd2e7bd dash ble tlk: start generating keys 2021-02-28 18:33:07 +01:00
Andrei Vereha 39408ac535 BLE LTK: define all the steps 2021-02-28 18:33:07 +01:00
Andrei Vereha 1aa6d02893 ble: implement message reading&joining
Now are able to read the first message:
```
INFO[0005] Received SPS1  6b943ec06b594f8a0383f384a3c916da75e1c7846c3e1b73f72f86ee2dc48774b2b4e5ad62d798b76cfd06be1cd4c937
DEBU[0005] Donna LTK: b874cb3cbe487040442138452faeb02d284ac55f489f19593265ff52f7310f1f
DEBU[0005] First key 58cb3b742dc48774000000001cd4c937 :: 16
DEBU[0005] CMACY: 16
DEBU[0005] Intermediar key 4c13eebc4cf09795a07c50bf13786c18 :: 16
DEBU[0005] Pod public 2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74 :: 32
DEBU[0005] Pod nonce 00000000000000000000000000000000 :: 16
DEBU[0005] Generated SPS1: 535053313d00302fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b7400000000000000000000000000000000
TRAC[0005] CMD notification return: 4/00
TRAC[0005] received CMD:  01
TRAC[0005] Sending message: 54570003000006e00000109100001092535053313d00302fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b7400000000000000000000000000000000
TRAC[0005] DATA notification return: 23/000354570003000006e000001091000010925350
TRAC[0005] DATA notification return: 23/0153313d00302fe57da347cd62431528daac5fbb
TRAC[0005] DATA notification return: 23/02290730fff684afc4cfc2ed90995f58cb3b7400
TRAC[0005] DATA notification return: 23/030f7d02931d0000000000000000000000000000
TRAC[0005] DATA notification return: 23/0401000000000000000000000000000000000000
TRAC[0005] received CMD:  04
```
2021-02-28 18:33:05 +01:00
Andrei Vereha 81ad52ebce implement SPS1 command
I had to add a new dependency: `tink-android:1.5.0` for X25519
2021-02-28 18:32:21 +01:00
Andrei Vereha 11633995f6
Merge pull request #11 from 0pen-dash/bart/observable-connect
Make OmnipodDashBleManager.connect() return an Observable of PodEvents
2021-02-28 18:30:06 +01:00
bartsopers 67be27ac60
Merge pull request #14 from 0pen-dash/adrian/history-persistance
db create a bit more readable
2021-02-28 18:28:08 +01:00
Bart Sopers c93705e88f Add retry for connecting to Pod 2021-02-28 18:22:56 +01:00
Bart Sopers 256cfe077d Replace single booleans for alerts with EnumSet of AlertType and introduce sealed class AlertTrigger 2021-02-28 18:20:17 +01:00
Philoul 8798be0c34 Update uel.log entries, Increase database version 3=>4, update migration3to4 2021-02-28 15:54:37 +01:00
Bart Sopers 513ac9b0f4 Replace subscribe with subscribeBy 2021-02-28 15:45:50 +01:00
Bart Sopers 5c8ba98682 Remove TODO 2021-02-28 15:30:12 +01:00
Bart Sopers aa14843d33 Address review findings 2021-02-28 15:18:10 +01:00