From ea0b89cbf8e49daaedf20a407e5b42ea88cfb564 Mon Sep 17 00:00:00 2001 From: Andy Rozman Date: Mon, 4 May 2020 17:51:06 +0100 Subject: [PATCH] - removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent - fixed commpiling problem - removed OmnipodService from Manifest --- app/src/main/AndroidManifest.xml | 10 ---------- .../activities/MyPreferenceFragment.kt | 2 -- .../dependencyInjection/ActivitiesModule.kt | 2 -- .../dependencyInjection/AppComponent.kt | 3 +-- .../omnipod_dash/OmnipodDashPumpPlugin.java | 20 ++++++++++--------- .../comm/OmnipodDashCommunicationManager.java | 9 ++++----- 6 files changed, 16 insertions(+), 30 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 81a7a5e5b1..1799a9135d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -300,16 +300,6 @@ android:theme="@style/Theme.AppCompat.NoTitle" /> - - - - - - { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java index 2122ccf41c..fb9586cdad 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java @@ -21,6 +21,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription; import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.L; +import info.nightscout.androidaps.logging.LTag; import info.nightscout.androidaps.plugins.bus.RxBusWrapper; import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction; import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState; @@ -43,10 +44,11 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP; * @author Andy Rozman (andy.rozman@gmail.com) */ // FIXME this is just placeholder for now, but this should use most of OmnipodPumpPlugin implementation + // not dagger compatible, but first step is done public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodPumpPluginInterface { // 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; @@ -66,7 +68,7 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP private Profile currentProfile; - @Inject + //@Inject public OmnipodDashPumpPlugin(HasAndroidInjector injector, AAPSLogger aapsLogger, RxBusWrapper rxBus, @@ -104,13 +106,13 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP // // public void onServiceDisconnected(ComponentName name) { // if (isLoggingEnabled()) -// LOG.debug("RileyLinkOmnipodService is disconnected"); +// aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is disconnected"); // omnipodService = null; // } // // public void onServiceConnected(ComponentName name, IBinder service) { // if (isLoggingEnabled()) -// LOG.debug("RileyLinkOmnipodService is connected"); +// aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is connected"); // RileyLinkOmnipodService.LocalBinder mLocalBinder = (RileyLinkOmnipodService.LocalBinder) service; // omnipodService = mLocalBinder.getServiceInstance(); // @@ -121,7 +123,7 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP // // if (OmnipodUtil.getPumpStatus() != null) { // if (isLoggingEnabled()) -// LOG.debug("Starting OmniPod-RileyLink service"); +// aapsLogger.debug(LTag.PUMP, "Starting OmniPod-RileyLink service"); // if (OmnipodUtil.getPumpStatus().setNotInPreInit()) { // break; // } @@ -171,7 +173,7 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP @Override public boolean isInitialized() { if (displayConnectionMessages) - LOG.debug(getLogPrefix() + "isInitialized"); + aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isInitialized"); return isServiceSet() && isInitialized; } @@ -179,7 +181,7 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP @Override public boolean isConnected() { if (displayConnectionMessages) - LOG.debug(getLogPrefix() + "isConnected"); + aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isConnected"); return isServiceSet() && isServiceInitialized(); } @@ -187,7 +189,7 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP @Override public boolean isConnecting() { if (displayConnectionMessages) - LOG.debug(getLogPrefix() + "isConnecting"); + aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isConnecting"); return !isServiceSet() || !isServiceInitialized(); } @@ -224,7 +226,7 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP private void initializePump(boolean realInit) { - LOG.info(getLogPrefix() + "initializePump - start"); + aapsLogger.info(LTag.PUMP,getLogPrefix() + "initializePump - start"); if (omnipodCommunicationManager == null) { omnipodCommunicationManager = OmnipodDashCommunicationManager.getInstance(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java index 7db4d45be5..23b1935f01 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.PumpEnactResult; +import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.L; import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy; @@ -26,7 +27,9 @@ public class OmnipodDashCommunicationManager implements OmnipodCommunicationMana // TODO Dagger - private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM); + //private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM); + + private AAPSLogger aapsLogger; private static OmnipodDashCommunicationManager omnipodCommunicationManager; private String errorMessage; @@ -60,10 +63,6 @@ public class OmnipodDashCommunicationManager implements OmnipodCommunicationMana } - private boolean isLogEnabled() { - return L.isEnabled(L.PUMPCOMM); - } - @Override public PumpEnactResult initPod(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, Profile profile) {