TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-15 02:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(widget): Broaden work-runtime keep rule and add widget error handling

Browse Source 
R8 full mode strips no-arg constructors from work-runtime classes accessed via

Class.newInstance() reflection (WorkDatabase_Impl, OverwritingInputMerger, etc).

Replace narrow WorkDatabase_Impl keep rule with broad androidx.work.** rule.

Also add @Keep to Hilt WidgetEntryPoint and wrap provideGlance setup in

try-catch so the widget shows an error message instead of spinning forever.
This commit is contained in:
darken
2026-03-06 18:47:46 +00:00
committed by Matthias Urhahn
parent d37c8aa3a5
commit da6a6f6ff2
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/main/ui/widget/BatteryGlanceWidget.kt
+31 -8
View File
@@ -10,6 +10,7 @@ import androidx.glance.appwidget.GlanceAppWidget
import androidx.glance.appwidget.GlanceAppWidgetManager
import androidx.glance.appwidget.SizeMode
import androidx.glance.appwidget.provideContent
import androidx.annotation.Keep
import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
import dagger.hilt.android.EntryPointAccessors
@@ -22,12 +23,14 @@ import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.upgrade.UpgradeRepo
import eu.darken.capod.common.upgrade.isPro
import eu.darken.capod.monitor.core.PodMonitor
import eu.darken.capod.pods.core.PodDevice
import eu.darken.capod.profiles.core.DeviceProfilesRepo
class BatteryGlanceWidget : GlanceAppWidget() {
override val sizeMode = SizeMode.Exact
@Keep
@EntryPoint
@InstallIn(SingletonComponent::class)
interface WidgetEntryPoint {
@@ -38,15 +41,35 @@ class BatteryGlanceWidget : GlanceAppWidget() {
}
override suspend fun provideGlance(context: Context, id: GlanceId) {
val ep = EntryPointAccessors.fromApplication(context, WidgetEntryPoint::class.java)
val ep: WidgetEntryPoint
val appWidgetId: Int
val initialIsPro: Boolean
val initialProfileId: String?
val cachedDevice: PodDevice?
val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(id)
log(TAG, VERBOSE) { "provideGlance(appWidgetId=$appWidgetId)" }
// Pre-load initial values (runs once per session, suspend OK)
val initialIsPro = ep.upgradeRepo().isPro()
val initialProfileId = ep.widgetSettings().getWidgetProfile(appWidgetId)
val cachedDevice = initialProfileId?.let { ep.podMonitor().getDeviceForProfile(it) }
try {
ep = EntryPointAccessors.fromApplication(context, WidgetEntryPoint::class.java)
appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(id)
log(TAG, VERBOSE) { "provideGlance(appWidgetId=$appWidgetId)" }
initialIsPro = ep.upgradeRepo().isPro()
initialProfileId = ep.widgetSettings().getWidgetProfile(appWidgetId)
cachedDevice = initialProfileId?.let { ep.podMonitor().getDeviceForProfile(it) }
} catch (e: Exception) {
log(TAG, ERROR) { "provideGlance setup failed: ${e.asLog()}" }
provideContent {
GlanceWidgetContent(
state = WidgetRenderState.Message(
theme = WidgetTheme.DEFAULT,
resolvedBgColor = WidgetRenderStateMapper.resolvedBgColor(context, WidgetTheme.DEFAULT),
resolvedTextColor = WidgetRenderStateMapper.resolvedTextColor(context, WidgetTheme.DEFAULT),
resolvedIconColor = WidgetRenderStateMapper.resolvedIconColor(context, WidgetTheme.DEFAULT),
primaryText = context.getString(eu.darken.capod.R.string.widget_error_loading_label),
),
context = context,
)
}
return
}
provideContent {
// Composable reads — must be outside try-catch