caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

remove dependency

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 21:51:59 +02:00
parent 95c8fec5bd
commit 38d3c0cc31
118 changed files with 171 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/app/aaps/MainActivity.kt
View file

@ -49,9 +49,9 @@ import app.aaps.core.interfaces.rx.events.EventRebuildTabs
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.core.interfaces.ui.IconsProvider
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.UIRunnable
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.locale.LocaleHelper

2
app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
View file

@ -26,8 +26,8 @@ import app.aaps.core.interfaces.rx.events.EventScale
import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.databinding.ActivityHistorybrowseBinding

2
app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
View file

@ -10,8 +10,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.database.impl.AppRepository
import app.aaps.implementation.overview.OverviewDataImpl

2
app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
View file

@ -21,8 +21,8 @@ import app.aaps.core.interfaces.rx.events.EventOfflineChange
import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.rx.events.EventTherapyEventChange
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION

1
build.gradle
View file

@ -50,6 +50,7 @@ buildscript {
wearable_version = '2.9.0'
play_services_wearable_version = '18.1.0'
play_services_location_version = '21.0.1'
play_services_measurement_version = '21.3.0'
kotlinx_datetime_version = '0.4.1'
kotlinx_serialization_version = '1.6.0'

2
core/interfaces/build.gradle
View file

@ -37,6 +37,8 @@ dependencies {
api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed
api 'com.github.tony19:logback-android:2.0.0'
api "com.google.android.gms:play-services-measurement-api:$play_services_measurement_version"
api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version"
api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version"
api "com.caverock:androidsvg:$caverock_androidsvg_version"

15
core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/fabric/FabricPrivacy.kt Normal file
View file

@ -0,0 +1,15 @@
package app.aaps.core.interfaces.utils.fabric
import android.os.Bundle
import app.aaps.core.interfaces.rx.weardata.EventData
import com.google.firebase.analytics.FirebaseAnalytics
interface FabricPrivacy {
val firebaseAnalytics: FirebaseAnalytics
fun logCustom(name: String, event: Bundle)
fun logCustom(event: String)
fun logMessage(message: String)
fun logException(throwable: Throwable)
fun fabricEnabled(): Boolean
fun logWearException(wearException: EventData.WearException)
}

2
core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt
View file

@ -3,9 +3,9 @@ package app.aaps.core.main.utils.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.HasAndroidInjector
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext

3
implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt
View file

@ -31,6 +31,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.Translator
import app.aaps.core.interfaces.utils.TrendCalculator
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.graph.OverviewData
import app.aaps.implementation.alerts.LocalAlertUtilsImpl
import app.aaps.implementation.androidNotification.NotificationHolderImpl
@ -66,6 +67,7 @@ import app.aaps.implementation.utils.DecimalFormatterImpl
import app.aaps.implementation.utils.HardLimitsImpl
import app.aaps.implementation.utils.TranslatorImpl
import app.aaps.implementation.utils.TrendCalculatorImpl
import app.aaps.implementation.utils.fabric.FabricPrivacyImpl
import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
@ -86,6 +88,7 @@ abstract class ImplementationModule {
@Module
interface Bindings {
@Binds fun bindFabricPrivacy(fabricPrivacyImpl: FabricPrivacyImpl): FabricPrivacy
@Binds fun bindPersistenceLayer(persistenceLayerImpl: PersistenceLayerImpl): PersistenceLayer
@Binds fun bindActivePlugin(pluginStore: PluginStore): ActivePlugin
@Binds fun bindOverviewData(overviewData: OverviewDataImpl): OverviewData

2
implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt
View file

@ -17,9 +17,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.fromConstant
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.ValueWrapper
import app.aaps.database.entities.ProfileSwitch
import app.aaps.database.impl.AppRepository

2
implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt
View file

@ -38,11 +38,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.extensions.getCustomizedName
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.utils.HtmlHelper
import app.aaps.database.ValueWrapper
import app.aaps.database.entities.EffectiveProfileSwitch

2
implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt
View file

@ -19,7 +19,7 @@ import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.content.ContextCompat
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.getThemeColor
import app.aaps.core.ui.locale.LocaleHelper
import java.util.Locale

21
core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/fabric/FabricPrivacyImpl.kt
View file

@ -1,4 +1,4 @@
package app.aaps.core.main.utils.fabric
package app.aaps.implementation.utils.fabric
import android.os.Bundle
import app.aaps.annotations.OpenForTesting
@ -6,6 +6,7 @@ import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.rx.weardata.EventData
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import com.google.firebase.analytics.FirebaseAnalytics
import com.google.firebase.analytics.ktx.analytics
import com.google.firebase.crashlytics.FirebaseCrashlytics
@ -24,12 +25,12 @@ import javax.inject.Singleton
*/
@OpenForTesting
@Singleton
class FabricPrivacy @Inject constructor(
class FabricPrivacyImpl @Inject constructor(
private val aapsLogger: AAPSLogger,
private val sp: SP
) {
) : FabricPrivacy {
val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics
override val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics
init {
firebaseAnalytics.setAnalyticsCollectionEnabled(!java.lang.Boolean.getBoolean("disableFirebase") && fabricEnabled())
@ -38,7 +39,7 @@ class FabricPrivacy @Inject constructor(
// Analytics logCustom
@Suppress("unused")
fun logCustom(name: String, event: Bundle) {
override fun logCustom(name: String, event: Bundle) {
try {
if (fabricEnabled()) {
firebaseAnalytics.logEvent(name, event)
@ -69,7 +70,7 @@ class FabricPrivacy @Inject constructor(
}
// Analytics logCustom
fun logCustom(event: String) {
override fun logCustom(event: String) {
try {
if (fabricEnabled()) {
firebaseAnalytics.logEvent(event, Bundle())
@ -84,22 +85,22 @@ class FabricPrivacy @Inject constructor(
}
// Crashlytics log message
fun logMessage(message: String) {
override fun logMessage(message: String) {
aapsLogger.info(LTag.CORE, "Crashlytics log message: $message")
FirebaseCrashlytics.getInstance().log(message)
}
// Crashlytics logException
fun logException(throwable: Throwable) {
override fun logException(throwable: Throwable) {
aapsLogger.error("Crashlytics log exception: ", throwable)
FirebaseCrashlytics.getInstance().recordException(throwable)
}
fun fabricEnabled(): Boolean {
override fun fabricEnabled(): Boolean {
return sp.getBoolean(R.string.key_enable_fabric, true)
}
fun logWearException(wearException: EventData.WearException) {
override fun logWearException(wearException: EventData.WearException) {
aapsLogger.debug(LTag.WEAR, "logWearException")
FirebaseCrashlytics.getInstance().apply {
setCustomKey("wear_exception", true)

2
implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt
View file

@ -23,8 +23,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.ValueWrapper
import app.aaps.database.entities.Bolus
import app.aaps.database.impl.AppRepository

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
View file

@ -19,7 +19,6 @@ import java.util.List;
import javax.inject.Inject;
import app.aaps.core.main.utils.fabric.FabricPrivacy;
import app.aaps.core.interfaces.queue.Callback;
import app.aaps.core.interfaces.queue.CommandQueue;
import app.aaps.core.interfaces.resources.ResourceHelper;
@ -27,6 +26,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers;
import app.aaps.core.interfaces.rx.bus.RxBus;
import app.aaps.core.interfaces.utils.DateUtil;
import app.aaps.core.interfaces.utils.DecimalFormatter;
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy;
import dagger.android.support.DaggerFragment;
import info.nightscout.androidaps.insight.R;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;

2
plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt
View file

@ -21,7 +21,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.aps.databinding.OpenapsFragmentBinding
import app.aaps.plugins.aps.events.EventOpenAPSUpdateGui
import app.aaps.plugins.aps.events.EventResetOpenAPSGui

2
plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFragment.kt
View file

@ -37,8 +37,8 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.MidnightTime
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.elements.WeekDay
import app.aaps.database.entities.UserEntry

2
plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopFragment.kt
View file

@ -21,9 +21,9 @@ import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.pump.toHtml
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.utils.HtmlHelper
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.databinding.LoopFragmentBinding

2
plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopPlugin.kt
View file

@ -55,13 +55,13 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.extensions.convertedToAbsolute
import app.aaps.core.main.extensions.convertedToPercent
import app.aaps.core.main.extensions.plannedRemainingMinutes
import app.aaps.core.main.iob.json
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.interfaces.RunningConfiguration
import app.aaps.database.ValueWrapper
import app.aaps.database.entities.DeviceStatus

2
plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
View file

@ -25,9 +25,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.extensions.target
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.utils.MidnightUtils
import app.aaps.database.ValueWrapper
import app.aaps.database.impl.AppRepository

2
plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt
View file

@ -17,7 +17,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.interfaces.RunningConfiguration
import app.aaps.database.impl.AppRepository
import app.aaps.shared.tests.TestBase

2
plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationFragment.kt
View file

@ -27,8 +27,8 @@ import app.aaps.core.interfaces.logging.UserEntryLogger
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.utils.ActionModeHelper
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter
import app.aaps.core.ui.dragHelpers.OnStartDragListener

2
plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationPlugin.kt
View file

@ -28,7 +28,7 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.actions.ActionAlarm
import app.aaps.plugins.automation.actions.ActionCarePortalEvent

2
plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditEventDialog.kt
View file

@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.automation.AutomationEventObject
import app.aaps.plugins.automation.AutomationPlugin

2
plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditTriggerDialog.kt
View file

@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.databinding.AutomationDialogEditTriggerBinding
import app.aaps.plugins.automation.events.EventAutomationUpdateTrigger
import app.aaps.plugins.automation.events.EventTriggerChanged

2
plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationService.kt
View file

@ -22,7 +22,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventAppExit
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.events.EventLocationChange
import com.google.android.gms.location.LocationServices

2
plugins/automation/src/test/kotlin/app/aaps/plugins/automation/BolusTimerImplTest.kt
View file

@ -10,7 +10,7 @@ import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.services.LocationServiceHelper
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.ui.TimerUtil

2
plugins/automation/src/test/kotlin/app/aaps/plugins/automation/CarbTimerImplTest.kt
View file

@ -10,7 +10,7 @@ import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.services.LocationServiceHelper
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.ui.TimerUtil

2
plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderFragment.kt
View file

@ -14,7 +14,7 @@ import app.aaps.core.interfaces.protection.ProtectionCheck.Protection.PREFERENCE
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.plugins.configuration.databinding.ConfigbuilderFragmentBinding

2
plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenanceFragment.kt
View file

@ -25,8 +25,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.utils.HtmlHelper
import app.aaps.database.entities.UserEntry.Action

2
plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SetupWizardActivity.kt
View file

@ -18,7 +18,7 @@ import app.aaps.core.interfaces.rx.events.EventSWSyncStatus
import app.aaps.core.interfaces.rx.events.EventSWUpdate
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.locale.LocaleHelper.update
import app.aaps.plugins.configuration.R

2
plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPlugin.kt
View file

@ -7,7 +7,7 @@ import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.plugins.configuration.setupwizard.SWDefinition
import dagger.android.HasAndroidInjector

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
View file

@ -1,7 +1,6 @@
package app.aaps.plugins.constraints.bgQualityCheck
import androidx.annotation.DrawableRes
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck
import app.aaps.core.interfaces.constraints.Constraint
import app.aaps.core.interfaces.constraints.PluginConstraints
@ -18,6 +17,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventBucketedDataCreated
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import io.reactivex.rxjava3.disposables.CompositeDisposable

10
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt
View file

@ -26,20 +26,20 @@ import app.aaps.core.interfaces.rx.events.EventNtpStatus
import app.aaps.core.interfaces.rx.events.EventSWUpdate
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.utils.HtmlHelper
import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit
import dagger.android.support.DaggerFragment
import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding
import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding
import app.aaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
import app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
import app.aaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
import app.aaps.plugins.constraints.objectives.objectives.Objective.ExamTask
import dagger.android.support.DaggerFragment
import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding
import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
View file

@ -5,13 +5,13 @@ import android.os.SystemClock
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventNtpStatus
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.support.DaggerDialogFragment
import info.nightscout.plugins.constraints.databinding.DialogNtpProgressBinding
import io.reactivex.rxjava3.disposables.CompositeDisposable

3
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
View file

@ -8,10 +8,9 @@ import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.entities.GlucoseValue
import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector

2
plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
View file

@ -33,6 +33,7 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.MidnightTime
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.convertedToAbsolute
import app.aaps.core.main.extensions.iobCalc
import app.aaps.core.main.extensions.toTemporaryBasal
@ -42,7 +43,6 @@ import app.aaps.core.main.iob.copy
import app.aaps.core.main.iob.determineBasalJson
import app.aaps.core.main.iob.plus
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.database.ValueWrapper
import app.aaps.database.entities.Bolus

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsFragment.kt
View file

@ -31,9 +31,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.toStringMedium
import app.aaps.core.main.extensions.toStringShort
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.UIRunnable
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.elements.SingleClickButton

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodFragment.kt
View file

@ -21,7 +21,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventFoodDatabaseChanged
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.UIRunnable
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.database.entities.Food

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
View file

@ -76,12 +76,12 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.TrendCalculator
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.extensions.directionToIcon
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.iob.displayText
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.wizard.QuickWizard
import app.aaps.core.ui.UIRunnable
import app.aaps.core.ui.dialogs.OKDialog

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
View file

@ -19,7 +19,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.core.interfaces.rx.events.EventScale
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.main.R
import com.google.gson.Gson
import javax.inject.Inject

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt
View file

@ -20,6 +20,7 @@ import app.aaps.core.interfaces.rx.events.EventNewHistoryData
import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged
import app.aaps.core.interfaces.rx.events.EventUpdateOverviewCalcProgress
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.graph.OverviewData
@ -30,7 +31,6 @@ import app.aaps.core.main.utils.extensions.storeBoolean
import app.aaps.core.main.utils.extensions.storeDouble
import app.aaps.core.main.utils.extensions.storeInt
import app.aaps.core.main.utils.extensions.storeString
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.validators.ValidatingEditTextPreference
import app.aaps.plugins.main.R

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyService.kt
View file

@ -11,7 +11,7 @@ import app.aaps.core.interfaces.notifications.NotificationHolder
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventAppExit
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.DaggerService
import io.reactivex.rxjava3.disposables.CompositeDisposable
import javax.inject.Inject

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/PersistentNotificationPlugin.kt
View file

@ -26,10 +26,10 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.core.interfaces.ui.IconsProvider
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.toStringShort
import app.aaps.core.main.iob.generateCOBString
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.main.R
import dagger.android.HasAndroidInjector
import io.reactivex.rxjava3.disposables.CompositeDisposable

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorFragment.kt
View file

@ -9,7 +9,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.smsCommunicator.Sms
import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.utils.HtmlHelper
import app.aaps.plugins.main.databinding.SmscommunicatorFragmentBinding
import app.aaps.plugins.main.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt
View file

@ -46,11 +46,11 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.iob.generateCOBString
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.utils.receivers.DataWorkerStorage
import app.aaps.core.validators.ValidatingEditTextPreference

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
View file

@ -13,7 +13,7 @@ import android.view.WindowManager
import app.aaps.core.interfaces.logging.UserEntryLogger
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.toast.ToastUtils

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearFragment.kt
View file

@ -19,7 +19,7 @@ import app.aaps.core.interfaces.rx.weardata.EventData
import app.aaps.core.interfaces.rx.weardata.ResFileMap
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.main.R
import app.aaps.plugins.main.databinding.WearFragmentBinding

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearPlugin.kt
View file

@ -20,7 +20,7 @@ import app.aaps.core.interfaces.rx.weardata.CwfData
import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey
import app.aaps.core.interfaces.rx.weardata.EventData
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.main.R
import app.aaps.plugins.main.general.wear.wearintegration.DataHandlerMobile
import app.aaps.plugins.main.general.wear.wearintegration.DataLayerListenerServiceMobileHelper

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/activities/CwfInfosActivity.kt
View file

@ -21,8 +21,8 @@ import app.aaps.core.interfaces.rx.weardata.ResFileMap
import app.aaps.core.interfaces.rx.weardata.ViewKeys
import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.plugins.main.R
import app.aaps.plugins.main.databinding.CwfInfosActivityBinding

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt
View file

@ -39,6 +39,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.TrendCalculator
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.extensions.convertedToAbsolute
import app.aaps.core.main.extensions.toStringShort
@ -46,7 +47,6 @@ import app.aaps.core.main.extensions.valueToUnits
import app.aaps.core.main.graph.data.GlucoseValueDataPoint
import app.aaps.core.main.iob.generateCOBString
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.wizard.BolusWizard
import app.aaps.core.main.wizard.QuickWizard
import app.aaps.core.main.wizard.QuickWizardEntry

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
View file

@ -18,7 +18,7 @@ import app.aaps.core.interfaces.rx.events.EventMobileToWear
import app.aaps.core.interfaces.rx.events.EventWearUpdateGui
import app.aaps.core.interfaces.rx.weardata.EventData
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.database.impl.AppRepository
import app.aaps.plugins.main.R
import app.aaps.plugins.main.general.wear.WearPlugin

2
plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfileFragment.kt
View file

@ -26,8 +26,8 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.ValueWithUnit

2
plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt
View file

@ -28,9 +28,9 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventNewBG
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.directionToIcon
import app.aaps.core.main.utils.ActionModeHelper
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.UserEntry.Action

2
plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt
View file

@ -16,7 +16,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.source.BgSource
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.UserEntry

2
plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt
View file

@ -18,7 +18,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.source.BgSource
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.UserEntry

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt
View file

@ -28,10 +28,10 @@ import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui
import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.durationInMinutes
import app.aaps.core.main.extensions.toStringFull
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.sync.R
import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers
import dagger.android.HasAndroidInjector

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsShared/NSClientFragment.kt
View file

@ -30,7 +30,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventNSClientNewLog
import app.aaps.core.interfaces.rx.events.EventNSClientRestart
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.utils.HtmlHelper
import app.aaps.database.entities.UserEntry

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt
View file

@ -32,8 +32,8 @@ import app.aaps.core.interfaces.sync.NsClient
import app.aaps.core.interfaces.sync.Sync
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.toJson
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.sync.R
import app.aaps.plugins.sync.nsShared.NSClientFragment
import app.aaps.plugins.sync.nsShared.events.EventNSClientStatus

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegate.kt
View file

@ -9,7 +9,7 @@ import app.aaps.core.interfaces.rx.events.EventChargingState
import app.aaps.core.interfaces.rx.events.EventNetworkChange
import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.sync.R
import app.aaps.plugins.sync.nsShared.events.EventConnectivityOptionChanged
import io.reactivex.rxjava3.disposables.CompositeDisposable

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/services/NSClientService.kt
View file

@ -24,8 +24,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T.Companion.mins
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
import app.aaps.core.utils.JsonHelper.safeGetString
import app.aaps.core.utils.JsonHelper.safeGetStringAllowNull

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt
View file

@ -47,7 +47,7 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.NSAndroidClientImpl
import app.aaps.core.nssdk.interfaces.NSAndroidClient
import app.aaps.core.nssdk.mapper.toNSDeviceStatus

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolFragment.kt
View file

@ -15,7 +15,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.sync.R
import app.aaps.plugins.sync.databinding.TidepoolFragmentBinding
import app.aaps.plugins.sync.tidepool.comm.TidepoolUploader

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolPlugin.kt
View file

@ -22,7 +22,7 @@ import app.aaps.core.interfaces.sync.Sync
import app.aaps.core.interfaces.sync.Tidepool
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.utils.HtmlHelper
import app.aaps.plugins.sync.R
import app.aaps.plugins.sync.nsShared.events.EventConnectivityOptionChanged

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripFragment.kt
View file

@ -20,7 +20,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.plugins.sync.R
import app.aaps.plugins.sync.databinding.XdripFragmentBinding

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripPlugin.kt
View file

@ -39,10 +39,10 @@ import app.aaps.core.interfaces.sync.XDripBroadcast
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.toStringShort
import app.aaps.core.main.iob.generateCOBString
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.utils.HtmlHelper
import app.aaps.plugins.sync.R

2
plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegateTest.kt
View file

@ -5,7 +5,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.events.EventChargingState
import app.aaps.core.interfaces.rx.events.EventNetworkChange
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.sync.R
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat

2
plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
View file

@ -5,7 +5,7 @@ import androidx.work.ListenableWorker.Result.Success
import androidx.work.testing.TestListenableWorkerBuilder
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.sync.NsClient
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.sync.nsclientV3.DataSyncSelectorV3
import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin
import app.aaps.shared.tests.TestBase

2
plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
View file

@ -15,7 +15,7 @@ import app.aaps.core.interfaces.source.NSClientSource
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.interfaces.NSAndroidClient
import app.aaps.core.nssdk.remotemodel.LastModified
import app.aaps.core.utils.receivers.DataWorkerStorage

2
pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
View file

@ -7,7 +7,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.core.interfaces.resources.ResourceHelper
@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventQueueChanged
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.support.DaggerFragment
import info.nightscout.pump.combo.data.ComboErrorUtil
import info.nightscout.pump.combo.data.ComboErrorUtil.DisplayType

4
pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
View file

@ -9,7 +9,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -34,8 +33,9 @@ import app.aaps.core.interfaces.userEntry.UserEntryMapper.Action
import app.aaps.core.interfaces.userEntry.UserEntryMapper.Sources
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import dagger.android.support.DaggerFragment
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import dagger.android.support.DaggerFragment
import info.nightscout.pump.dana.activities.DanaHistoryActivity
import info.nightscout.pump.dana.activities.DanaUserOptionsActivity
import info.nightscout.pump.dana.databinding.DanarFragmentBinding

2
pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt
View file

@ -8,7 +8,6 @@ import android.widget.AdapterView
import android.widget.ArrayAdapter
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin
@ -25,6 +24,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.pump.dana.R
import info.nightscout.pump.dana.comm.RecordTypes

2
pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
View file

@ -2,7 +2,6 @@ package info.nightscout.pump.dana.activities
import android.content.Context
import android.os.Bundle
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventInitializationChanged
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.pump.dana.DanaPump
import info.nightscout.pump.dana.R

4
pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
View file

@ -6,8 +6,6 @@ import android.content.Intent
import android.content.ServiceConnection
import android.os.IBinder
import app.aaps.annotations.OpenForTesting
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -30,6 +28,8 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
import info.nightscout.androidaps.danar.AbstractDanaRPlugin

4
pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
View file

@ -12,8 +12,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import app.aaps.annotations.OpenForTesting;
import app.aaps.core.main.constraints.ConstraintObject;
import app.aaps.core.main.utils.fabric.FabricPrivacy;
import app.aaps.core.interfaces.constraints.ConstraintsChecker;
import app.aaps.core.interfaces.logging.AAPSLogger;
import app.aaps.core.interfaces.logging.LTag;
@ -37,6 +35,8 @@ import app.aaps.core.interfaces.utils.DateUtil;
import app.aaps.core.interfaces.utils.DecimalFormatter;
import app.aaps.core.interfaces.utils.Round;
import app.aaps.core.interfaces.utils.T;
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy;
import app.aaps.core.main.constraints.ConstraintObject;
import dagger.android.HasAndroidInjector;
import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
import info.nightscout.androidaps.danar.AbstractDanaRPlugin;

4
pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
View file

@ -12,8 +12,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import app.aaps.annotations.OpenForTesting;
import app.aaps.core.main.constraints.ConstraintObject;
import app.aaps.core.main.utils.fabric.FabricPrivacy;
import app.aaps.core.interfaces.constraints.ConstraintsChecker;
import app.aaps.core.interfaces.logging.AAPSLogger;
import app.aaps.core.interfaces.logging.LTag;
@ -35,6 +33,8 @@ import app.aaps.core.interfaces.ui.UiInteraction;
import app.aaps.core.interfaces.utils.DateUtil;
import app.aaps.core.interfaces.utils.DecimalFormatter;
import app.aaps.core.interfaces.utils.Round;
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy;
import app.aaps.core.main.constraints.ConstraintObject;
import dagger.android.HasAndroidInjector;
import info.nightscout.androidaps.danar.services.DanaRExecutionService;
import info.nightscout.pump.dana.DanaPump;

4
pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
View file

@ -20,7 +20,6 @@ import java.util.UUID;
import javax.inject.Inject;
import app.aaps.core.main.utils.fabric.FabricPrivacy;
import app.aaps.core.interfaces.logging.AAPSLogger;
import app.aaps.core.interfaces.logging.LTag;
import app.aaps.core.interfaces.notifications.Notification;
@ -38,6 +37,8 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged;
import app.aaps.core.interfaces.sharedPreferences.SP;
import app.aaps.core.interfaces.ui.UiInteraction;
import app.aaps.core.interfaces.utils.DateUtil;
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy;
import app.aaps.core.ui.toast.ToastUtils;
import dagger.android.DaggerService;
import dagger.android.HasAndroidInjector;
import info.nightscout.androidaps.danar.R;
@ -55,7 +56,6 @@ import info.nightscout.androidaps.danar.comm.MsgHistoryRefill;
import info.nightscout.androidaps.danar.comm.MsgHistorySuspend;
import info.nightscout.androidaps.danar.comm.MsgPCCommStart;
import info.nightscout.androidaps.danar.comm.MsgPCCommStop;
import app.aaps.core.ui.toast.ToastUtils;
import info.nightscout.pump.dana.DanaPump;
import info.nightscout.pump.dana.comm.RecordTypes;
import io.reactivex.rxjava3.disposables.CompositeDisposable;

6
pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
View file

@ -7,8 +7,6 @@ import android.content.ServiceConnection
import android.os.IBinder
import android.text.format.DateFormat
import androidx.preference.Preference
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.constraints.Constraint
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.constraints.PluginConstraints
@ -45,8 +43,10 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.ui.toast.ToastUtils
import dagger.android.HasAndroidInjector
import info.nightscout.pump.dana.DanaFragment
import info.nightscout.pump.dana.DanaPump
import info.nightscout.pump.dana.comm.RecordTypes

2
pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt
View file

@ -7,7 +7,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.utils.hexStringToByteArray

2
pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt
View file

@ -9,10 +9,10 @@ import android.view.View
import android.view.ViewGroup
import android.view.Window
import android.view.WindowManager
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.support.DaggerDialogFragment
import info.nightscout.pump.danars.activities.PairingHelperActivity
import info.nightscout.pump.danars.databinding.DanarsPairingProgressDialogBinding

2
pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
View file

@ -6,7 +6,6 @@ import android.content.Intent
import android.os.Binder
import android.os.IBinder
import android.os.SystemClock
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.logging.AAPSLogger
@ -33,6 +32,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.DaggerService
import dagger.android.HasAndroidInjector
import info.nightscout.pump.dana.DanaPump

2
pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
View file

@ -8,7 +8,6 @@ import android.os.HandlerThread
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin
@ -27,6 +26,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.support.DaggerFragment
import info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity
import info.nightscout.pump.diaconn.activities.DiaconnG8UserOptionsActivity

6
pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
View file

@ -8,8 +8,6 @@ import android.os.IBinder
import android.text.format.DateFormat
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.constraints.Constraint
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.constraints.PluginConstraints
@ -48,8 +46,10 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.ui.toast.ToastUtils
import dagger.android.HasAndroidInjector
import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase
import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange
import info.nightscout.pump.diaconn.service.DiaconnG8Service

2
pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt
View file

@ -9,7 +9,6 @@ import android.widget.ArrayAdapter
import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.queue.Callback
@ -21,6 +20,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.common.RecordTypes

2
pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt
View file

@ -5,7 +5,6 @@ import android.os.Bundle
import android.view.View
import android.widget.AdapterView
import android.widget.ArrayAdapter
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin
@ -14,6 +13,7 @@ import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.toast.ToastUtils
import info.nightscout.pump.diaconn.DiaconnG8Pump

2
pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
View file

@ -6,7 +6,6 @@ import android.content.Intent
import android.os.Binder
import android.os.IBinder
import android.os.SystemClock
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -32,6 +31,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.DaggerService
import dagger.android.HasAndroidInjector
import info.nightscout.pump.diaconn.DiaconnG8Plugin

2
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.androidaps.plugins.pump.eopatch
import android.os.SystemClock
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.notifications.Notification
@ -32,6 +31,7 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.TimeChangeType
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmManager
import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager

2
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt
View file

@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.alarm
import android.content.Context
import android.content.Intent
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.notifications.Notification
@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus
import info.nightscout.androidaps.plugins.pump.eopatch.R
import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A005

4
pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
View file

@ -8,7 +8,6 @@ import android.os.HandlerThread
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin
@ -26,6 +25,8 @@ import app.aaps.core.interfaces.rx.events.EventRefreshButtonState
import app.aaps.core.interfaces.rx.events.EventTempBasalChange
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
@ -40,7 +41,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpSta
import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged
import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
import app.aaps.core.ui.dialogs.OKDialog
import info.nightscout.pump.common.defs.PumpDeviceState
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign

2
pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
View file

@ -34,7 +34,7 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.TimeChangeType
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.utils.DateTimeUtil
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange

6
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
View file

@ -11,8 +11,6 @@ import android.text.format.DateFormat
import androidx.preference.EditTextPreference
import androidx.preference.ListPreference
import androidx.preference.PreferenceFragmentCompat
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -46,10 +44,12 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.TimeChangeType
import dagger.android.HasAndroidInjector
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.validators.ValidatingEditTextPreference
import dagger.android.HasAndroidInjector
import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState
import info.nightscout.pump.medtrum.services.MedtrumService
import info.nightscout.pump.medtrum.ui.MedtrumOverviewFragment

2
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
View file

@ -6,7 +6,6 @@ import android.content.Intent
import android.os.Binder
import android.os.IBinder
import android.os.SystemClock
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -32,6 +31,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.DaggerService
import dagger.android.HasAndroidInjector
import info.nightscout.pump.medtrum.MedtrumPlugin

2
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
View file

@ -41,7 +41,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.TimeChangeType
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.utils.DateTimeUtil
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType

6
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
View file

@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui
import android.content.Context
import android.content.Intent
import android.os.Bundle
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.queue.CommandQueue
@ -12,6 +11,9 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventQueueChanged
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep
import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
@ -20,8 +22,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity
import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

6
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
View file

@ -8,7 +8,6 @@ import android.os.SystemClock
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.notifications.Notification
@ -25,6 +24,9 @@ import app.aaps.core.interfaces.rx.events.EventQueueChanged
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.UIRunnable
import app.aaps.core.ui.dialogs.OKDialog
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding
import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewPodInfoBinding
@ -41,8 +43,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodConstants
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
import app.aaps.core.ui.UIRunnable
import app.aaps.core.ui.dialogs.OKDialog
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.apache.commons.lang3.StringUtils

2
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action
import androidx.annotation.StringRes
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.notifications.Notification
@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventDismissNotification
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel

2
pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
View file

@ -67,7 +67,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter;
import app.aaps.core.interfaces.utils.Round;
import app.aaps.core.interfaces.utils.T;
import app.aaps.core.interfaces.utils.TimeChangeType;
import app.aaps.core.main.utils.fabric.FabricPrivacy;
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy;
import app.aaps.core.utils.DateTimeUtil;
import dagger.android.HasAndroidInjector;
import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;

6
pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
View file

@ -5,7 +5,6 @@ import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.HandlerThread
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.queue.Callback
@ -15,6 +14,9 @@ import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventQueueChanged
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
@ -33,8 +35,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE
import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog
import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.ErosPodActivationWizardActivity
import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

4
pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
View file

@ -8,7 +8,6 @@ import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.notifications.Notification
import app.aaps.core.interfaces.plugin.ActivePlugin
@ -24,6 +23,8 @@ import app.aaps.core.interfaces.rx.events.EventQueueChanged
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
@ -49,7 +50,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE
import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandGetPodStatus
import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil
import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil
import app.aaps.core.ui.dialogs.OKDialog
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.apache.commons.lang3.StringUtils

1
pump/pump-common/build.gradle
View file

@ -16,7 +16,6 @@ android {
dependencies {
implementation project(':core:interfaces')
implementation project(':core:main')
implementation project(':core:utils')
implementation('com.thoughtworks.xstream:xstream:1.4.20') {

Some files were not shown because too many files have changed in this diff Show more