caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

more fixes

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-07-01 18:32:52 +02:00
parent 9b7d36ffed
commit 5df054a999
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 3 additions and 3 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

@ -1185,7 +1185,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
dbi.source = Source.PUMP;
dbi.insulin = pumpBolus.amount;
dbi.eventType = CareportalEvent.CORRECTIONBOLUS;
if (TreatmentsPlugin.getPlugin().getService().getPumpRecordById(dbi.pumpId) != null) {
if (TreatmentsPlugin.getPlugin().getService().getPumpRecordById(dbi.pumpId) == null) {
TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, false);
updated = true;
}

2
app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
View file

@ -498,7 +498,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
i.putExtra("soundid", R.raw.error);
i.putExtra("status", MainApp.gs(R.string.error_adding_treatment_message));
i.putExtra("title", MainApp.gs(R.string.error_adding_treatment_title));
i.putExtra("title", String.format(MainApp.gs(R.string.error_adding_treatment_title), treatment.insulin, treatment.carbs));
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
MainApp.instance().startActivity(i);
}

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

@ -1180,7 +1180,7 @@
<string name="storedsettingsfound">Stored settings found</string>
<string name="allow_hardware_pump_text">Attention: If you activate and connect to a hardware pump, AndroidAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AndroidAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time.</string>
<string name="error_adding_treatment_message">Treatment data incomplete</string>
<string name="error_adding_treatment_title">A treatment (insulin:%0.2f, carbs: %2) couldn\'t not be added to treatments. Please check and manually add a record as appropriate.</string>
<string name="error_adding_treatment_title">A treatment (insulin:%0.2f, carbs: %d) could not be added to treatments. Please check and manually add a record as appropriate.</string>
<plurals name="objective_days">
<item quantity="one">%d day</item>