lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crash after tapping "Configure widget" in Settings (#1242)

Browse Source 
* Fix crash after tapping "Configure widget" in Settings > Home screen > Clock

Closes #1221

* Fix another crash

---------

Co-authored-by: MM20 <15646950+MM2-0@users.noreply.github.com>
This commit is contained in:
Thunder 2025-02-08 13:49:49 +02:00 committed by GitHub
parent 3f187af1d2
commit a371213d4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt
View File

@ -478,9 +478,6 @@ fun ColumnScope.ConfigureAppWidget(
.setPendingIntentBackgroundActivityStartMode( .setPendingIntentBackgroundActivityStartMode(
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
) )
.setPendingIntentCreatorBackgroundActivityStartMode(
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
)
.toBundle() .toBundle()
} }
) )

20
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/WatchFaceSelector.kt
View File

@ -4,6 +4,7 @@ import android.app.Activity
import android.app.ActivityOptions import android.app.ActivityOptions
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.content.Context import android.content.Context
import android.content.ContextWrapper
import android.os.Build import android.os.Build
import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.animateContentSize import androidx.compose.animation.animateContentSize
@ -210,7 +211,7 @@ fun WatchFaceSelector(
}, },
onClick = { onClick = {
appWidgetHost.startAppWidgetConfigureActivityForResult( appWidgetHost.startAppWidgetConfigureActivityForResult(
context as Activity, getActivityFromContext(context) ?: return@DropdownMenuItem,
selected.widgetId ?: return@DropdownMenuItem, selected.widgetId ?: return@DropdownMenuItem,
0, 0,
0, 0,
@ -221,9 +222,6 @@ fun WatchFaceSelector(
.setPendingIntentBackgroundActivityStartMode( .setPendingIntentBackgroundActivityStartMode(
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
) )
.setPendingIntentCreatorBackgroundActivityStartMode(
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
)
.toBundle() .toBundle()
} }
) )
@ -588,4 +586,18 @@ private fun ResizeCustomWidget(
} }
} }
} }
}
private fun getActivityFromContext(context: Context): Activity? {
var activity = context
while (activity is ContextWrapper) {
if (activity is Activity) {
return activity
}
activity = activity.baseContext
}
return null
} }