diff --git a/app/build.gradle b/app/build.gradle index 093944c887..ec79ad34e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -193,6 +193,7 @@ dependencies { implementation project(':core:ns-sdk') implementation project(':core:utils') implementation project(':core:ui') + implementation project(':core:validators') implementation project(':ui') implementation project(':plugins:aps') implementation project(':plugins:automation') diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt index eccc1661d6..0b6b59923b 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt @@ -20,7 +20,6 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRv2.DanaRv2Plugin import info.nightscout.androidaps.danar.DanaRPlugin -import info.nightscout.androidaps.danars.DanaRSPlugin import info.nightscout.androidaps.diaconn.DiaconnG8Plugin import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin @@ -88,7 +87,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang @Inject lateinit var danaRPlugin: DanaRPlugin @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin @Inject lateinit var danaRv2Plugin: DanaRv2Plugin - @Inject lateinit var danaRSPlugin: DanaRSPlugin + @Inject lateinit var danaRSPlugin: info.nightscout.pump.danars.DanaRSPlugin @Inject lateinit var comboPlugin: ComboPlugin @Inject lateinit var combov2Plugin: ComboV2Plugin @Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt index cac098422d..5d8e48b593 100644 --- a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt @@ -6,7 +6,6 @@ import dagger.android.AndroidInjectionModule import dagger.android.AndroidInjector import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.danar.di.DanaRModule -import info.nightscout.androidaps.danars.di.DanaRSModule import info.nightscout.androidaps.diaconn.di.DiaconnG8Module import info.nightscout.androidaps.insight.di.InsightDatabaseModule import info.nightscout.androidaps.insight.di.InsightModule @@ -19,6 +18,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule import info.nightscout.automation.di.AutomationModule import info.nightscout.configuration.di.ConfigurationModule import info.nightscout.core.di.CoreModule +import info.nightscout.core.validators.di.ValidatorsModule import info.nightscout.database.impl.DatabaseModule import info.nightscout.implementation.di.ImplementationModule import info.nightscout.plugins.aps.di.ApsModule @@ -28,6 +28,7 @@ import info.nightscout.pump.combov2.di.ComboV2Module import info.nightscout.pump.common.di.PumpCommonModule import info.nightscout.pump.dana.di.DanaHistoryModule import info.nightscout.pump.dana.di.DanaModule +import info.nightscout.pump.danars.di.DanaRSModule import info.nightscout.rx.di.RxModule import info.nightscout.shared.di.SharedModule import info.nightscout.shared.impl.di.SharedImplModule @@ -62,6 +63,7 @@ import javax.inject.Singleton SharedModule::class, SharedImplModule::class, UiModule::class, + ValidatorsModule::class, // pumps ComboModule::class, diff --git a/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt b/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt index 9710bc44ad..f469562f30 100644 --- a/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt @@ -7,7 +7,6 @@ import dagger.multibindings.IntoMap import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRv2.DanaRv2Plugin import info.nightscout.androidaps.danar.DanaRPlugin -import info.nightscout.androidaps.danars.DanaRSPlugin import info.nightscout.androidaps.diaconn.DiaconnG8Plugin import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin @@ -160,7 +159,7 @@ abstract class PluginsListModule { @PumpDriver @IntoMap @IntKey(120) - abstract fun bindDanaRSPlugin(plugin: DanaRSPlugin): PluginBase + abstract fun bindDanaRSPlugin(plugin: info.nightscout.pump.danars.DanaRSPlugin): PluginBase @Binds @PumpDriver diff --git a/app/src/main/res/xml/pref_alerts.xml b/app/src/main/res/xml/pref_alerts.xml index 354489b0d5..41b83e9ace 100644 --- a/app/src/main/res/xml/pref_alerts.xml +++ b/app/src/main/res/xml/pref_alerts.xml @@ -13,7 +13,7 @@ android:key="@string/key_enable_missed_bg_readings_alert" android:title="@string/enable_missed_bg_readings_alert" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PIN not set Password not changed PIN not changed - Password cleared! PIN cleared! Enter password here Enter PIN here diff --git a/core/core-main/src/main/res/values/strings.xml b/core/core-main/src/main/res/values/strings.xml index f88ca2ca89..4d086d1f23 100644 --- a/core/core-main/src/main/res/values/strings.xml +++ b/core/core-main/src/main/res/values/strings.xml @@ -2,7 +2,6 @@ Save - Not set Going to deliver %1$.2f U Waiting for pump AAPS started @@ -10,8 +9,6 @@ %1$d g %1$.2f h %1$d mins - Pump is busy - Pump connection error Objectives Please wait… Mute @@ -39,7 +36,6 @@ Bluetooth BT Watchdog Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes. - Pairing OK Extended bolus Pump time updated @@ -127,13 +123,6 @@ IC ISF - - Bluetooth Low Energy not supported. - Bluetooth Low Energy not supported or device not paired. - Bluetooth not enabled. - Location Is Not Enabled - For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful. - Wrong password Wrong PIN @@ -211,7 +200,6 @@ Loop NS Record - Reading pump history Connection timed out diff --git a/core/core-main/src/main/res/drawable/ic_bluetooth_white_48dp.xml b/core/ui/src/main/res/drawable/ic_bluetooth_white_48dp.xml similarity index 100% rename from core/core-main/src/main/res/drawable/ic_bluetooth_white_48dp.xml rename to core/ui/src/main/res/drawable/ic_bluetooth_white_48dp.xml diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml index dfe5fe668b..d6ae97ba75 100644 --- a/core/ui/src/main/res/values/strings.xml +++ b/core/ui/src/main/res/values/strings.xml @@ -45,6 +45,12 @@ Device changed Bolus OK Tempbasal delivery error + Not set + Pump is busy + Pump connection error + Reading pump history + Password cleared! + Pairing Limiting max basal rate to %1$.2f U/h because of %2$s @@ -85,4 +91,11 @@ User request Pump paired + + Bluetooth Low Energy not supported. + Bluetooth Low Energy not supported or device not paired. + Bluetooth not enabled. + Location Is Not Enabled + For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful. + \ No newline at end of file diff --git a/core/validators/.gitignore b/core/validators/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/validators/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/validators/build.gradle b/core/validators/build.gradle new file mode 100644 index 0000000000..b1d6ce940d --- /dev/null +++ b/core/validators/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-kapt' + id 'kotlin-allopen' + id 'com.hiya.jacoco-android' +} + +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" +android { + namespace 'info.nightscout.core.validators' +} + + +dependencies { + implementation project(':app-wear-shared:shared') + implementation project(':core:interfaces') + implementation project(':core:ui') + api "com.google.android.material:material:$material_version" +} \ No newline at end of file diff --git a/core/validators/consumer-rules.pro b/core/validators/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/validators/proguard-rules.pro b/core/validators/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/core/validators/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/validators/src/androidTest/java/info/nightscout/core/validators/ExampleInstrumentedTest.kt b/core/validators/src/androidTest/java/info/nightscout/core/validators/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..27fceb03e0 --- /dev/null +++ b/core/validators/src/androidTest/java/info/nightscout/core/validators/ExampleInstrumentedTest.kt @@ -0,0 +1,23 @@ +package info.nightscout.core.validators + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("info.nightscout.core.validators.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/core/validators/src/main/AndroidManifest.xml b/core/validators/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..44008a4332 --- /dev/null +++ b/core/validators/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt similarity index 85% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt index 8aa1efa133..f9cfe25527 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator +package info.nightscout.core.validators import android.content.Context import android.text.Editable @@ -7,34 +7,33 @@ import android.text.TextWatcher import android.widget.EditText import com.google.android.material.textfield.TextInputLayout import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.utils.textValidator.validators.AlphaNumericValidator -import info.nightscout.androidaps.utils.textValidator.validators.AlphaValidator -import info.nightscout.androidaps.utils.textValidator.validators.AndValidator -import info.nightscout.androidaps.utils.textValidator.validators.BgRangeValidator -import info.nightscout.androidaps.utils.textValidator.validators.CreditCardValidator -import info.nightscout.androidaps.utils.textValidator.validators.DateValidator -import info.nightscout.androidaps.utils.textValidator.validators.DomainValidator -import info.nightscout.androidaps.utils.textValidator.validators.DummyValidator -import info.nightscout.androidaps.utils.textValidator.validators.EmailValidator -import info.nightscout.androidaps.utils.textValidator.validators.EmptyValidator -import info.nightscout.androidaps.utils.textValidator.validators.FloatNumericRangeValidator -import info.nightscout.androidaps.utils.textValidator.validators.HttpsUrlValidator -import info.nightscout.androidaps.utils.textValidator.validators.IpAddressValidator -import info.nightscout.androidaps.utils.textValidator.validators.MinDigitLengthValidator -import info.nightscout.androidaps.utils.textValidator.validators.MultiPhoneValidator -import info.nightscout.androidaps.utils.textValidator.validators.MultiValidator -import info.nightscout.androidaps.utils.textValidator.validators.NotValidator -import info.nightscout.androidaps.utils.textValidator.validators.NumericRangeValidator -import info.nightscout.androidaps.utils.textValidator.validators.NumericValidator -import info.nightscout.androidaps.utils.textValidator.validators.OrValidator -import info.nightscout.androidaps.utils.textValidator.validators.PersonFullNameValidator -import info.nightscout.androidaps.utils.textValidator.validators.PersonNameValidator -import info.nightscout.androidaps.utils.textValidator.validators.PhoneValidator -import info.nightscout.androidaps.utils.textValidator.validators.PinStrengthValidator -import info.nightscout.androidaps.utils.textValidator.validators.RegexpValidator -import info.nightscout.androidaps.utils.textValidator.validators.Validator -import info.nightscout.androidaps.utils.textValidator.validators.WebUrlValidator -import info.nightscout.core.main.R +import info.nightscout.core.validators.validators.AlphaNumericValidator +import info.nightscout.core.validators.validators.AlphaValidator +import info.nightscout.core.validators.validators.AndValidator +import info.nightscout.core.validators.validators.BgRangeValidator +import info.nightscout.core.validators.validators.CreditCardValidator +import info.nightscout.core.validators.validators.DateValidator +import info.nightscout.core.validators.validators.DomainValidator +import info.nightscout.core.validators.validators.DummyValidator +import info.nightscout.core.validators.validators.EmailValidator +import info.nightscout.core.validators.validators.EmptyValidator +import info.nightscout.core.validators.validators.FloatNumericRangeValidator +import info.nightscout.core.validators.validators.HttpsUrlValidator +import info.nightscout.core.validators.validators.IpAddressValidator +import info.nightscout.core.validators.validators.MinDigitLengthValidator +import info.nightscout.core.validators.validators.MultiPhoneValidator +import info.nightscout.core.validators.validators.MultiValidator +import info.nightscout.core.validators.validators.NotValidator +import info.nightscout.core.validators.validators.NumericRangeValidator +import info.nightscout.core.validators.validators.NumericValidator +import info.nightscout.core.validators.validators.OrValidator +import info.nightscout.core.validators.validators.PersonFullNameValidator +import info.nightscout.core.validators.validators.PersonNameValidator +import info.nightscout.core.validators.validators.PhoneValidator +import info.nightscout.core.validators.validators.PinStrengthValidator +import info.nightscout.core.validators.validators.RegexpValidator +import info.nightscout.core.validators.validators.Validator +import info.nightscout.core.validators.validators.WebUrlValidator import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.ProfileFunction import javax.inject.Inject @@ -158,7 +157,7 @@ class DefaultEditTextValidator : EditTextValidator { EditTextValidator.TEST_PERSONFULLNAME -> PersonFullNameValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_notvalid_personfullname) else testErrorString) EditTextValidator.TEST_MIN_LENGTH -> MinDigitLengthValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_not_a_minimum_length) else testErrorString, minLength) EditTextValidator.TEST_BG_RANGE -> BgRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, - Profile.fromMgdlToUnits(minMgdl.toDouble(), profileFunction + Profile.fromMgdlToUnits(minMgdl.toDouble(), profileFunction .getUnits()).toString(), Profile.fromMgdlToUnits(maxMgdl.toDouble(), profileFunction.getUnits()).toString()) else testErrorString, minMgdl, maxMgdl, profileFunction) diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/EditTextValidator.kt similarity index 92% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/EditTextValidator.kt index b610eaf9a1..615b6269d2 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/EditTextValidator.kt @@ -1,10 +1,8 @@ -package info.nightscout.androidaps.utils.textValidator +package info.nightscout.core.validators import android.content.Context -import kotlin.Throws import android.text.TextWatcher -import info.nightscout.androidaps.utils.textValidator.validators.Validator -import java.lang.IllegalArgumentException +import info.nightscout.core.validators.validators.Validator /** * Interface for encapsulating validation of an EditText control diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt b/core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt similarity index 98% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt rename to core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt index b31f1bc500..088c855c71 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt @@ -1,11 +1,10 @@ -package info.nightscout.androidaps.utils.textValidator +package info.nightscout.core.validators import android.content.Context import android.util.AttributeSet import androidx.preference.EditTextPreference import androidx.preference.PreferenceViewHolder import dagger.android.HasAndroidInjector -import info.nightscout.core.main.R import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.shared.SafeParse diff --git a/core/core-main/src/main/java/info/nightscout/core/di/ValidatorsModule.kt b/core/validators/src/main/java/info/nightscout/core/validators/di/ValidatorsModule.kt similarity index 62% rename from core/core-main/src/main/java/info/nightscout/core/di/ValidatorsModule.kt rename to core/validators/src/main/java/info/nightscout/core/validators/di/ValidatorsModule.kt index e2903a301a..a47ca4974e 100644 --- a/core/core-main/src/main/java/info/nightscout/core/di/ValidatorsModule.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/di/ValidatorsModule.kt @@ -1,10 +1,10 @@ -package info.nightscout.core.di +package info.nightscout.core.validators.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.androidaps.utils.textValidator.DefaultEditTextValidator -import info.nightscout.androidaps.utils.textValidator.EditTextValidator -import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference +import info.nightscout.core.validators.DefaultEditTextValidator +import info.nightscout.core.validators.EditTextValidator +import info.nightscout.core.validators.ValidatingEditTextPreference @Module @Suppress("unused") diff --git a/core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaNumericValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaNumericValidator.kt new file mode 100644 index 0000000000..eaacb6611f --- /dev/null +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaNumericValidator.kt @@ -0,0 +1,3 @@ +package info.nightscout.core.validators.validators + +class AlphaNumericValidator(message: String?) : RegexpValidator(message, "[a-zA-Z0-9\u00C0-\u00FF \\./-\\?]*") \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaValidator.kt similarity index 59% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaValidator.kt index e5dccc096b..e17444ced0 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaValidator.kt @@ -1,3 +1,3 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators class AlphaValidator(message: String?) : RegexpValidator(message, "[A-z\u00C0-\u00ff \\./-\\?]*") \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/AndValidator.kt similarity index 90% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/AndValidator.kt index b9e9746b6a..379b57218a 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/AndValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt similarity index 91% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt index 494714b58e..a490205f80 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText import info.nightscout.interfaces.profile.Profile diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/CreditCardValidator.kt similarity index 95% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/CreditCardValidator.kt index 932614483d..e7d668867e 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/CreditCardValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/DateValidator.kt similarity index 95% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/DateValidator.kt index a54f4c1242..deb8f6f745 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/DateValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.annotation.SuppressLint import android.text.TextUtils @@ -6,7 +6,7 @@ import android.widget.EditText import java.text.DateFormat import java.text.ParseException import java.text.SimpleDateFormat -import java.util.* +import java.util.Date class DateValidator(_customErrorMessage: String?, _format: String?) : Validator(_customErrorMessage) { private val formats: Array = if (_format == null || TextUtils.isEmpty(_format)) diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/DigitLengthRangeValidator.kt similarity index 92% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/DigitLengthRangeValidator.kt index 7274e1ec9b..87bc9d2315 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/DigitLengthRangeValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/DomainValidator.kt similarity index 68% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/DomainValidator.kt index e8b1aae4b4..87d48eed7d 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/DomainValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.util.Patterns diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/DummyValidator.kt similarity index 81% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/DummyValidator.kt index 31ebda7da7..deb243aa4e 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/DummyValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/EmailValidator.kt similarity index 86% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/EmailValidator.kt index 0bb335644a..75def284db 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/EmailValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.util.Patterns diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/EmptyValidator.kt similarity index 85% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/EmptyValidator.kt index 33bd9358ba..b909ab73c9 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/EmptyValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.text.TextUtils import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt similarity index 91% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt index 889914dbdc..759b169a11 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText import info.nightscout.shared.SafeParse diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/HttpsUrlValidator.kt similarity index 80% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/HttpsUrlValidator.kt index 947ad9cd6c..a7d31e8050 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/HttpsUrlValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/IpAddressValidator.kt similarity index 69% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/IpAddressValidator.kt index e026c7a59f..405bcc0d5d 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/IpAddressValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.util.Patterns @@ -8,4 +8,4 @@ import android.util.Patterns * @author Andrea Baccega @andreabaccega.com> */ @Suppress("deprecation") -class IpAddressValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.IP_ADDRESS) \ No newline at end of file +class IpAddressValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.IP_ADDRESS) \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/MinDigitLengthValidator.kt similarity index 80% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/MinDigitLengthValidator.kt index 0042e6ada8..a2fd5657ce 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/MinDigitLengthValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/MultiPhoneValidator.kt similarity index 90% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/MultiPhoneValidator.kt index a2c6d8f882..5883c01e32 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/MultiPhoneValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.util.Patterns import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/MultiValidator.kt similarity index 87% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/MultiValidator.kt index ef18c004fc..55aad176a3 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/MultiValidator.kt @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators -import java.util.* +import java.util.Arrays /** * Abstract class for a multivalidator. diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/NotValidator.kt similarity index 85% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/NotValidator.kt index 36446c6fa4..46122a5bea 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/NotValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/NumericRangeValidator.kt similarity index 90% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/NumericRangeValidator.kt index b17daac54a..4d98044190 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/NumericRangeValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/NumericValidator.kt similarity index 86% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/NumericValidator.kt index 9c70faa622..0926a8d188 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/NumericValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.text.TextUtils import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/OrValidator.kt similarity index 89% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/OrValidator.kt index 49e3d09dc9..6f4e2dd5cf 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/OrValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/PatternValidator.kt similarity index 90% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/PatternValidator.kt index 58685555be..8fbd041314 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/PatternValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText import java.util.regex.Pattern diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/PersonFullNameValidator.kt similarity index 57% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/PersonFullNameValidator.kt index b31402506e..592d696b6e 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/PersonFullNameValidator.kt @@ -1,3 +1,3 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators class PersonFullNameValidator(message: String?) : RegexpValidator(message, "[\\p{L}- ]+") \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/PersonNameValidator.kt similarity index 56% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/PersonNameValidator.kt index 2b53db13c8..257387f230 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/PersonNameValidator.kt @@ -1,3 +1,3 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators class PersonNameValidator(message: String?) : RegexpValidator(message, "[\\p{L}-]+") \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/PhoneValidator.kt similarity index 70% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/PhoneValidator.kt index 31c99bf14c..f05ec75fee 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/PhoneValidator.kt @@ -1,8 +1,6 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators -import android.os.Build import android.util.Patterns -import java.util.regex.Pattern /** * It validates phone numbers. diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/PinStrengthValidator.kt similarity index 94% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/PinStrengthValidator.kt index 8e98ee1fe3..e18ae4b8cb 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/PinStrengthValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/RegexpValidator.kt similarity index 80% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/RegexpValidator.kt index a92d03299e..f6b034c733 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/RegexpValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import java.util.regex.Pattern diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/SameValueValidator.kt similarity index 87% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/SameValueValidator.kt index 41733d9e5d..629b4963a7 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/SameValueValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.text.TextUtils import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/Validator.kt similarity index 88% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/Validator.kt index 65f7c28152..687a63a659 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/Validator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.widget.EditText diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/WebUrlValidator.kt similarity index 80% rename from core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt rename to core/validators/src/main/java/info/nightscout/core/validators/validators/WebUrlValidator.kt index bc1312df1b..56264b7b0a 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/WebUrlValidator.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.utils.textValidator.validators +package info.nightscout.core.validators.validators import android.util.Patterns diff --git a/core/validators/src/test/java/info/nightscout/core/validators/ExampleUnitTest.kt b/core/validators/src/test/java/info/nightscout/core/validators/ExampleUnitTest.kt new file mode 100644 index 0000000000..e66e4b3d94 --- /dev/null +++ b/core/validators/src/test/java/info/nightscout/core/validators/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package info.nightscout.core.validators + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle index ccef8c0a88..42c8560e9d 100644 --- a/plugins/aps/build.gradle +++ b/plugins/aps/build.gradle @@ -23,6 +23,7 @@ dependencies { implementation project(':core:interfaces') implementation project(':core:utils') implementation project(':core:ui') + implementation project(':core:validators') api "androidx.appcompat:appcompat:$appcompat_version" api "androidx.swiperefreshlayout:swiperefreshlayout:$swipe_version" diff --git a/plugins/aps/src/main/res/xml/pref_autotune.xml b/plugins/aps/src/main/res/xml/pref_autotune.xml index 7cc1d6d488..e5241d67cf 100644 --- a/plugins/aps/src/main/res/xml/pref_autotune.xml +++ b/plugins/aps/src/main/res/xml/pref_autotune.xml @@ -27,7 +27,7 @@ android:title="@string/autotune_tune_insulin_curve_title" /> --> - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - ruffyScripter.readHistory(request)); + CommandResult historyResult = runCommand(getRh().gs(R.string.reading_pump_history), 3, () -> ruffyScripter.readHistory(request)); PumpHistory history = historyResult.history; if (!historyResult.success || history == null) { return false; @@ -1226,7 +1226,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints { // fetch new records long lastKnownPumpRecordTimestamp = recentBoluses.isEmpty() ? 0 : recentBoluses.get(0).timestamp; - CommandResult historyResult = runCommand(getRh().gs(R.string.combo_activity_reading_pump_history), 3, () -> + CommandResult historyResult = runCommand(getRh().gs(R.string.reading_pump_history), 3, () -> ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(lastKnownPumpRecordTimestamp))); if (!historyResult.success) { pumpHistoryChanged = true; diff --git a/pump/combo/src/main/res/values/strings.xml b/pump/combo/src/main/res/values/strings.xml index 920de3e3a1..d107602291 100644 --- a/pump/combo/src/main/res/values/strings.xml +++ b/pump/combo/src/main/res/values/strings.xml @@ -22,7 +22,6 @@ Unsafe usage: the pump uses a different basal rate profile than the first. The loop has been disabled. Select the first profile on the pump and refresh. A bolus with the same amount was requested within the last two minutes. To prevent accidental double boluses and to guard against bugs this is disallowed. Now - Reading pump history Setting basal profile Pump cartridge level is low Pump battery is low diff --git a/pump/dana/src/main/res/values/strings.xml b/pump/dana/src/main/res/values/strings.xml index 43f77f0459..fa70c25da0 100644 --- a/pump/dana/src/main/res/values/strings.xml +++ b/pump/dana/src/main/res/values/strings.xml @@ -16,7 +16,7 @@ danar_bt_name Pairing - No device found so far + No device found so far Pairing OK Pairing timed out Waiting for pairing on pump diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle index 33cf509c1a..16226a9c55 100644 --- a/pump/danar/build.gradle +++ b/pump/danar/build.gradle @@ -17,7 +17,6 @@ android { dependencies { implementation project(':app-wear-shared:shared') - //implementation project(':core:core-main') implementation project(':core:interfaces') implementation project(':core:utils') implementation project(':core:ui') diff --git a/pump/danar/src/main/res/xml/pref_danar.xml b/pump/danar/src/main/res/xml/pref_danar.xml index 4bfa1a64a2..f8f6950820 100644 --- a/pump/danar/src/main/res/xml/pref_danar.xml +++ b/pump/danar/src/main/res/xml/pref_danar.xml @@ -13,7 +13,7 @@ android:key="@string/key_danar_bt_name" android:title="@string/danar_bt_name_title" /> - - - - - + android:name=".activities.BLEScanActivity" + android:exported="false" + android:theme="@style/AppTheme.NoActionBar"> - + diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java b/pump/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java deleted file mode 100644 index 1435290716..0000000000 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java +++ /dev/null @@ -1,165 +0,0 @@ -package info.nightscout.androidaps.danars.dialogs; - - -import android.os.Bundle; -import android.os.Handler; -import android.os.HandlerThread; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; - -import androidx.fragment.app.FragmentActivity; - -import javax.inject.Inject; - -import dagger.android.support.DaggerDialogFragment; -import info.nightscout.androidaps.danars.R; -import info.nightscout.androidaps.danars.activities.PairingHelperActivity; -import info.nightscout.androidaps.danars.databinding.DanarsPairingProgressDialogBinding; -import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess; -import info.nightscout.core.utils.fabric.FabricPrivacy; -import info.nightscout.rx.AapsSchedulers; -import info.nightscout.rx.bus.RxBus; -import info.nightscout.shared.interfaces.ResourceHelper; -import io.reactivex.rxjava3.disposables.CompositeDisposable; - - -public class PairingProgressDialog extends DaggerDialogFragment { - - @Inject AapsSchedulers aapsSchedulers; - @Inject ResourceHelper rh; - @Inject RxBus rxBus; - @Inject FabricPrivacy fabricPrivacy; - - private final CompositeDisposable disposable = new CompositeDisposable(); - - private PairingHelperActivity helperActivity; - - private static boolean pairingEnded = false; - - private static Handler handler; - private static HandlerThread handlerThread; - - private static Runnable runnable; - - private DanarsPairingProgressDialogBinding binding; - - public PairingProgressDialog() { - super(); - // Required empty public constructor - if (handlerThread == null) { - handlerThread = new HandlerThread(PairingProgressDialog.class.getSimpleName()); - handlerThread.start(); - handler = new Handler(handlerThread.getLooper()); - } - - runnable = () -> { - for (int i = 0; i < 20; i++) { - if (pairingEnded) { - FragmentActivity activity = getActivity(); - if (activity != null) { - activity.runOnUiThread(() -> { - if (binding != null) { - binding.danarsPairingprogressProgressbar.setProgress(100); - binding.danarsPairingprogressStatus.setText(R.string.danars_pairingok); - } - try { - Thread.sleep(1000); - } catch (InterruptedException ignored) { - } - dismiss(); - }); - } else - dismiss(); - return; - } - if (binding != null) binding.danarsPairingprogressProgressbar.setProgress(i * 5); - try { - Thread.sleep(1000); - } catch (InterruptedException ignored) { - } - } - FragmentActivity activity = getActivity(); - if (activity != null) { - activity.runOnUiThread(() -> { - if (binding != null) { - binding.danarsPairingprogressProgressbar.setProgress(100); - binding.danarsPairingprogressStatus.setText(R.string.danars_pairingtimedout); - binding.ok.setVisibility(View.VISIBLE); - } - }); - } - }; - } - - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - binding = DanarsPairingProgressDialogBinding.inflate(inflater, container, false); - - getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE); - getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); - setCancelable(false); - getDialog().setCanceledOnTouchOutside(false); - - setViews(); - - return binding.getRoot(); - } - - @Override - public void onResume() { - super.onResume(); - disposable.add(rxBus - .toObservable(EventDanaRSPairingSuccess.class) - .observeOn(aapsSchedulers.getIo()) - .subscribe(event -> pairingEnded = true, fabricPrivacy::logException) - ); - if (pairingEnded) dismiss(); - getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - } - - @Override - public void dismiss() { - super.dismissAllowingStateLoss(); - if (helperActivity != null) { - helperActivity.finish(); - } - } - - @Override - public void onPause() { - super.onPause(); - disposable.clear(); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } - - private void setViews() { - if (binding != null) { - binding.danarsPairingprogressProgressbar.setMax(100); - binding.danarsPairingprogressProgressbar.setProgress(0); - binding.danarsPairingprogressStatus.setText(rh.gs(R.string.danars_waitingforpairing)); - binding.ok.setVisibility(View.GONE); - binding.ok.setOnClickListener(v -> dismiss()); - } - handler.post(runnable); - } - - public void resetToNewPairing() { - handler.removeCallbacks(runnable); - setViews(); - } - - public PairingProgressDialog setHelperActivity(PairingHelperActivity activity) { - this.helperActivity = activity; - return this; - } -} diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java b/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java index a3fb39a647..10749ca98e 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java @@ -5,6 +5,8 @@ import android.content.Context; import javax.inject.Inject; import javax.inject.Singleton; +import info.nightscout.pump.danars.encryption.EncryptionType; + @Singleton public class BleEncryption { private final Context context; diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt index 9d1a663034..1e830206d1 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars +package info.nightscout.pump.danars import android.content.ComponentName import android.content.Context @@ -8,9 +8,6 @@ import android.os.IBinder import android.text.format.DateFormat import androidx.preference.Preference import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange -import info.nightscout.androidaps.danars.services.DanaRSService -import info.nightscout.core.events.EventNewNotification import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.constraints.Constraint @@ -32,11 +29,14 @@ import info.nightscout.interfaces.pump.defs.ManufacturerType import info.nightscout.interfaces.pump.defs.PumpDescription import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.interfaces.queue.CommandQueue +import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.interfaces.utils.DecimalFormatter import info.nightscout.interfaces.utils.Round import info.nightscout.pump.dana.DanaFragment import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.comm.RecordTypes +import info.nightscout.pump.danars.events.EventDanaRSDeviceChange +import info.nightscout.pump.danars.services.DanaRSService import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventAppExit @@ -75,7 +75,8 @@ class DanaRSPlugin @Inject constructor( private val detailedBolusInfoStorage: DetailedBolusInfoStorage, private val temporaryBasalStorage: TemporaryBasalStorage, private val fabricPrivacy: FabricPrivacy, - private val dateUtil: DateUtil + private val dateUtil: DateUtil, + private val activityNames: ActivityNames ) : PumpPluginBase( PluginDescription() .mainType(PluginType.PUMP) @@ -229,23 +230,20 @@ class DanaRSPlugin @Inject constructor( val result = PumpEnactResult(injector) if (!isInitialized()) { aapsLogger.error("setNewBasalProfile not initialized") - val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(R.string.pump_not_initialized_profile_not_set), Notification.URGENT) - rxBus.send(EventNewNotification(notification)) + activityNames.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(R.string.pump_not_initialized_profile_not_set), Notification.URGENT) result.comment = rh.gs(R.string.pump_not_initialized_profile_not_set) return result } else { rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)) } return if (danaRSService?.updateBasalsInPump(profile) != true) { - val notification = Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failed_update_basal_profile), Notification.URGENT) - rxBus.send(EventNewNotification(notification)) + activityNames.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failed_update_basal_profile), Notification.URGENT) result.comment = rh.gs(R.string.failed_update_basal_profile) result } else { rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)) rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)) - val notification = Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60) - rxBus.send(EventNewNotification(notification)) + activityNames.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60) result.success = true result.enacted = true result.comment = "OK" diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt similarity index 87% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt index 5827c3570a..0b1b111588 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.activities +package info.nightscout.pump.danars.activities import android.Manifest import android.annotation.SuppressLint @@ -20,22 +20,24 @@ import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.TextView import androidx.core.app.ActivityCompat -import info.nightscout.androidaps.danars.R -import info.nightscout.androidaps.danars.databinding.DanarsBlescannerActivityBinding -import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange -import info.nightscout.core.activities.NoSplashAppCompatActivity +import dagger.android.support.DaggerAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable import info.nightscout.interfaces.pump.BlePreCheck +import info.nightscout.pump.danars.R +import info.nightscout.pump.danars.databinding.DanarsBlescannerActivityBinding +import info.nightscout.pump.danars.events.EventDanaRSDeviceChange +import info.nightscout.rx.bus.RxBus import info.nightscout.shared.sharedPreferences.SP import java.util.regex.Pattern import javax.inject.Inject -class BLEScanActivity : NoSplashAppCompatActivity() { +class BLEScanActivity : DaggerAppCompatActivity() { @Inject lateinit var sp: SP @Inject lateinit var blePreCheck: BlePreCheck @Inject lateinit var context: Context + @Inject lateinit var rxBus: RxBus private var listAdapter: ListAdapter? = null private val devices = ArrayList() @@ -54,8 +56,8 @@ class BLEScanActivity : NoSplashAppCompatActivity() { blePreCheck.prerequisitesCheck(this) listAdapter = ListAdapter() - binding.blescannerListview.emptyView = binding.blescannerNodevice - binding.blescannerListview.adapter = listAdapter + binding.bleScannerListview.emptyView = binding.bleScannerNoDevice + binding.bleScannerListview.adapter = listAdapter listAdapter?.notifyDataSetChanged() } @@ -66,7 +68,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { bluetoothAdapter?.safeEnable() startScan() } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission)) } } @@ -82,7 +84,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { } catch (ignore: IllegalStateException) { } // ignore BT not on } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission)) } private fun stopScan() = @@ -92,7 +94,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { } catch (ignore: IllegalStateException) { } // ignore BT not on } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission)) } @SuppressLint("MissingPermission") @@ -153,7 +155,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { item.device.createBond() rxBus.send(EventDanaRSDeviceChange()) } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission)) } finish() } diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt similarity index 82% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt index caa68f28b6..75e7ea257e 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt @@ -1,31 +1,36 @@ -package info.nightscout.androidaps.danars.activities +package info.nightscout.pump.danars.activities import android.os.Bundle import android.util.Base64 -import info.nightscout.androidaps.danars.DanaRSPlugin -import info.nightscout.androidaps.danars.R -import info.nightscout.androidaps.danars.databinding.DanarsEnterPinActivityBinding -import info.nightscout.androidaps.danars.services.BLEComm -import info.nightscout.androidaps.utils.textValidator.DefaultEditTextValidator -import info.nightscout.androidaps.utils.textValidator.EditTextValidator -import info.nightscout.core.activities.NoSplashAppCompatActivity +import dagger.android.support.DaggerAppCompatActivity import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.utils.hexStringToByteArray +import info.nightscout.core.validators.DefaultEditTextValidator +import info.nightscout.core.validators.EditTextValidator +import info.nightscout.pump.danars.DanaRSPlugin +import info.nightscout.pump.danars.R +import info.nightscout.pump.danars.databinding.DanarsEnterPinActivityBinding +import info.nightscout.pump.danars.services.BLEComm import info.nightscout.rx.AapsSchedulers +import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventPumpStatusChanged +import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import kotlin.experimental.xor -class EnterPinActivity : NoSplashAppCompatActivity() { +class EnterPinActivity : DaggerAppCompatActivity() { @Inject lateinit var fabricPrivacy: FabricPrivacy @Inject lateinit var danaRSPlugin: DanaRSPlugin @Inject lateinit var sp: SP @Inject lateinit var bleComm: BLEComm @Inject lateinit var aapsSchedulers: AapsSchedulers + @Inject lateinit var rh: ResourceHelper + @Inject lateinit var rxBus: RxBus private val disposable = CompositeDisposable() @@ -62,11 +67,10 @@ class EnterPinActivity : NoSplashAppCompatActivity() { override fun onResume() { super.onResume() - disposable.add(rxBus + disposable += rxBus .toObservable(EventPumpStatusChanged::class.java) .observeOn(aapsSchedulers.main) .subscribe({ if (it.status == EventPumpStatusChanged.Status.DISCONNECTED) finish() }, fabricPrivacy::logException) - ) } override fun onPause() { diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt similarity index 67% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt index 530cebe5ea..c5bed29d63 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt @@ -1,20 +1,20 @@ -package info.nightscout.androidaps.danars.activities +package info.nightscout.pump.danars.activities import android.annotation.SuppressLint import android.content.Intent import android.content.pm.ActivityInfo import android.os.Bundle -import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog -import info.nightscout.core.activities.NoSplashAppCompatActivity +import dagger.android.support.DaggerAppCompatActivity +import info.nightscout.pump.danars.dialogs.PairingProgressDialog + +class PairingHelperActivity : DaggerAppCompatActivity() { -class PairingHelperActivity : NoSplashAppCompatActivity() { var dialog: PairingProgressDialog? = null @SuppressLint("SourceLockedOrientationActivity") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - dialog = PairingProgressDialog() - .setHelperActivity(this) + dialog = PairingProgressDialog().setHelperActivity(this) dialog?.show(supportFragmentManager, "PairingProgress") requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT } diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSMessageHashTable.kt similarity index 98% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSMessageHashTable.kt index 4c7eb50294..ab422b991b 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSMessageHashTable.kt @@ -1,7 +1,6 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import java.util.* import javax.inject.Inject import javax.inject.Singleton diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt index 51347b1fd7..006963ef90 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt @@ -1,9 +1,10 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.shared.utils.DateUtil +import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.rx.logging.AAPSLogger +import info.nightscout.shared.utils.DateUtil import org.joda.time.DateTime import org.joda.time.IllegalInstantException import java.nio.charset.StandardCharsets @@ -13,6 +14,7 @@ open class DanaRSPacket(protected var injector: HasAndroidInjector) { @Inject lateinit var aapsLogger: AAPSLogger @Inject lateinit var dateUtil: DateUtil + @Inject lateinit var activityNames: ActivityNames var isReceived = false private set diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt index 285402832b..4c590edb45 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt similarity index 99% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt index c5c2a823c6..c2dc852ab8 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt @@ -1,13 +1,13 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.interfaces.pump.DetailedBolusInfo import info.nightscout.interfaces.pump.DetailedBolusInfoStorage import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.pump.TemporaryBasalStorage import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.LTag diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt index 6abddb86c4..730eacfb28 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt similarity index 86% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt index 9e01308764..45e56e01c6 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt @@ -1,11 +1,10 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.core.events.EventNewNotification import info.nightscout.interfaces.notifications.Notification import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventDismissNotification import info.nightscout.rx.logging.LTag @@ -48,8 +47,7 @@ class DanaRSPacketBasalGetBasalRate( aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![danaPump.activeProfile][index]) if (danaPump.basalStep != 0.01) { failed = true - val notification = Notification(Notification.WRONG_BASAL_STEP, rh.gs(R.string.danar_setbasalstep001), Notification.URGENT) - rxBus.send(EventNewNotification(notification)) + activityNames.addNotification(Notification.WRONG_BASAL_STEP, rh.gs(R.string.danar_setbasalstep001), Notification.URGENT) } else { rxBus.send(EventDismissNotification(Notification.WRONG_BASAL_STEP)) } diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt index 12d881b914..d1555b4dca 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt index 7ca1c49fb5..9cce3e4c8f 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt @@ -1,10 +1,9 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.rx.logging.LTag - class DanaRSPacketBasalSetCancelTemporaryBasal( injector: HasAndroidInjector ) : DanaRSPacket(injector) { diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt index d1d1f1e4fd..1e8a8df842 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt similarity index 95% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt index 3cd6915fb4..875dc7ab81 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt @@ -1,10 +1,9 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.rx.logging.LTag - class DanaRSPacketBasalSetProfileNumber( injector: HasAndroidInjector, private var profileNumber: Int = 0 diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt index fc1e0d358f..2efa50a43d 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt index 6955b602db..b3fd3990d1 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt index 076be2541b..db8eb50675 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt index ee134289a7..e9e2fda10c 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt similarity index 93% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt index 62d1625c17..0235255375 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt @@ -1,11 +1,10 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.core.events.EventNewNotification import info.nightscout.interfaces.notifications.Notification import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventDismissNotification import info.nightscout.rx.logging.LTag @@ -84,8 +83,7 @@ class DanaRSPacketBolusGetBolusOption( dataSize = 1 val missedBolus04EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize)) if (!danaPump.isExtendedBolusEnabled) { - val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, rh.gs(R.string.danar_enableextendedbolus), Notification.URGENT) - rxBus.send(EventNewNotification(notification)) + activityNames.addNotification(Notification.EXTENDED_BOLUS_DISABLED, rh.gs(R.string.danar_enableextendedbolus), Notification.URGENT) failed = true } else { rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED)) diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt similarity index 99% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt index 0af50864fa..875e3811bc 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt similarity index 98% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt index 72411c9470..d6115b38d8 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt index c8941b64d4..b8abf957b4 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt index ac555c38bc..ad3aea9aac 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt similarity index 98% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt index e097bbf62b..9464012b6b 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt index fa19c1cf8e..d6142cc957 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt index 94faa662b9..7ed67e7886 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt index b0430afe9b..07c2c171ec 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt index f4835d5dfd..9875a64dd2 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventOverviewBolusProgress import info.nightscout.rx.logging.LTag diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt index b3c65d3217..b6b8368fa4 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt index fa103a851d..04e2606dd6 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt similarity index 85% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt index b847d0b7b2..7ee97ad49d 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt @@ -1,11 +1,10 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.core.events.EventNewNotification import info.nightscout.interfaces.notifications.Notification import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper @@ -43,7 +42,7 @@ class DanaRSPacketGeneralGetPumpCheck( aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaPump.protocol)) aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaPump.productCode)) if (danaPump.productCode < 2) { - rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, rh.gs(R.string.unsupportedfirmware), Notification.URGENT))) + activityNames.addNotification(Notification.UNSUPPORTED_FIRMWARE, rh.gs(R.string.unsupportedfirmware), Notification.URGENT) } } diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt index ac346920f2..b03c63a894 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt index afd9b6cf46..2c91e07323 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt index da516ea008..d1cb869034 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt similarity index 98% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt index 0c8c44bb6a..d847fda098 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt similarity index 95% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt index 7c92263e1e..54a552a9d6 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt index 10070f9e92..890554ea89 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt similarity index 99% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt index 033d72c4cd..c05323ab2f 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.interfaces.pump.PumpSync diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt index 8fb64cd877..fe4e66787d 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt index 0401fa4cfc..e47cd25edf 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt index f1e82e0513..d0d7fa62b2 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt index 72f9b9119e..c6deeea90d 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt index 6f5f086c34..c81f29e812 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt index 40e624a3d2..bb4904d053 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt index 22d4c54e41..e3aad31af2 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt index c4651214f2..1c393f2c04 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt index eb38e0cefe..7b4331220d 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt index 95f5fce5ff..c89cdb3606 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt similarity index 91% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt index 1600c1b9ed..8dc7e35c59 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt similarity index 90% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt index 3c45f817bb..bbc9d99057 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt @@ -1,12 +1,11 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.core.events.EventNewNotification import info.nightscout.interfaces.notifications.Notification import info.nightscout.interfaces.pump.PumpSync import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper @@ -64,8 +63,7 @@ class DanaRSPacketNotifyAlarm( aapsLogger.debug(LTag.PUMPCOMM, "Error detected: $errorString") return } - val notification = Notification(Notification.USER_MESSAGE, errorString, Notification.URGENT) - rxBus.send(EventNewNotification(notification)) + activityNames.addNotification(Notification.USER_MESSAGE, errorString, Notification.URGENT) pumpSync.insertAnnouncement(errorString, null, danaPump.pumpType(), danaPump.serialNumber) } diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt index ed8bdfe853..619dbffc78 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventOverviewBolusProgress import info.nightscout.rx.logging.LTag diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt index 0f478f32be..2ea2033b24 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventOverviewBolusProgress import info.nightscout.rx.logging.LTag diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt index 70b1b65e0e..dea53e645a 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt index e401611583..ef38b282a9 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt index 1d05535199..dd549e0152 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt similarity index 98% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt index 5bb8c589e8..d1be033cbe 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt index 7e1f676cd6..94ab1cad0f 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt index a5d0870b62..4edbc87f80 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt similarity index 98% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt index 65cb92dc85..bf54a9b32e 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt similarity index 97% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt index 0f633884e8..5e51119c74 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt similarity index 94% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt index 626f1b2b16..37faf51a9f 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.comm +package info.nightscout.pump.danars.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSActivitiesModule.kt similarity index 62% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSActivitiesModule.kt index ac539d7d5a..771c57727b 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSActivitiesModule.kt @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.pump.danars.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.androidaps.danars.activities.BLEScanActivity -import info.nightscout.androidaps.danars.activities.EnterPinActivity -import info.nightscout.androidaps.danars.activities.PairingHelperActivity -import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog +import info.nightscout.pump.danars.activities.BLEScanActivity +import info.nightscout.pump.danars.activities.EnterPinActivity +import info.nightscout.pump.danars.activities.PairingHelperActivity +import info.nightscout.pump.danars.dialogs.PairingProgressDialog @Module @Suppress("unused") diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSCommModule.kt similarity index 63% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSCommModule.kt index cef12e716c..7abdc57d85 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSCommModule.kt @@ -1,8 +1,63 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.pump.danars.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.androidaps.danars.comm.* +import info.nightscout.pump.danars.comm.DanaRSPacket +import info.nightscout.pump.danars.comm.DanaRSPacketAPSBasalSetTemporaryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketAPSHistoryEvents +import info.nightscout.pump.danars.comm.DanaRSPacketAPSSetEventHistory +import info.nightscout.pump.danars.comm.DanaRSPacketBasalGetBasalRate +import info.nightscout.pump.danars.comm.DanaRSPacketBasalGetProfileNumber +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetCancelTemporaryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetProfileBasalRate +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetProfileNumber +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetSuspendOff +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetSuspendOn +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetTemporaryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGet24CIRCFArray +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetBolusOption +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetCIRCFArray +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetCalculationInformation +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetStepBolusInformation +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSet24CIRCFArray +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetBolusOption +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetExtendedBolus +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetExtendedBolusCancel +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetStepBolusStart +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetStepBolusStop +import info.nightscout.pump.danars.comm.DanaRSPacketEtcKeepConnection +import info.nightscout.pump.danars.comm.DanaRSPacketEtcSetHistorySave +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralGetPumpCheck +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralGetShippingInformation +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralGetShippingVersion +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralGetUserTimeChangeFlag +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralInitialScreenInformation +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralSetHistoryUploadMode +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralSetUserTimeChangeFlagClear +import info.nightscout.pump.danars.comm.DanaRSPacketHistory +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryAlarm +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryAllHistory +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryBloodGlucose +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryBolus +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryCarbohydrate +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryDaily +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryPrime +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryRefill +import info.nightscout.pump.danars.comm.DanaRSPacketHistorySuspend +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryTemporary +import info.nightscout.pump.danars.comm.DanaRSPacketNotifyAlarm +import info.nightscout.pump.danars.comm.DanaRSPacketNotifyDeliveryComplete +import info.nightscout.pump.danars.comm.DanaRSPacketNotifyDeliveryRateDisplay +import info.nightscout.pump.danars.comm.DanaRSPacketNotifyMissedBolusAlarm +import info.nightscout.pump.danars.comm.DanaRSPacketOptionGetPumpTime +import info.nightscout.pump.danars.comm.DanaRSPacketOptionGetPumpUTCAndTimeZone +import info.nightscout.pump.danars.comm.DanaRSPacketOptionGetUserOption +import info.nightscout.pump.danars.comm.DanaRSPacketOptionSetPumpTime +import info.nightscout.pump.danars.comm.DanaRSPacketOptionSetPumpUTCAndTimeZone +import info.nightscout.pump.danars.comm.DanaRSPacketOptionSetUserOption +import info.nightscout.pump.danars.comm.DanaRSPacketReviewBolusAvg +import info.nightscout.pump.danars.comm.DanaRSPacketReviewGetPumpDecRatio @Module @Suppress("unused") diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSModule.kt similarity index 78% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSModule.kt index 3939007598..e3f0de32cc 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSModule.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.pump.danars.di import dagger.Module diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSServicesModule.kt similarity index 67% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSServicesModule.kt index e24db08b9d..1ad073766a 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/di/DanaRSServicesModule.kt @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.pump.danars.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.androidaps.danars.services.DanaRSService +import info.nightscout.pump.danars.services.DanaRSService @Module @Suppress("unused") diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt new file mode 100644 index 0000000000..81542f3655 --- /dev/null +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt @@ -0,0 +1,124 @@ +package info.nightscout.pump.danars.dialogs + +import android.os.Bundle +import android.os.Handler +import android.os.HandlerThread +import android.os.SystemClock +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.Window +import android.view.WindowManager +import dagger.android.support.DaggerDialogFragment +import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.pump.danars.R +import info.nightscout.pump.danars.activities.PairingHelperActivity +import info.nightscout.pump.danars.databinding.DanarsPairingProgressDialogBinding +import info.nightscout.pump.danars.events.EventDanaRSPairingSuccess +import info.nightscout.rx.AapsSchedulers +import info.nightscout.rx.bus.RxBus +import info.nightscout.shared.interfaces.ResourceHelper +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import javax.inject.Inject + +class PairingProgressDialog : DaggerDialogFragment() { + + @Inject lateinit var aapsSchedulers: AapsSchedulers + @Inject lateinit var rh: ResourceHelper + @Inject lateinit var rxBus: RxBus + @Inject lateinit var fabricPrivacy: FabricPrivacy + + private val disposable = CompositeDisposable() + private var helperActivity: PairingHelperActivity? = null + + private var handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper) + private lateinit var runnable: Runnable + + private var _binding: DanarsPairingProgressDialogBinding? = null + + // This property is only valid between onCreateView and onDestroyView. + private val binding get() = _binding!! + + companion object { + + private var pairingEnded = false + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = DanarsPairingProgressDialogBinding.inflate(inflater, container, false) + dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE) + dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN) + isCancelable = false + dialog?.setCanceledOnTouchOutside(false) + setViews() + return binding.root + } + + override fun onResume() { + super.onResume() + disposable += rxBus + .toObservable(EventDanaRSPairingSuccess::class.java) + .observeOn(aapsSchedulers.io) + .subscribe({ pairingEnded = true }, fabricPrivacy::logException) + if (pairingEnded) dismiss() + dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + runnable = Runnable { + for (i in 0..19) { + if (pairingEnded) { + activity?.runOnUiThread { + _binding?.danarsPairingprogressProgressbar?.progress = 100 + _binding?.danarsPairingprogressStatus?.setText(R.string.danars_pairingok) + handler.postDelayed({ dismiss() }, 1000) + } + return@Runnable + } + _binding?.danarsPairingprogressProgressbar?.progress = i * 5 + SystemClock.sleep(1000) + } + activity?.runOnUiThread { + _binding?.danarsPairingprogressProgressbar?.progress = 100 + _binding?.danarsPairingprogressStatus?.setText(R.string.danars_pairingtimedout) + _binding?.ok?.visibility = View.VISIBLE + } + } + } + + override fun dismiss() { + super.dismissAllowingStateLoss() + helperActivity?.finish() + } + + override fun onPause() { + super.onPause() + disposable.clear() + handler.removeCallbacksAndMessages(null) + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + + private fun setViews() { + _binding?.danarsPairingprogressProgressbar?.max = 100 + _binding?.danarsPairingprogressProgressbar?.progress = 0 + _binding?.danarsPairingprogressStatus?.text = rh.gs(R.string.danars_waitingforpairing) + _binding?.ok?.visibility = View.GONE + _binding?.ok?.setOnClickListener { dismiss() } + handler.post(runnable) + } + + fun resetToNewPairing() { + handler.removeCallbacks(runnable) + setViews() + } + + fun setHelperActivity(activity: PairingHelperActivity?): PairingProgressDialog { + helperActivity = activity + return this + } +} \ No newline at end of file diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/encryption/EncryptionType.kt similarity index 69% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/encryption/EncryptionType.kt index a0e5a77882..34d977dd53 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/encryption/EncryptionType.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.encryption +package info.nightscout.pump.danars.encryption enum class EncryptionType(val type: Int) { ENCRYPTION_DEFAULT(0), diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt similarity index 62% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt index 5636eb93e8..1474abc6b3 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.events +package info.nightscout.pump.danars.events import info.nightscout.rx.events.Event diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt similarity index 62% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt index 98d9451c08..b0b6cc95c3 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.events +package info.nightscout.pump.danars.events import info.nightscout.rx.events.Event diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt similarity index 96% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt index 4427254a87..75f2d85673 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.services +package info.nightscout.pump.danars.services import android.Manifest import android.annotation.SuppressLint @@ -19,23 +19,22 @@ import android.os.SystemClock import android.util.Base64 import androidx.core.app.ActivityCompat import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.DanaRSPlugin -import info.nightscout.androidaps.danars.R -import info.nightscout.androidaps.danars.activities.EnterPinActivity -import info.nightscout.androidaps.danars.activities.PairingHelperActivity -import info.nightscout.androidaps.danars.comm.DanaRSMessageHashTable -import info.nightscout.androidaps.danars.comm.DanaRSPacket -import info.nightscout.androidaps.danars.comm.DanaRSPacketEtcKeepConnection import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.androidaps.danars.encryption.EncryptionType -import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess -import info.nightscout.core.events.EventNewNotification import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.notify import info.nightscout.core.utils.waitMillis import info.nightscout.interfaces.notifications.Notification import info.nightscout.interfaces.pump.PumpSync +import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.pump.dana.DanaPump +import info.nightscout.pump.danars.R +import info.nightscout.pump.danars.activities.EnterPinActivity +import info.nightscout.pump.danars.activities.PairingHelperActivity +import info.nightscout.pump.danars.comm.DanaRSMessageHashTable +import info.nightscout.pump.danars.comm.DanaRSPacket +import info.nightscout.pump.danars.comm.DanaRSPacketEtcKeepConnection +import info.nightscout.pump.danars.encryption.EncryptionType +import info.nightscout.pump.danars.events.EventDanaRSPairingSuccess import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventDismissNotification import info.nightscout.rx.events.EventPumpStatusChanged @@ -60,10 +59,11 @@ class BLEComm @Inject internal constructor( private val sp: SP, private val danaRSMessageHashTable: DanaRSMessageHashTable, private val danaPump: DanaPump, - private val danaRSPlugin: DanaRSPlugin, + private val danaRSPlugin: info.nightscout.pump.danars.DanaRSPlugin, private val bleEncryption: BleEncryption, private val pumpSync: PumpSync, - private val dateUtil: DateUtil + private val dateUtil: DateUtil, + private val activityNames: ActivityNames ) { companion object { @@ -106,7 +106,7 @@ class BLEComm @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from") return false } @@ -514,8 +514,7 @@ class BLEComm @Inject internal constructor( private fun sendConnect() { val deviceName = connectDeviceName if (deviceName == null || deviceName == "") { - val n = Notification(Notification.DEVICE_NOT_PAIRED, rh.gs(R.string.pairfirst), Notification.URGENT) - rxBus.send(EventNewNotification(n)) + activityNames.addNotification(Notification.DEVICE_NOT_PAIRED, rh.gs(R.string.pairfirst), Notification.URGENT) return } val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, deviceName) @@ -587,21 +586,19 @@ class BLEComm @Inject internal constructor( mSendQueue.clear() rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.pumperror))) pumpSync.insertAnnouncement(rh.gs(R.string.pumperror), null, danaPump.pumpType(), danaPump.serialNumber) - val n = Notification(Notification.PUMP_ERROR, rh.gs(R.string.pumperror), Notification.URGENT) - rxBus.send(EventNewNotification(n)) + activityNames.addNotification(Notification.PUMP_ERROR, rh.gs(R.string.pumperror), Notification.URGENT) // response BUSY: error status } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.code.toByte() && decryptedBuffer[3] == 'U'.code.toByte() && decryptedBuffer[4] == 'S'.code.toByte() && decryptedBuffer[5] == 'Y'.code.toByte()) { aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRSPacket.toHexString(decryptedBuffer)) mSendQueue.clear() - rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.pumpbusy))) + rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.pump_busy))) } else { // ERROR in response, wrong serial number aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRSPacket.toHexString(decryptedBuffer)) mSendQueue.clear() - rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.connectionerror))) + rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.connection_error))) danaRSPlugin.clearPairing() - val n = Notification(Notification.WRONG_SERIAL_NUMBER, rh.gs(R.string.password_cleared), Notification.URGENT) - rxBus.send(EventNewNotification(n)) + activityNames.addNotification(Notification.WRONG_SERIAL_NUMBER, rh.gs(R.string.password_cleared), Notification.URGENT) } } @@ -691,7 +688,7 @@ class BLEComm @Inject internal constructor( aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + danaPump.rsPassword) if (!danaPump.isRSPasswordOK) { aapsLogger.error(LTag.PUMPBTCOMM, "Wrong pump password") - rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_PASSWORD, rh.gs(R.string.wrongpumppassword), Notification.URGENT))) + activityNames.addNotification(Notification.WRONG_PUMP_PASSWORD, rh.gs(R.string.wrongpumppassword), Notification.URGENT) disconnect("WrongPassword") SystemClock.sleep(T.mins(1).msecs()) } else { diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt similarity index 87% rename from pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt rename to pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt index 2c86c3e971..40422b170b 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.services +package info.nightscout.pump.danars.services import android.app.Service import android.content.Context @@ -8,50 +8,6 @@ import android.os.IBinder import android.os.SystemClock import dagger.android.DaggerService import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.danars.DanaRSPlugin -import info.nightscout.androidaps.danars.R -import info.nightscout.androidaps.danars.comm.DanaRSPacket -import info.nightscout.androidaps.danars.comm.DanaRSPacketAPSBasalSetTemporaryBasal -import info.nightscout.androidaps.danars.comm.DanaRSPacketAPSHistoryEvents -import info.nightscout.androidaps.danars.comm.DanaRSPacketAPSSetEventHistory -import info.nightscout.androidaps.danars.comm.DanaRSPacketBasalGetBasalRate -import info.nightscout.androidaps.danars.comm.DanaRSPacketBasalGetProfileNumber -import info.nightscout.androidaps.danars.comm.DanaRSPacketBasalSetCancelTemporaryBasal -import info.nightscout.androidaps.danars.comm.DanaRSPacketBasalSetProfileBasalRate -import info.nightscout.androidaps.danars.comm.DanaRSPacketBasalSetProfileNumber -import info.nightscout.androidaps.danars.comm.DanaRSPacketBasalSetTemporaryBasal -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusGet24CIRCFArray -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusGetBolusOption -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusGetCIRCFArray -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusGetCalculationInformation -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusGetStepBolusInformation -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusSet24CIRCFArray -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusSetExtendedBolus -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusSetExtendedBolusCancel -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusSetStepBolusStart -import info.nightscout.androidaps.danars.comm.DanaRSPacketBolusSetStepBolusStop -import info.nightscout.androidaps.danars.comm.DanaRSPacketEtcKeepConnection -import info.nightscout.androidaps.danars.comm.DanaRSPacketGeneralGetPumpCheck -import info.nightscout.androidaps.danars.comm.DanaRSPacketGeneralGetShippingInformation -import info.nightscout.androidaps.danars.comm.DanaRSPacketGeneralInitialScreenInformation -import info.nightscout.androidaps.danars.comm.DanaRSPacketGeneralSetHistoryUploadMode -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistory -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryAlarm -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryBasal -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryBloodGlucose -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryBolus -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryCarbohydrate -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryDaily -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryPrime -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistoryRefill -import info.nightscout.androidaps.danars.comm.DanaRSPacketHistorySuspend -import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionGetPumpTime -import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionGetPumpUTCAndTimeZone -import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionGetUserOption -import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionSetPumpTime -import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionSetPumpUTCAndTimeZone -import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionSetUserOption -import info.nightscout.core.events.EventNewNotification import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.Constants import info.nightscout.interfaces.constraints.Constraints @@ -69,6 +25,49 @@ import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.comm.RecordTypes import info.nightscout.pump.dana.events.EventDanaRNewStatus +import info.nightscout.pump.danars.DanaRSPlugin +import info.nightscout.pump.danars.R +import info.nightscout.pump.danars.comm.DanaRSPacket +import info.nightscout.pump.danars.comm.DanaRSPacketAPSBasalSetTemporaryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketAPSHistoryEvents +import info.nightscout.pump.danars.comm.DanaRSPacketAPSSetEventHistory +import info.nightscout.pump.danars.comm.DanaRSPacketBasalGetBasalRate +import info.nightscout.pump.danars.comm.DanaRSPacketBasalGetProfileNumber +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetCancelTemporaryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetProfileBasalRate +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetProfileNumber +import info.nightscout.pump.danars.comm.DanaRSPacketBasalSetTemporaryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGet24CIRCFArray +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetBolusOption +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetCIRCFArray +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetCalculationInformation +import info.nightscout.pump.danars.comm.DanaRSPacketBolusGetStepBolusInformation +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSet24CIRCFArray +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetExtendedBolus +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetExtendedBolusCancel +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetStepBolusStart +import info.nightscout.pump.danars.comm.DanaRSPacketBolusSetStepBolusStop +import info.nightscout.pump.danars.comm.DanaRSPacketEtcKeepConnection +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralGetPumpCheck +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralGetShippingInformation +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralInitialScreenInformation +import info.nightscout.pump.danars.comm.DanaRSPacketGeneralSetHistoryUploadMode +import info.nightscout.pump.danars.comm.DanaRSPacketHistory +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryAlarm +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryBasal +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryBloodGlucose +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryBolus +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryCarbohydrate +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryDaily +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryPrime +import info.nightscout.pump.danars.comm.DanaRSPacketHistoryRefill +import info.nightscout.pump.danars.comm.DanaRSPacketHistorySuspend +import info.nightscout.pump.danars.comm.DanaRSPacketOptionGetPumpTime +import info.nightscout.pump.danars.comm.DanaRSPacketOptionGetPumpUTCAndTimeZone +import info.nightscout.pump.danars.comm.DanaRSPacketOptionGetUserOption +import info.nightscout.pump.danars.comm.DanaRSPacketOptionSetPumpTime +import info.nightscout.pump.danars.comm.DanaRSPacketOptionSetPumpUTCAndTimeZone +import info.nightscout.pump.danars.comm.DanaRSPacketOptionSetUserOption import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventAppExit @@ -241,8 +240,7 @@ class DanaRSService : DaggerService() { if (danaPump.dailyTotalUnits > danaPump.maxDailyTotalUnits * Constants.dailyLimitWarning) { aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits) if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) { - val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT) - rxBus.send(EventNewNotification(reportFail)) + activityNames.addNotification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT) pumpSync.insertAnnouncement( rh.gs(R.string.approachingdailylimit) + ": " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits + "U", null, diff --git a/pump/danars/src/main/res/layout/danars_blescanner_activity.xml b/pump/danars/src/main/res/layout/danars_blescanner_activity.xml index eeb2310de8..b0094e20fa 100644 --- a/pump/danars/src/main/res/layout/danars_blescanner_activity.xml +++ b/pump/danars/src/main/res/layout/danars_blescanner_activity.xml @@ -35,17 +35,17 @@ diff --git a/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml b/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml index 4d3bb1648f..e5f9bc28d6 100644 --- a/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml +++ b/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="info.nightscout.androidaps.danars.activities.EnterPinActivity"> + tools:context=".activities.EnterPinActivity"> + tools:context=".dialogs.PairingProgressDialog"> - + - - - - - - - - + + + + + + + + +