Set widget ID in todo widget configure result to avoid crash (#7366)

Author: jpelgrom

app/src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt

@@ -74,6 +74,12 @@ class TodoWidgetConfigureActivity : BaseActivity() {
         }
     }
 
+    private val widgetId: Int
+        get() = intent.extras?.getInt(
+            AppWidgetManager.EXTRA_APPWIDGET_ID,
+            AppWidgetManager.INVALID_APPWIDGET_ID,
+        ) ?: AppWidgetManager.INVALID_APPWIDGET_ID
+
     private val viewModel: TodoWidgetConfigureViewModel by viewModels(
         extrasProducer = {
             defaultViewModelCreationExtras.withCreationCallback<TodoWidgetConfigureViewModel.Factory> { factory ->
@@ -95,10 +101,6 @@ class TodoWidgetConfigureActivity : BaseActivity() {
         // Set the result to CANCELED.  This will cause the widget host to cancel
         // out of the widget placement if the user presses the back button.
         setResult(RESULT_CANCELED)
-        val widgetId = intent.extras?.getInt(
-            AppWidgetManager.EXTRA_APPWIDGET_ID,
-            AppWidgetManager.INVALID_APPWIDGET_ID,
-        ) ?: AppWidgetManager.INVALID_APPWIDGET_ID
 
         viewModel.onSetup(widgetId, supportedTextColors)
 
@@ -141,7 +143,10 @@ class TodoWidgetConfigureActivity : BaseActivity() {
     private suspend fun onUpdateWidget() {
         try {
             viewModel.updateWidgetConfiguration()
-            setResult(RESULT_OK)
+            setResult(
+                RESULT_OK,
+                Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId),
+            )
             viewModel.updateWidget(this@TodoWidgetConfigureActivity)
             finish()
         } catch (_: Exception) {