Commit graph

587 commits

Author SHA1 Message Date
Bart Sopers 6e523066bb Merge remote-tracking branch 'upstream2/dev' into omnipod_eros_dev_upstream_merge 2020-09-25 16:33:32 +02:00
Bart Sopers 787fa0b305 Prepare Omnipod for upstream merge 2020-09-25 16:33:10 +02:00
Milos Kozak bc43a926f9
Merge pull request #4 from nightscout/dev
Build update
2020-09-25 09:06:19 +02:00
Dominik Dzienia e1e0244acf Ignore changes to codeStyles and stray files while ensuring build from master has no uncommited changes 2020-09-24 23:35:33 +02:00
Milos Kozak 089e22f9f1
2.7.0 2020-09-24 16:52:31 +02:00
Milos Kozak eb8203cba7 change test 2020-09-24 14:44:26 +02:00
Milos Kozak 8675db1039 2.7.0 2020-09-24 10:37:05 +02:00
Bart Sopers c7687aa6c7 Revert "Prepare Omnipod branch for upstream merge"
This reverts commit 02583c2612.
2020-09-13 18:51:10 +02:00
TebbeUbben 8171a94e0b Change app version code to dev 2020-09-04 21:07:19 +02:00
Geoffrey Hansen 2c2e01dee6 Merge remote-tracking branch 'origin/openhumans_old_db' into HEAD 2020-09-02 15:32:11 +02:00
Milos Kozak 984134ce58
2.7.0-rc5 2020-08-31 20:57:32 +02:00
Bart Sopers 7c82dbdf93 Prepare Omnipod for upstream merge 2020-08-22 11:06:33 +02:00
Bart Sopers 5973857c1d Remove duplicate version 2020-08-20 11:47:56 +02:00
Bart Sopers 7bc41b2281 Merge remote-tracking branch 'upstream/2.7.0-rc3' into omnipod_eros_dev_omnipod_module 2020-08-20 01:13:55 +02:00
Bart Sopers 2b10524217 Restore Omnipod wizard dependency in app/build.gradle 2020-08-17 22:56:01 +02:00
Bart Sopers b5c46e3bcf WIP on moving Omnipod to a separate module 2020-08-16 23:54:41 +02:00
Bart Sopers 17a2afb4b1 Update version in order to be able to distinguish in Firebase 2020-08-16 22:19:55 +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
Milos Kozak a4b2ce32a5
2.7.0-rc3 2020-08-16 11:13:48 +02:00
Bart Sopers dd795463cf Update wizard pager dependency 2020-08-12 17:13:09 +02:00
Bart Sopers ef05654133 Update Wizardpager version in build.gradle 2020-08-11 21:04:58 +02:00
Andy Rozman ae86e7fc06 - change version 2020-08-11 00:40:26 +01: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 20e2bf0b06 Merge branch 'dev' into medtronic_modules 2020-07-31 11:21:05 +01:00
Milos Kozak 3d7f2c5980 Gradle 6.1.1 2020-07-28 23:49:21 +02:00
Andy Rozman 996417bb47 Merge branch 'dev' into medtronic_modules 2020-07-25 00:44:09 +01: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
Andy Rozman 6e50c3651d Merge branch 'dev' into medtronic_modules 2020-07-12 20:21:03 +01:00
Andy Rozman ea80eb3c9b - created 2 modules: rileylink and medtronic
- refactored some classes
2020-07-12 20:15:11 +01:00
Milos Kozak c45de9af11 update libs 2020-07-04 21:58:51 +02:00
Milos Kozak 0e624a803f bump 2.6.7-dev 2020-06-11 23:20:36 +02:00
Milos Kozak 09de329934 libs update & cleanup 2020-05-31 11:27:12 +02:00
Milos Kozak 31b3177561 upgrade fabric to firebase 2020-05-31 10:12:36 +02:00
TebbeUbben b239100c13 Open Humans Uploader: Initial commit 2020-05-20 21:49:01 +02:00
Milos Kozak e1df6c8145 minSdkVersion 24 2020-05-12 00:23:39 +02:00
Milos Kozak 3071d15a5f bump 2.6.6 2020-05-11 17:06:49 +02:00
Milos Kozak 9ac88f7def remove mdtp library 2020-05-10 21:07:58 +02:00
Milos Kozak 311f9dd119 danar module 2020-05-10 11:03:19 +02:00
Milos Kozak a99be409eb dana module 2020-05-09 20:18:12 +02:00
Andy Rozman d177e08355 - changed build file
- some changes to RileyLinkBLE to handle displaying Error
- loadSessionState from util used
- remove driver specific identifier functionality from RileyLinkService
2020-05-09 12:03:17 +01:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 120c526b80 move to core 2020-05-07 09:54:36 +02:00
Milos Kozak ad472beb4a danars di start 2020-05-06 01:27:38 +02:00
Milos Kozak a02bd59dc0 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 23:28:22 +02:00
Milos Kozak 1f4f5600bc NoSplashAppCompatActivity -> core 2020-05-05 23:27:01 +02:00
Milos Kozak 25c1100330 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 22:49:49 +02:00
Dominik Dzienia 9a3cc5af82 Adds support for preferences directory, list of preferences to import, additional check on imported preferences metadata 2020-05-05 18:42:53 +02:00
Milos Kozak 0a63e1f29d Merge branch 'dev' into rs 2020-05-05 00:08:29 +02:00
Milos Kozak 47fd4bd1fe libraries update 2020-05-04 21:37:03 +02:00
Milos Kozak ee913cffd8 gradle tweaking 2020-05-04 21:03:30 +02:00
TebbeUbben 1c075c526e 2.6.1.4 2020-05-04 17:36:37 +02:00
Bart Sopers 1798d260eb Merge branch 'dev' into omnipod_eros_dev_dagger_history_fix 2020-05-04 17:36:29 +02:00
Milos Kozak 53383461f0 core module 2020-05-03 21:27:42 +02:00
Milos Kozak 591cef11e5
2.6.1.3 2020-05-03 19:48:48 +02:00
Milos Kozak 22d8b6bcff Merge remote-tracking branch 'origin/dev' into rs 2020-05-03 15:37:02 +02:00
Andy Rozman 634042b40d - omnipod eros driver and REQUIRED changes 2020-05-02 21:49:15 +01:00
Milos Kozak 90f08279d3 Merge remote-tracking branch 'origin/dev' into rs 2020-04-29 00:07:25 +02:00
Andy Rozman 54354fad89 Merge branch 'dev' into omnipod_eros_dev_dagger 2020-04-26 19:00:49 +01:00
Milos Kozak 403c609319 migrate to ViewPager2 2020-04-25 21:52:20 +02:00
Andy Rozman 387a134795 Merge branch 'dev' into omnipod_eros_dev_dagger 2020-04-25 16:55:07 +01:00
Andy Rozman 1c0ba4ae5c - gradle change 2020-04-25 14:26:59 +01:00
Andy Rozman a3b0c8ce3b - changed code to use dagger 2020-04-24 11:00:31 +01:00
Milos Kozak 164a092857 Merge remote-tracking branch 'origin/dev' into rs 2020-04-20 21:02:47 +02:00
Milos Kozak 335a9c75c5 2.6.5-dev 2020-04-19 23:30:28 +02:00
Milos Kozak 23937a7278
Merge branch 'dev' into dagger3 2020-04-19 14:17:37 +02:00
Milos Kozak 023992fc9a
bump 2.6.1.2 2020-04-19 13:07:51 +02:00
Dominik Dzienia 780fd1aeaa Split check in gradle to better warn about GIT / admin right issues 2020-04-13 19:47:47 +02:00
Milos Kozak 42957d3e48 Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-08 17:05:17 +02:00
Milos Kozak 4644159c82 Use coroutines for graph processing 2020-04-07 14:15:30 +02:00
Andy Rozman 88554ee376 Merge branch 'dev' into omnipod_eros_dev 2020-04-04 20:25:09 +01:00
Milos Kozak 013018ac7b Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-02 22:06:17 +02:00
Milos Kozak 3d2d716bae libraries update 2020-04-01 16:13:08 +02:00
Milos Kozak 295ae79d20 Merge remote-tracking branch 'origin/dagger3' into rs 2020-03-31 21:16:37 +02:00
Milos Kozak 5b539fd906 remove unused code 2020-03-31 21:16:18 +02:00
Milos Kozak 7b0bc81c47 Upgrade RS encryption library 2020-03-24 09:01:10 +01:00
Milos Kozak 0e9f643241 Merge branch 'biometric' into dagger3 2020-03-22 19:59:35 +01:00
Milos Kozak 5d32bfec95 Merge branch 'dagger3' into TOTP 2020-03-20 15:58:17 +01:00
Andy Rozman 51fea3b912 - added additional init step in enum in case Ibnit failed
- moved al lot of exception files into different package
2020-03-16 09:16:45 +00:00
Milos Kozak 8d111cb819 Merge branch 'dev' into dagger3 2020-03-10 19:20:22 +01:00
Andy Rozman eff7d17304 changed gradle 2020-03-07 20:23:04 +00:00
Milos Kozak c30674036d bump 2.6.1-dev 2020-03-04 22:38:41 +01:00
Bart Sopers 2c8c0e705d Add commit details from main repo in build.gradle 2020-03-03 22:23:20 +01:00
Bart Sopers d7a23dcd52 Update version after 2.6.0 merge 2020-03-03 22:03:34 +01:00
Bart Sopers 3eea2598f2 Merge tag '2.6.0' into omnipod_eros_dev 2020-03-03 21:33:31 +01:00
Milos Kozak f550b91b7e
bump 2.6.0 2020-03-01 10:07:00 +01:00
Milos Kozak fcf1966f58 Merge branch 'dev' into dagger3 2020-02-28 18:20:31 +01:00
Milos Kozak 8326630811 Revert gradle changes for UI tests 2020-02-25 21:30:44 +01:00
Milos Kozak 0ff7702b1a RealPumpTest| 2020-02-11 17:06:30 +01:00
Dominik Dzienia 0f0452a1c4 Support for Time-based One-time Passwords (TOTP) in SMS Communicator 2020-02-11 12:16:41 +01:00
Milos Kozak f111b731e7 Improve SetupWizardTest to be runnable on real device 2020-02-09 22:16:48 +01:00
Milos Kozak d5a7db8be7 2.6-dev-a 2020-02-04 22:25:58 +01:00
Andy Rozman d594786cb4 - changed version to 0.3-SNAPSHOT
- added more info about which DEV COMMIT we are using: DEV_VERSION_COMMIT and DEV_VERSION_COMMIT_DATE
2020-01-27 17:23:50 +00:00
Andy Rozman 57e225a589 - added wizardpager-1.1.1 (fixed swiping) #53 2020-01-27 16:27:09 +00:00
Andy Rozman afc07c5117 - changed version information
- added logging for time switches
2020-01-21 20:02:24 +00:00
Milos Kozak ab51cb4d01 Merge branch 'dev' into dagger3 2020-01-15 20:47:08 +01:00
Milos Kozak 1e3c979b51 PhoneChecker 2020-01-15 19:56:57 +01:00
Andy Rozman bee2a1b21c - changed version to omnipod-0.2-SNAPSHOT 2020-01-12 13:50:46 +01:00
Andy Rozman 08ccfe8488 - changed version to 0.1 (from snapshot) 2020-01-12 13:35:16 +01:00
Milos Kozak 0d85ad4f69 Preference xml files cleanup 2020-01-09 21:41:02 +01:00
Milos Kozak 5c8c263c17
Textvalidator (#2343), Preference to jetpack 2020-01-08 20:20:20 +01:00
Milos Kozak 4dbf199685 PersistenNotificationPlugin, services 2020-01-02 23:25:29 +01:00
Milos Kozak db9b453276 remove setDefaultUncaughtExceptionHandler temporary 2019-12-31 12:01:15 +01:00
Milos Kozak f2aa21ce82 some dagger code 2019-12-13 02:12:19 +01:00
Milos Kozak 921655c0e2 SetupWizardActivityTest 2019-12-11 23:15:36 +01:00
Milos Kozak 0e89ced3e1 Merge branch 'dev' into survey 2019-12-08 19:07:35 +01:00
Andy Rozman a7153cf8b8 - Added new version of library
- added new Cancel/Finish action that refreshes dialog
2019-12-08 16:16:39 +00:00
Milos Kozak 9d787505cf Merge branch 'dev' into biometric 2019-12-08 16:43:07 +01:00
Andy Rozman df82a90b36 [#15]
- changed gradle with different version numbering
- changed the init code, to check if pod was already set, and afterwards does refresh of Tab and Overview...
2019-12-08 12:13:55 +00:00
Milos Kozak 5f19e32504 revert mockito version 2019-12-03 21:12:17 +01:00
Milos Kozak ba6fb9fb94 rhino, commons, slf4j update 2019-12-03 19:03:17 +01:00
Milos Kozak ba6030e1b8 test libraries update 2019-12-03 18:56:43 +01:00
Milos Kozak 3d521fd412 remove rarely used clone library 2019-12-03 18:51:14 +01:00
Milos Kozak d1bcb2300a gson, json, joda update 2019-12-02 22:50:17 +01:00
Milos Kozak 42401453c6 okhttp3, retrofit2 update 2019-12-02 22:35:16 +01:00
Milos Kozak 644d5ab49a android-iconify-fontawesome:2.2.2 2019-12-02 22:27:09 +01:00
Milos Kozak fb3c89a576 recyclerview:1.1.0 2019-12-02 22:24:12 +01:00
Milos Kozak 7cca9892dc materialdatetimepicker update 2019-12-02 22:16:20 +01:00
Milos Kozak 86a826e65a firebase lib update 2019-12-02 21:36:39 +01:00
Bart Sopers 951a23af28 Update version as per requested by @MilosKozak 2019-12-01 15:06:17 +01:00
Andy Rozman 0749a7864c - Added library for Wizard pages and all the classes for the integration.
- integration of Init Pod Wizard is done from visual point of view, now it just needs to be connected to driver
2019-11-23 20:31:29 +00:00
AdrianLxM 3c4b16378b Merge branch 'master' into dev and update version 2019-11-01 00:22:06 +01:00
AdrianLxM 83f31aeeb6
bump 2.5.1 2019-10-31 08:34:44 +01:00
Milos Kozak 7af7220301 Merge branch 'dev' into biometric 2019-10-26 23:11:39 +02:00
Milos Kozak 1a4b3801e5 2.5.0-dev 2019-10-26 23:04:19 +02:00
Milos Kozak 2c956f43ba biometrics support for Preferences 2019-10-26 22:29:41 +02:00
Milos Kozak e440d89537 bump 2.5.0 2019-10-26 21:09:15 +02:00
Milos Kozak 81e621b249 2.4-dev-j 2019-10-21 21:39:19 +02:00
Milos Kozak 7bbf30ec65 Merge branch 'dev' into survey 2019-10-15 23:49:17 +02:00
Milos Kozak 1c5b2c9858 remove failing test 2019-10-15 16:05:04 +02:00
Milos Kozak 3040ef6b7b 2.4-dev-i 2019-10-15 13:35:37 +02:00
Milos Kozak c42ef8e5ff Events to RxBus 2019-10-15 13:31:55 +02:00
Milos Kozak 9ffed9943d 2.4-dev-h 2019-10-08 21:21:02 +02:00
Milos Kozak 450f4fabf0 Survey 2019-10-08 21:20:04 +02:00
Milos Kozak 4642f0ab5b EventNewNotification, EventDismissNotification -> RxBus 2019-10-01 00:00:22 +02:00
Milos Kozak 8f16b16f60 2.4-dev-g 2019-09-23 22:19:36 +02:00
Milos Kozak afa654f3b9 com.google.firebase:firebase-core:17.2.0 2019-09-15 19:04:34 +02:00
Milos Kozak 9295d51e1c androidx.appcompat:appcompat:1.1.0 2019-09-15 18:56:54 +02:00
Milos Kozak 764e4cfb7c
2.4-dev-f 2019-08-31 11:25:21 +02:00
Milos Kozak 0433953ff6 2.4-dev-e 2019-08-27 22:10:54 +02:00
Milos Kozak 55c1bd1a01 2.4-dev-d 2019-08-26 17:38:24 +02:00
Milos Kozak d57d847bf7 bump 2.4-dev-c 2019-08-24 19:33:52 +02:00
Milos Kozak 2f3a2116fb gradle update to 3.5.0 2019-08-21 11:08:23 +02:00
Milos Kozak e6c8ecdc2f 2.4-dev-b 2019-08-15 15:32:01 +02:00
Milos Kozak d467d679df
Merge pull request #1928 from triplem/firebase_events_test
disable firebase for tests
2019-08-08 19:27:37 +02:00
Milos Kozak fa9bc3af97 2.4-dev-a 2019-08-07 23:05:33 +02:00
Milos Kozak b653b5096d remove butterknife from gradle 2019-08-07 23:05:05 +02:00
triplem c9f054bd47 disable firebase for tests 2019-08-01 21:20:17 +02:00
Sebastian Lenz 62f3fc022f newer version of weekdaysselector, fixes #1904 2019-07-28 20:07:31 +02:00
Milos Kozak 1baec16c4b remove unneeded semicolons 2019-07-26 23:21:01 +02:00