Commit graph

15313 commits

Author SHA1 Message Date
Milos Kozak cacf62f20c
Merge pull request #2377 from dv1/check-for-suspend-before-tbr-and-bolus
WIP: combov2: Check if pump is suspended before setting TBR and delivering…
2023-01-30 18:40:14 +01:00
Milos Kozak 1bf884311d Do not translate key 2023-01-30 12:36:17 +01:00
Milos Kozak 8a2d786ef5
Merge pull request #2380 from nightscout/dependabot/gradle/dev/org.jlleitschuh.gradle.ktlint-11.1.0
chore(deps): bump org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0
2023-01-30 11:19:07 +01:00
dependabot[bot] f6ad8d0dc8
chore(deps): bump org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0
Bumps org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 08:02:13 +00:00
Milos Kozak 0ef9155dbe
Merge pull request #2379 from markvader/about_strings
Group "About Screen" strings in UI strings file inc. one from combo strings file
2023-01-30 08:22:01 +01:00
Milos Kozak faaf7e225b
Merge pull request #2376 from emmatovar27/dev
Changes from the community to some of the questions on objective 3.
2023-01-30 08:17:57 +01:00
Mark Breen 1c8f8a2459 Group "About Screen" strings in UI strings file inc one from combo strings 2023-01-30 01:36:25 +00:00
emmatovar27 b0a1277616 --Changes from the Community to some of the questions on objectives 3. 2023-01-29 17:19:29 -08:00
Milos Kozak 56d5acf90d Merge remote-tracking branch 'origin/dev' into ns15 2023-01-29 22:55:00 +01:00
Milos Kozak 38ee906db9
Merge pull request #2341 from nightscout/dependabot/gradle/dev/androidx.appcompat-appcompat-1.6.0
chore(deps): bump appcompat from 1.5.1 to 1.6.0
2023-01-29 22:54:39 +01:00
Milos Kozak b735f930ba
Merge pull request #2340 from nightscout/dependabot/gradle/dev/room_version-2.5.0
chore(deps): bump room_version from 2.4.3 to 2.5.0
2023-01-29 22:54:19 +01:00
dependabot[bot] 8dab3c5721
chore(deps): bump appcompat from 1.5.1 to 1.6.0
Bumps appcompat from 1.5.1 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-29 21:53:22 +00:00
Milos Kozak 23e186603f
Merge pull request #2372 from nightscout/dependabot/gradle/dev/com.google.android.material-material-1.8.0
chore(deps): bump material from 1.7.0 to 1.8.0
2023-01-29 22:52:17 +01:00
Milos Kozak a315476569
Merge pull request #2374 from nightscout/dependabot/gradle/dev/org.barfuin.gradle.jacocolog-3.0.0
chore(deps): bump org.barfuin.gradle.jacocolog from 2.0.0 to 3.0.0
2023-01-29 22:50:43 +01:00
Milos Kozak 26c0b7c896 Tidepool: improve settings, upload & and enable 2023-01-29 22:33:23 +01:00
Carlos Rafael Giani d505c1a90b combov2: Check if pump is suspended before setting TBR and delivering bolus
This avoids a misleading error state caused by an IllegalStateException
that gets thrown by the Pump.setTbr() and Pump.deliverBolus() when these
get called while the pump is suspended. Instead, first check for this
suspended state, and if the pump is indeed suspended, immediately exit
with the pump enact result set to not have succeeded nor have been enacted.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2023-01-28 20:43:29 +01:00
Milos Kozak 8db9891140 Merge remote-tracking branch 'origin/dev' into ns15 2023-01-28 13:14:36 +01:00
emmatovar27 a6d645b7c9 --Changes from the Community to some of the questions on objectives 3. 2023-01-28 00:26:28 -08:00
emmatovar27 33a7e1cebf --Changes from the Community to some of the questions on objectives 3. 2023-01-28 00:11:33 -08:00
Milos Kozak 26433a872e Tidepool: small improvements 2023-01-27 15:50:06 +01:00
dependabot[bot] 500cdcbafe
chore(deps): bump org.barfuin.gradle.jacocolog from 2.0.0 to 3.0.0
Bumps org.barfuin.gradle.jacocolog from 2.0.0 to 3.0.0.

