caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-11 16:15:03 +01:00
parent fb65aca081
commit 2f8febabb8
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,6 @@ import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.Overview.Notification;
import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI;
@ -138,9 +137,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
String getStateSummary() {
PumpState ps = pump.state;
if (!pump.initialized) {
return MainApp.sResources.getString(R.string.combo_pump_state_initializing);
} else if (ps.menu == null)
if (ps.menu == null)
return MainApp.sResources.getString(R.string.combo_pump_state_disconnected);
else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY))
return MainApp.sResources.getString(R.string.combo_pump_state_suspended_due_to_error);

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

@ -782,16 +782,8 @@
<string name="combo_pump_action_setting_tbr">Setting TBR</string>
<string name="combo_pump_action_bolusing">Bolusing</string>
<string name="combo_pump_action_refreshing">Refreshing</string>
<string name="combo_pump_action_idle">Idle</string>
<string name="pump_unreachable">Pump unreachable</string>
<string name="missed_bg_readings">Missed BG readings</string>
<string name="key_raise_urgent_alarms_as_android_notification" translatable="false">raise_urgent_alarms_as_android_notification</string>
<string name="raise_urgent_alarms_as_android_notification">Use system notifications for alerts</string>
<string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string>
<string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string>
<string name="localalertsettings_title">Local alerts</string>
<string name="enable_missed_bg_readings_alert">Alert if no BGs received in 30 min</string>
<string name="enable_pump_unreachable_alert">Alert if pump unreachable for 30 min</string>
<string name="combo_pump_never_connected">Never</string>
<string name="combo_reservoir_level_insufficant_for_bolus">Not enough insulin left in reservoir for bolus</string>
<string name="combo_pump_bolus_history_state_mismatch">A bolus has been delivered directly on the pump recently, of which AndroidAPS has only just become aware of. The pump\'s history is currently being read. Please check the Combo page, verify the last bolus and IOB and bolus again if needed. No bolus has been delivered.</string>

16
app/src/main/res/xml/pref_others.xml
View file

@ -72,20 +72,4 @@
android:key="short_tabtitles"
android:title="@string/short_tabtitles"/>
</PreferenceCategory>
<PreferenceCategory
android:key="others"
android:title="@string/localalertsettings_title">
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_enable_missed_bg_readings_alert"
android:title="@string/enable_missed_bg_readings_alert"/>
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_enable_pump_unreachable_alert"
android:title="@string/enable_pump_unreachable_alert"/>
<SwitchPreference
android:defaultValue="false"
android:key="raise_urgent_alarms_as_android_notification"
android:title="@string/raise_urgent_alarms_as_android_notification"/>
</PreferenceCategory>
</PreferenceScreen>