caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

remove unneeded call

Browse source
This commit is contained in:
Milos Kozak 2017-05-26 10:31:05 +02:00
parent bb4302c02f
commit 559e07904c
8 changed files with 2 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
View file

@ -48,8 +48,5 @@ public interface PumpInterface {
// Short info for SMS, Wear etc
String shortStatus(boolean veryShort);
// Enforced Treatment plugin
String treatmentPlugin();
boolean isFakingTempsByExtendedBoluses();
}

9
app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
View file

@ -694,15 +694,6 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
}
}
@Override
public String treatmentPlugin() {
if (activePump != null) {
return activePump.treatmentPlugin();
} else {
return null;
}
}
@Override
public boolean isFakingTempsByExtendedBoluses() {
return activePump.isFakingTempsByExtendedBoluses();

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
View file

@ -216,11 +216,6 @@ public class DanaRPlugin implements PluginBase, PumpInterface, ConstraintsInterf
this.fragmentPumpVisible = fragmentVisible;
}
@Override
public String treatmentPlugin() {
return TreatmentsPlugin.class.getName();
}
@Override
public boolean isFakingTempsByExtendedBoluses() {
return useExtendedBoluses;

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
View file

@ -215,11 +215,6 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, Constraints
this.fragmentPumpVisible = fragmentVisible;
}
@Override
public String treatmentPlugin() {
return TreatmentsPlugin.class.getName();
}
@Override
public boolean isFakingTempsByExtendedBoluses() {
return useExtendedBoluses;

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
View file

@ -202,11 +202,6 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, ConstraintsInte
this.fragmentPumpVisible = fragmentVisible;
}
@Override
public String treatmentPlugin() {
return TreatmentsPlugin.class.getName();
}
@Override
public boolean isFakingTempsByExtendedBoluses() {
return false;

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java
View file

@ -117,11 +117,6 @@ public class MDIPlugin implements PluginBase, PumpInterface {
return PluginBase.PUMP;
}
@Override
public String treatmentPlugin() {
return TreatmentsPlugin.class.getName();
}
@Override
public boolean isFakingTempsByExtendedBoluses() {
return false;

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
View file

@ -138,11 +138,6 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
return PluginBase.PUMP;
}
@Override
public String treatmentPlugin() {
return TreatmentsPlugin.class.getName();
}
@Override
public boolean isFakingTempsByExtendedBoluses() {
return false;

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

@ -81,8 +81,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
@Override
public boolean isEnabled(int type) {
boolean canBeEnabled = MainApp.getConfigBuilder().treatmentPlugin() == null ? true : MainApp.getConfigBuilder().treatmentPlugin().equals(getClass().getName());
return type == TREATMENT && fragmentEnabled && canBeEnabled;
return type == TREATMENT && fragmentEnabled;
}
@Override
@ -102,8 +101,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
@Override
public boolean showInList(int type) {
boolean canBeEnabled = MainApp.getConfigBuilder().treatmentPlugin() == null ? true : MainApp.getConfigBuilder().treatmentPlugin().equals(getClass().getName());
return canBeEnabled;
return true;
}
@Override