diff --git a/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt index 77d7ae77..8ef1a735 100644 --- a/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt @@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onCompletion -import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.scan import kotlinx.coroutines.flow.shareIn @@ -54,7 +53,6 @@ fun Flow.takeUntilAfter(predicate: suspend (T) -> Boolean) = transformWhi fun Flow.setupCommonEventHandlers(tag: String, identifier: () -> String) = this .onStart { log(tag, VERBOSE) { "${identifier()}.onStart()" } } - .onEach { log(tag, VERBOSE) { "${identifier()}.onEach(): $it" } } .onCompletion { log(tag, VERBOSE) { "${identifier()}.onCompletion()" } } .catch { if (it.hasCause(CancellationException::class)) { diff --git a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetManager.kt b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetManager.kt index 1cf51e35..1e2050f0 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetManager.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetManager.kt @@ -3,9 +3,6 @@ package eu.darken.capod.main.ui.widget import android.content.Context import androidx.glance.appwidget.updateAll import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.capod.common.debug.logging.log -import eu.darken.capod.common.debug.logging.logTag import javax.inject.Inject import javax.inject.Singleton @@ -16,12 +13,7 @@ class WidgetManager @Inject constructor( ) { suspend fun refreshWidgets() { - log(TAG, VERBOSE) { "refreshWidgets()" } BatteryGlanceWidget().updateAll(context) AncGlanceWidget().updateAll(context) } - - companion object { - val TAG = logTag("Widget", "Manager") - } } diff --git a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetSettings.kt b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetSettings.kt index b40054aa..f8b0f550 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetSettings.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetSettings.kt @@ -36,12 +36,8 @@ class WidgetSettings @Inject constructor( } } - fun getWidgetProfile(widgetId: Int): ProfileId? { - val profileId = runBlocking { - dataStore.data.first()[stringPreferencesKey(getWidgetProfileKey(widgetId))] - } - log(TAG, VERBOSE) { "getWidgetProfile(widgetId=$widgetId) = $profileId" } - return profileId + fun getWidgetProfile(widgetId: Int): ProfileId? = runBlocking { + dataStore.data.first()[stringPreferencesKey(getWidgetProfileKey(widgetId))] } fun removeWidget(widgetId: Int) {