caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- some error fixes, and changes around profile

Browse source
This commit is contained in:
Andy Rozman 2019-09-18 18:00:30 +01:00
parent 7ab813ef22
commit 529d0111c5
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
View file

@ -61,6 +61,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.util.LogReceiver;
import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.OKDialog;
import info.nightscout.androidaps.utils.SP;
/**
@ -421,7 +422,9 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
public boolean isThisProfileSet(Profile profile) {
// TODO status was not yet read from pod
// TODO maybe not possible, need to see how we will handle that
if (currentProfile == null) {
this.currentProfile = profile;
return true;
}
@ -815,7 +818,12 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
break;
case FillCanulaSetBasalProfile: {
omnipodUIComm.executeCommand(OmnipodCommandType.FillCanulaAndSetBasalProfile, PodInitActionType.FillCannulaSetBasalProfileWizardStep, this.currentProfile, logReceiver);
if (this.currentProfile != null) {
omnipodUIComm.executeCommand(OmnipodCommandType.FillCanulaAndSetBasalProfile, PodInitActionType.FillCannulaSetBasalProfileWizardStep, logReceiver, this.currentProfile);
} else {
OKDialog.show(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.combo_warning),
MainApp.gs(R.string.omnipod_error_operation_not_possible_no_profile), null);
}
}
break;

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

@ -4,20 +4,20 @@
<string name="af_lang" translatable="false">Afrikaans</string>
<string name="bg_lang" translatable="false">Bulgarian</string>
<string name="nl_lang" translatable="false">Dutch</string>
<!-- <string name="fi_lang" translatable="false">Finnish</string> -->
<!-- <string name="fi_lang" translatable="false">Finnish</string> -->
<string name="fr_lang" translatable="false">French</string>
<string name="de_lang" translatable="false">German</string>
<string name="el_lang" translatable="false">Greek</string>
<!-- <string name="he_lang" translatable="false">Hebrew</string> -->
<!-- <string name="he_lang" translatable="false">Hebrew</string> -->
<string name="zh_lang" translatable="false">Chinese</string>
<!-- <string name="ga_lang" translatable="false">Irish</string> -->
<!-- <string name="ga_lang" translatable="false">Irish</string> -->
<string name="it_lang" translatable="false">Italian</string>
<!-- <string name="ja_lang" translatable="false">Japanese</string> -->
<!-- <string name="ja_lang" translatable="false">Japanese</string> -->
<string name="ko_lang" translatable="false">Korean</string>
<string name="lt_lang" translatable="false">Lithuanian</string>
<string name="pl_lang" translatable="false">Polish</string>
<string name="pt_lang" translatable="false">Portuguese</string>
<!-- <string name="pt_BR_lang" translatable="false">Portuguese, Brazilian</string> -->
<!-- <string name="pt_BR_lang" translatable="false">Portuguese, Brazilian</string> -->
<string name="ro_lang" translatable="false">Romanian</string>
<string name="ru_lang" translatable="false">Russian</string>
<string name="sk_lang" translatable="false">Slovak</string>
@ -1662,6 +1662,7 @@
<!-- Omnipod - Error -->
<string name="omnipod_error_operation_not_possible_no_configuration">Operation is not possible.\n\n You need to configure Omnipod first, before you can use this operation.</string>
<string name="omnipod_error_operation_not_possible_no_profile">Operation is not possible.\n\n You need to wait few minutes, until AAPS tries to set profile for first time.</string>
<!-- Omnipod - Pod Mgmt -->
<string name="omnipod_cmd_init_pod">Init Pod</string>
@ -1682,7 +1683,6 @@
<string name="description_pump_omnipod_dash">Pump integration for Omnipod Dash.</string>
<plurals name="objective_days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d days</item>