caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

lint & deprecation

Browse source
This commit is contained in:
Milos Kozak 2020-05-12 15:07:50 +02:00
parent 7060c51681
commit 666ce54b1f
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,8 +90,6 @@ import io.reactivex.schedulers.Schedulers;
public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPumpPluginInterface, RileyLinkPumpDevice { public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPumpPluginInterface, RileyLinkPumpDevice {
// TODO Dagger (maybe done) // TODO Dagger (maybe done)
private static OmnipodPumpPlugin plugin = null;
private RileyLinkServiceData rileyLinkServiceData;
private ServiceTaskExecutor serviceTaskExecutor; private ServiceTaskExecutor serviceTaskExecutor;
private RileyLinkOmnipodService rileyLinkOmnipodService; private RileyLinkOmnipodService rileyLinkOmnipodService;
private OmnipodUtil omnipodUtil; private OmnipodUtil omnipodUtil;
@ -150,11 +148,9 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
PumpType.Insulet_Omnipod, PumpType.Insulet_Omnipod,
injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil
); );
this.rileyLinkServiceData = rileyLinkServiceData;
this.serviceTaskExecutor = serviceTaskExecutor; this.serviceTaskExecutor = serviceTaskExecutor;
displayConnectionMessages = false; displayConnectionMessages = false;
OmnipodPumpPlugin.plugin = this;
this.omnipodUtil = omnipodUtil; this.omnipodUtil = omnipodUtil;
this.omnipodPumpStatus = omnipodPumpStatus; this.omnipodPumpStatus = omnipodPumpStatus;
@ -249,14 +245,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
} }
@Deprecated
public static OmnipodPumpPlugin getPlugin() {
if (plugin == null)
throw new IllegalStateException("Plugin not injected jet");
return plugin;
}
@Override @Override
protected void onStart() { protected void onStart() {
super.onStart(); super.onStart();

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
View file

@ -10,6 +10,7 @@ public interface OmnipodPumpPluginInterface extends PumpInterface {
void setDriverState(OmnipodDriverState state); void setDriverState(OmnipodDriverState state);
@Deprecated
RxBusWrapper getRxBus(); RxBusWrapper getRxBus();
} }

9
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java
View file

@ -50,7 +50,6 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP
// TODO Dagger // TODO Dagger
//private static final Logger LOG = LoggerFactory.getLogger(L.PUMP); //private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
protected static OmnipodDashPumpPlugin plugin = null;
//private RileyLinkOmnipodService omnipodService; //private RileyLinkOmnipodService omnipodService;
//private OmnipodPumpStatus pumpStatusLocal = null; //private OmnipodPumpStatus pumpStatusLocal = null;
@ -136,14 +135,6 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP
// }; // };
} }
@Deprecated
public static OmnipodDashPumpPlugin getPlugin() {
if (plugin == null)
throw new IllegalStateException("Plugin not injected jet");
return plugin;
}
private String getLogPrefix() { private String getLogPrefix() {
return "OmnipodPlugin::"; return "OmnipodPlugin::";
} }