Skip to content

Widget broken: Couldn't add widget #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d4rken merged 2 commits into from
Nov 11, 2025
Merged

Widget broken: Couldn't add widget #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7a18e7
fix: Prevent memory leak in WidgetConfigurationActivity
d4rken Nov 9, 2025
6a9026a
fix: Make widget clicks unique
d4rken Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package eu.darken.capod.main.ui.widget

import android.appwidget.AppWidgetManager
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.core.view.isVisible
import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.qualifiers.ApplicationContext
import eu.darken.capod.R
import eu.darken.capod.common.EdgeToEdgeHelper
import eu.darken.capod.common.debug.logging.log
Expand All @@ -24,6 +26,7 @@ class WidgetConfigurationActivity : Activity2() {

@Inject lateinit var profileAdapter: WidgetProfileSelectionAdapter
@Inject lateinit var upgradeRepo: UpgradeRepo
@ApplicationContext @Inject lateinit var appContext: Context

private var widgetId: Int = AppWidgetManager.INVALID_APPWIDGET_ID

Expand Down Expand Up @@ -101,10 +104,10 @@ class WidgetConfigurationActivity : Activity2() {
val resultValue = Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
setResult(RESULT_OK, resultValue)

val appWidgetManager = AppWidgetManager.getInstance(this@WidgetConfigurationActivity)
val appWidgetManager = AppWidgetManager.getInstance(appContext)

WidgetProvider.updateWidget(
context = this@WidgetConfigurationActivity,
context = appContext,
appWidgetManager = appWidgetManager,
widgetId = widgetId
)
Expand Down
31 changes: 18 additions & 13 deletions app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class WidgetProvider : AppWidgetProvider() {
val device: PodDevice? = profileId?.let { podMonitor.getDeviceForProfile(it) }

val layout = when {
!upgradeRepo.isPro() -> createUpgradeRequiredLayout(context)
!upgradeRepo.isPro() -> createUpgradeRequiredLayout(context, widgetId)
device is DualPodDevice -> {
val minWidth = widgetManager.getAppWidgetOptions(widgetId)
.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
Expand All @@ -157,23 +157,24 @@ class WidgetProvider : AppWidgetProvider() {
else -> R.layout.widget_pod_dual_wide_layout
}

createDualPodLayout(context, device, layout)
createDualPodLayout(context, device, layout, widgetId)
}

device is SinglePodDevice -> createSinglePodLayout(context, device)
device is PodDevice -> createUnknownPodLayout(context, device)
else -> createNoDeviceLayout(context, profileId != null)
device is SinglePodDevice -> createSinglePodLayout(context, device, widgetId)
device is PodDevice -> createUnknownPodLayout(context, device, widgetId)
else -> createNoDeviceLayout(context, profileId != null, widgetId)
}
widgetManager.updateAppWidget(widgetId, layout)
}

private suspend fun createUpgradeRequiredLayout(
context: Context
context: Context,
widgetId: Int
) = RemoteViews(context.packageName, R.layout.widget_message_layout).apply {
log(TAG, VERBOSE) { "createUpgradeRequiredLayout(context=$context)" }
val pendingIntent: PendingIntent = PendingIntent.getActivity(
context,
0,
widgetId,
Intent(context, MainActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
Expand All @@ -188,11 +189,12 @@ class WidgetProvider : AppWidgetProvider() {
private fun createUnknownPodLayout(
context: Context,
podDevice: PodDevice,
widgetId: Int
): RemoteViews = RemoteViews(context.packageName, R.layout.widget_message_layout).apply {
log(TAG, VERBOSE) { "createUnknownPodLayout(context=$context, podDevice=$podDevice)" }
val pendingIntent: PendingIntent = PendingIntent.getActivity(
context,
0,
widgetId,
Intent(context, MainActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
Expand All @@ -204,12 +206,13 @@ class WidgetProvider : AppWidgetProvider() {

private fun createNoDeviceLayout(
context: Context,
hasConfiguredProfile: Boolean = false
hasConfiguredProfile: Boolean = false,
widgetId: Int
): RemoteViews = RemoteViews(context.packageName, R.layout.widget_message_layout).apply {
log(TAG, VERBOSE) { "createNoDeviceLayout(context=$context, hasConfiguredProfile=$hasConfiguredProfile)" }
val pendingIntent: PendingIntent = PendingIntent.getActivity(
context,
0,
widgetId,
Intent(context, MainActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
Expand All @@ -227,12 +230,13 @@ class WidgetProvider : AppWidgetProvider() {
private fun createDualPodLayout(
context: Context,
podDevice: DualPodDevice,
@LayoutRes layout: Int
@LayoutRes layout: Int,
widgetId: Int
): RemoteViews = RemoteViews(context.packageName, layout).apply {
log(TAG, VERBOSE) { "createSinglePodLayout(context=$context, podDevice=$podDevice), layout=${layout}" }
val pendingIntent: PendingIntent = PendingIntent.getActivity(
context,
0,
widgetId,
Intent(context, MainActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
Expand Down Expand Up @@ -277,11 +281,12 @@ class WidgetProvider : AppWidgetProvider() {
private fun createSinglePodLayout(
context: Context,
podDevice: SinglePodDevice,
widgetId: Int
): RemoteViews = RemoteViews(context.packageName, R.layout.widget_pod_single_layout).apply {
log(TAG, VERBOSE) { "createSinglePodLayout(context=$context, podDevice=$podDevice)" }
val pendingIntent: PendingIntent = PendingIntent.getActivity(
context,
0,
widgetId,
Intent(context, MainActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
Expand Down