* origin/dev:
Actions tab: show profile switch button for single profile too.
Old NS-Version non-urgent
Add SP to imports
refactor cancelAlarm back to KeepAliveReceiver
push next alert on read status
G5 upload to xdrip
fake Esel new file
fake Esel
Apply bolus constraint before applying.
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
Remove missed reference to pref in NSProfilePlugin.
Remove 'sync to profile' pref.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
* origin/dev: (40 commits)
bump 1.53
BG & IOB contribution on by default in wizard
check for NaN
Revert "Rounding issues visible in nightscout insulin field"
Clarified boolean logic with parentheses :)
loadEvents after bolus in separate thread
use notification for bolus delivery failed message when window has been destroyed
fix null pointer exception
Added cases to accept both a.m./p.m. and AM/PM
split JSON arrays to 50 elements
Update strings.xml
Changed rounding to use BigDecimals to avoid noisy long doubles in output
Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
Removed unused imports
Rounding fix
VirtualPump: set PumpEnactResult.enacted.
Use correct units for low/high from TT.
Remove duplicate logging.
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
# app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
Editor->File and Code Templates->Catch Statement body
to
log.error("Unhandled exception", e);
to also do this for newly generated code.
(cherry picked from commit c2ae29f)
(cherry picked from commit 6031a25)
