caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Refactoring.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-19 02:56:29 +02:00
parent 413464f1f1
commit 07253b59a0
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -125,7 +125,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
long lastAlarmTime = 0;
while (true) {
CommandResult localLastCmdResult = pump.lastCmdResult;
if (!SP.getBoolean(R.string.combo_disable_alerts, false) &&
if (!SP.getBoolean(R.string.combo_disable_alarms, false) &&
localLastCmdResult != null && !localLastCmdResult.success) {
long now = System.currentTimeMillis();
long fiveMinutesSinceLastAlarm = lastAlarmTime + (5 * 60 * 1000) + (15 * 1000);

8
app/src/main/res/values/strings.xml
View file

@ -756,10 +756,10 @@
<string name="combo_enable_experimental_features_summary">Unlocks experimental features which are in development and might be broken entirely.</string>
<string name="key_combo_experimental_ignore_transient_errors" translatable="false">combo_ignore_transient_tbr_errors</string>
<string name="combo_experimental_ignore_transient_errors">Ignore transient errors</string>
<string name="combo_experimental_ignore_transient_errors_summary">Ignore a connect failure for a background operation untless the next attempt also fails.</string>
<string name="key_combo_disable_alerts" translatable="false">combo_disable_alerts</string>
<string name="combo_disable_alerts">Disable alerts</string>
<string name="combo_disable_alerts_summary">Ignore all errors encountered while communicating with the pump. Alerts raised by the pump (including those caused by AndroidAPS) will still be raised on the pump.</string>
<string name="combo_experimental_ignore_transient_errors_summary">Ignore a connect failure for a background operation unless the next attempt also fails.</string>
<string name="key_combo_disable_alarms" translatable="false">combo_disable_alerts</string>
<string name="combo_disable_alarms">Disable alarms</string>
<string name="combo_disable_alarms_summary">Ignore all errors encountered while communicating with the pump. Alarms raised by the pump (including those caused by AndroidAPS) will still be raised on the pump.</string>
<string name="bolusprogramming">Programming pump for bolusing</string>
</resources>

6
app/src/main/res/xml/pref_combo.xml
View file

@ -18,9 +18,9 @@
<SwitchPreference
android:dependency="@string/key_combo_enable_experimental_features"
android:defaultValue="false"
android:key="@string/key_combo_disable_alerts"
android:title="@string/combo_disable_alerts"
android:summary="@string/combo_disable_alerts_summary"/>
android:key="@string/key_combo_disable_alarms"
android:title="@string/combo_disable_alarms"
android:summary="@string/combo_disable_alarms_summary"/>
</PreferenceCategory>
</PreferenceScreen>