Commit graph

9009 commits

Author SHA1 Message Date
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
Milos Kozak
d114be7344 revert debug code 2020-05-05 22:43:26 +02:00
Milos Kozak
bba7adc9aa fix Runnables after protection check, cleanup 2020-05-05 22:42:16 +02:00
Milos Kozak
8858d3b5f9 Merge remote-tracking branch 'origin/dev' into layout 2020-05-05 22:00:54 +02:00
Milos Kozak
bbf5e6564f new icons 2020-05-05 22:00:35 +02:00
Milos Kozak
be21255915
Merge pull request #2623 from dlvoy/dev-prefs-dir
Support for preferences dir and preferences selection list during import
2020-05-05 20:03:05 +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
Andy Rozman
f3c4b4e5e7 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-05 13:50:53 +01:00
Andy Rozman
e51e3daeb1 - added Expose attribute to all varaiables in PodSessionState
- OmnipodUtil: Gson now uses only Expose fields
2020-05-05 13:49:55 +01:00
Bart Sopers
9b089621fa Use allowed default for SP.getString in RileyLinkOmnipodService 2020-05-05 13:35:49 +02:00
Andy Rozman
2de1761555 - look at current pump service (either MDT or POD), RL Boradcast Receiver worked with internal instance, which wasn't correct, might need to refactor RileyLinkBroadcastReceiver further to be singelton... 2020-05-05 10:32:25 +01:00
Bart Sopers
32ce3ee18a enable PUMPBTCOMM by default for Omnipod branch 2020-05-05 02:34:08 +02:00
Bart Sopers
53e6cd4ef2 Apply several fixed from @andyrozman after Omnipod dagger merge 2020-05-05 02:03:01 +02:00
Bart Sopers
e20d8a1ff5 Improve Omnipod preference screen 2020-05-05 01:35:39 +02:00
Bart Sopers
0f8503032e Use correct RL address preference in Omnipod preferences 2020-05-05 01:25:34 +02:00
Bart Sopers
20f9f88d4b Use allowed default for SP.getString 2020-05-05 01:05:57 +02:00
Bart Sopers
d78b921b1f Fix test case 2020-05-05 00:39:20 +02:00
Bart Sopers
f7f5e0ce19 Replace static reference with member reference 2020-05-05 00:28:27 +02:00
Andy Rozman
7db7e07a70 - added SP to OmnipodUtil 2020-05-04 23:25:03 +01:00
Bart Sopers
7fa1ebfe38 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_dagger_with_initialization_fixes 2020-05-05 00:15:44 +02:00
Milos Kozak
0a63e1f29d Merge branch 'dev' into rs 2020-05-05 00:08:29 +02:00
Milos Kozak
d8f27c609c BlePreCheck -> core 2020-05-05 00:02:31 +02:00
Bart Sopers
ce435be382 Fix merge error 2020-05-04 23:56:24 +02:00
Bart Sopers
5e3e947d8e Restore more formatting 2020-05-04 23:55:01 +02:00
Bart Sopers
e7fe05dbeb Restore more formatting 2020-05-04 23:52:51 +02:00
Bart Sopers
1bdc474b51 Properly ignore PodSessionState test cases 2020-05-04 23:52:44 +02:00
Bart Sopers
d8eb777b4c Restore more formatting 2020-05-04 23:36:00 +02:00
Bart Sopers
acf6b50b66 Restore formatting in AndroidManifest.xml 2020-05-04 23:22:42 +02:00
Bart Sopers
df2de82810 Apply @andyrozman's fixes for compilation errors 2020-05-04 23:06:15 +02:00
Bart Sopers
71d5409344 Revert "- removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent"
This reverts commit ea0b89cbf8.
2020-05-04 22:50:08 +02:00
Milos Kozak
4a17fdc9a0 Merge remote-tracking branch 'origin/dev' into layout 2020-05-04 21:55:20 +02:00
Milos Kozak
47fd4bd1fe libraries update 2020-05-04 21:37:03 +02:00
Milos Kozak
d0fc697183 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-04 21:03:34 +02:00
Milos Kozak
ee913cffd8 gradle tweaking 2020-05-04 21:03:30 +02:00
Andy Rozman
ea0b89cbf8 - removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent
- fixed commpiling problem
- removed OmnipodService from Manifest
2020-05-04 17:51:06 +01:00
Tebbe Ubben
7970661221
Merge pull request #2620 from MilosKozak/insight-vibration
2.6.1.4
2020-05-04 18:18:22 +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
Andy Rozman
5ed86e571d - fixed problem with RL selector in omnipod prefs 2020-05-04 12:09:57 +01:00
Andy Rozman
6aaca5899c - changed Omnipod module 2020-05-04 11:27:12 +01:00
Milos Kozak
d0221c34aa
Merge pull request #2616 from Philoul/Fix_TemporaryBasal_Crash
Fix Crash TemporyBasal
2020-05-04 11:53:22 +02:00
Milos Kozak
948bb8dc33
Merge pull request #2617 from Philoul/DatabaseHelper_Missing_Function
Add missing function in DatabaseHelper
2020-05-04 11:52:50 +02:00
Milos Kozak
de601cb833 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-04 10:56:22 +02:00
Milos Kozak
ab9da6e2b6 AlertDialogs -> core 2020-05-04 10:49:19 +02:00
Philoul
3e63d32d60 Add missing function in DatabaseHelper
getExtendedBolusDataFromTime(long from, long to, boolean ascending)
=> I need it for autotune plugin...
2020-05-04 10:40:22 +02:00
Milos Kozak
60b5c7366f Update Crowdin configuration file 2020-05-04 10:27:48 +02:00
Philoul
d44bc87d1b Fix Crash TemporyBasal
Injector missing with extendedbolus
2020-05-04 10:15:21 +02:00
Milos Kozak
2fb0198418 RxBus -> core 2020-05-04 01:36:46 +02:00