caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2588 from AAPS-Omnipod/dagger_medtronic

Browse source 
- fix for dagger injection of RileyLinkMedtronicService (removed dupl…
This commit is contained in:
Milos Kozak 2020-04-24 16:19:02 +02:00 committed by GitHub
commit dec419b4c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
View file

@ -33,9 +33,9 @@ import static info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyL
*/ */
public abstract class RileyLinkService extends DaggerService { public abstract class RileyLinkService extends DaggerService {
@Inject AAPSLogger aapsLogger; @Inject protected AAPSLogger aapsLogger;
@Inject SP sp; @Inject protected SP sp;
@Inject Context context; @Inject protected Context context;
public RileyLinkBLE rileyLinkBLE; // android-bluetooth management public RileyLinkBLE rileyLinkBLE; // android-bluetooth management

14
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
View file

@ -36,10 +36,10 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
*/ */
public class RileyLinkMedtronicService extends RileyLinkService { public class RileyLinkMedtronicService extends RileyLinkService {
@Inject AAPSLogger aapsLogger; //@Inject AAPSLogger aapsLogger;
@Inject Context context; //@Inject Context context;
@Inject MedtronicPumpPlugin medtronicPumpPlugin; @Inject MedtronicPumpPlugin medtronicPumpPlugin;
@Inject SP sp; //@Inject SP sp;
private static RileyLinkMedtronicService instance; private static RileyLinkMedtronicService instance;
private static ServiceTask currentTask = null; private static ServiceTask currentTask = null;
@ -53,9 +53,6 @@ public class RileyLinkMedtronicService extends RileyLinkService {
public RileyLinkMedtronicService() { public RileyLinkMedtronicService() {
super(); super();
instance = this; instance = this;
aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed");
MedtronicUtil.setMedtronicService(this);
pumpStatus = (MedtronicPumpStatus) medtronicPumpPlugin.getPumpStatusData();
} }
@ -106,6 +103,11 @@ public class RileyLinkMedtronicService extends RileyLinkService {
// init rileyLinkCommunicationManager // init rileyLinkCommunicationManager
medtronicCommunicationManager = new MedtronicCommunicationManager(context, rfspy); medtronicCommunicationManager = new MedtronicCommunicationManager(context, rfspy);
aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed");
MedtronicUtil.setMedtronicService(this);
pumpStatus = (MedtronicPumpStatus) medtronicPumpPlugin.getPumpStatusData();
} }