---
updated-dependencies:
- dependency-name: org.barfuin.gradle.jacocolog
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-27 08:02:26 +00:00
Milos Kozak 2b49778697 NSCv3: use alarm socket only when needed 2023-01-25 13:55:56 +01:00
dependabot[bot] 5caef52880
chore(deps): bump material from 1.7.0 to 1.8.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.7.0...1.8.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-25 08:02:01 +00:00
Milos Kozak e7225ce602 NSCv3: Connect to new alarm socket.io 2023-01-24 22:32:07 +01:00
Milos Kozak 89ad9e21dd NSCv3: websockets support 2023-01-23 23:50:32 +01:00
Milos Kozak 9757428577 Merge remote-tracking branch 'origin/dev' into ns15 2023-01-23 15:52:49 +01:00
Milos Kozak 6cd32e84fe BolusWizard: use 100% if no BG available 2023-01-23 13:56:19 +01:00
Milos Kozak 97524c47a2 NSCv3: change error response processing 2023-01-23 11:26:37 +01:00
Milos Kozak bd765be584 Merge remote-tracking branch 'origin/dev' into ns15 2023-01-21 23:55:29 +01:00
Milos Kozak 4328597641 fix startup crash 2023-01-21 23:50:03 +01:00
Milos Kozak 7a88237806 Merge branch 'dev' into ns15 2023-01-21 18:01:21 +01:00
Milos Kozak c4353e2e3e do not call PluginStore::verifySelectionInCategories twice 2023-01-21 17:13:25 +01:00
Milos Kozak 13cf19083a ComboV2: move logging to onStart 2023-01-21 16:55:24 +01:00
Milos Kozak 2cecf28792 NSCv3: better log errors to fragment 2023-01-21 15:58:29 +01:00
Milos Kozak c1fca211bf DanaR: ignore history records with invalid date 2023-01-21 14:48:56 +01:00
Milos Kozak 2b7c082979 NSC: accept Temporary target cancel from AAPSClient 2023-01-21 13:30:51 +01:00
Milos Kozak 0569d2ba0a NSCv3: update connection status faster 2023-01-21 10:34:55 +01:00
Milos Kozak f877bb5fb9 NSCv3: split preference xml 2023-01-20 22:55:48 +01:00
Milos Kozak 27e91182a1 fix toggling SYNC plugins 2023-01-20 21:35:48 +01:00
Milos Kozak d67e13e105 NSCv3: show correct version in About dialog 2023-01-20 18:05:02 +01:00
Milos Kozak cef547861f NSCv3: track changed profile store 2023-01-20 17:13:06 +01:00
Milos Kozak aa9684f621 set min supported NS to 15.0.0 2023-01-20 17:06:38 +01:00
Milos Kozak c1211748d6 Merge branch 'dev' into ns15 2023-01-20 17:04:26 +01:00
Milos Kozak 9769a01e6f NSCv3: better profile processing. needs https://github.com/nightscout/cgm-remote-monitor/pull/7839 2023-01-20 16:55:25 +01:00
Milos Kozak 71a31f6c5b Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2023-01-20 10:44:41 +01:00
Milos Kozak 7f77109b68
Merge pull request #2363 from nightscout/dependabot/gradle/dev/com.google.firebase-firebase-bom-31.2.0
chore(deps): bump firebase-bom from 31.1.1 to 31.2.0
2023-01-20 10:44:12 +01:00
Milos Kozak 5d7d4426fa
Merge pull request #2360 from nightscout/dependabot/gradle/dev/io.reactivex.rxjava3-rxjava-3.1.6
chore(deps): bump rxjava from 3.1.5 to 3.1.6
2023-01-20 10:43:53 +01:00
Milos Kozak 7cafeae1c6 NS 15 support 2023-01-20 10:41:42 +01:00
dependabot[bot] db1bcefe62
chore(deps): bump firebase-bom from 31.1.1 to 31.2.0
Bumps firebase-bom from 31.1.1 to 31.2.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-20 08:02:18 +00:00
Milos Kozak 3523f77cfe XDRIP: new sync 2023-01-19 21:23:59 +01:00