From 4e604124c5cc3e964ea9536e639d9179590c34b9 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 14 Apr 2021 22:37:34 +0200 Subject: [PATCH] SmsCommunicatorInterface rename --- .../nightscout/androidaps/dependencyInjection/AppModule.kt | 2 +- .../plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt | 2 +- .../plugins/general/automation/actions/ActionSendSMS.kt | 4 ++-- .../plugins/general/automation/actions/ActionsTestBase.kt | 2 +- .../{SmsCommunicatorInterface.kt => SmsCommunicator.kt} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename core/src/main/java/info/nightscout/androidaps/interfaces/{SmsCommunicatorInterface.kt => SmsCommunicator.kt} (74%) diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt index 3e7cdb13e0..df43b587b5 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt @@ -87,7 +87,7 @@ open class AppModule { @Binds fun bindIconsProviderInterface(iconsProvider: IconsProviderImplementation): IconsProvider @Binds fun bindLoopInterface(loopPlugin: LoopPlugin): LoopInterface @Binds fun bindIobCobCalculatorInterface(iobCobCalculatorPlugin: IobCobCalculatorPlugin): IobCobCalculator - @Binds fun bindSmsCommunicatorInterface(smsCommunicatorPlugin: SmsCommunicatorPlugin): SmsCommunicatorInterface + @Binds fun bindSmsCommunicatorInterface(smsCommunicatorPlugin: SmsCommunicatorPlugin): SmsCommunicator @Binds fun bindUploadQueueAdminInterfaceToUploadQueue(uploadQueueAdminInterface: UploadQueueAdminInterface) : UploadQueueInterface @Binds fun bindDataSyncSelector(dataSyncSelectorImplementation: DataSyncSelectorImplementation): DataSyncSelector @Binds fun bindPumpSync(pumpSyncImplementation: PumpSyncImplementation): PumpSync diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt index b6c192c17c..ac7810f779 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -90,7 +90,7 @@ class SmsCommunicatorPlugin @Inject constructor( .preferencesId(R.xml.pref_smscommunicator) .description(R.string.description_sms_communicator), aapsLogger, resourceHelper, injector -), SmsCommunicatorInterface { +), SmsCommunicator { private val disposable = CompositeDisposable() var allowedNumbers: MutableList = ArrayList() diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt index 82bf9cc55b..446eeb4cee 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt @@ -4,7 +4,7 @@ import android.widget.LinearLayout import dagger.android.HasAndroidInjector import info.nightscout.androidaps.automation.R import info.nightscout.androidaps.data.PumpEnactResult -import info.nightscout.androidaps.interfaces.SmsCommunicatorInterface +import info.nightscout.androidaps.interfaces.SmsCommunicator import info.nightscout.androidaps.plugins.general.automation.elements.InputString import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder @@ -17,7 +17,7 @@ import javax.inject.Inject class ActionSendSMS(injector: HasAndroidInjector) : Action(injector) { @Inject lateinit var resourceHelper: ResourceHelper - @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorInterface + @Inject lateinit var smsCommunicatorPlugin: SmsCommunicator var text = InputString() diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt index 912c4345ea..8645076b58 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt @@ -43,7 +43,7 @@ open class ActionsTestBase : TestBaseWithProfile() { @Mock lateinit var configBuilder: ConfigBuilder @Mock lateinit var activePlugin: ActivePlugin @Mock lateinit var profilePlugin: ProfileInterface - @Mock lateinit var smsCommunicatorPlugin: SmsCommunicatorInterface + @Mock lateinit var smsCommunicatorPlugin: SmsCommunicator @Mock lateinit var loopPlugin: TestLoopPlugin @Mock lateinit var uel: UserEntryLogger diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/SmsCommunicatorInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/SmsCommunicator.kt similarity index 74% rename from core/src/main/java/info/nightscout/androidaps/interfaces/SmsCommunicatorInterface.kt rename to core/src/main/java/info/nightscout/androidaps/interfaces/SmsCommunicator.kt index 9e201728ec..e753ea049f 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/SmsCommunicatorInterface.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/SmsCommunicator.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.interfaces -interface SmsCommunicatorInterface { +interface SmsCommunicator { fun sendNotificationToAllNumbers(text: String): Boolean } \ No newline at end of file