Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Show correct account/timeline when composing from notifications (#445) 

The previous code didn't clear the task stack or recreate `MainActivity`
when the active user was changed.

So if the user was logged in with account A and used "Compose" from a
notification sent to account B, the active account was switched to B but
the UI chrome wasn't. After exiting `ComposeActivity` they would be
looking at the timeline for account B but with a toolbar that showed
account A.

Fix this by clearing the task stack and explicitly recreating
`MainActivity` when forwarding intents to `ComposeActivity`.
This commit is contained in:
Nik Clayton 2024-02-15 13:10:00 +01:00 committed by GitHub
parent 2cf7c072ca
commit b8ac1f3944
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/pachli/MainActivity.kt
View File

@ -557,7 +557,11 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
} }
} }
startActivity(composeIntent) startActivity(composeIntent)
finish()
// Recreate the activity to ensure it is using the correct active account
// (which may have changed while processing the compose intent) and so
// the user returns to the timeline when they finish ComposeActivity.
recreate()
} }
private fun setupDrawer( private fun setupDrawer(

10
app/src/main/java/app/pachli/components/notifications/NotificationHelper.kt
View File

@ -431,9 +431,13 @@ private fun getStatusComposeIntent(
language = language, language = language,
kind = ComposeOptions.ComposeKind.NEW, kind = ComposeOptions.ComposeKind.NEW,
) )
val composeIntent = val composeIntent = MainActivityIntent.openCompose(
MainActivityIntent.openCompose(context, composeOptions, account.id, body.id, account.id.toInt()) context,
composeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) composeOptions,
account.id,
body.id,
account.id.toInt(),
)
return PendingIntent.getActivity( return PendingIntent.getActivity(
context.applicationContext, context.applicationContext,
notificationId, notificationId,

1
app/src/main/java/app/pachli/service/PachliTileService.kt
View File

@ -36,7 +36,6 @@ class PachliTileService : TileService() {
@SuppressLint("StartActivityAndCollapseDeprecated") @SuppressLint("StartActivityAndCollapseDeprecated")
override fun onClick() { override fun onClick() {
val intent = MainActivityIntent.openCompose(this, ComposeOptions()) val intent = MainActivityIntent.openCompose(this, ComposeOptions())
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
startActivityAndCollapse(getActivityPendingIntent(this, 0, intent)) startActivityAndCollapse(getActivityPendingIntent(this, 0, intent))
} else { } else {

3
core/navigation/src/main/kotlin/app/pachli/core/navigation/Navigation.kt
View File

@ -268,7 +268,7 @@ class MainActivityIntent(context: Context) : Intent() {
/** /**
* Switches the active account to the provided accountId and then stays on MainActivity * Switches the active account to the provided accountId and then stays on MainActivity
*/ */
fun switchAccount(context: Context, pachliAccountId: Long) = MainActivityIntent(context).apply { private fun switchAccount(context: Context, pachliAccountId: Long) = MainActivityIntent(context).apply {
putExtra(EXTRA_PACHLI_ACCOUNT_ID, pachliAccountId) putExtra(EXTRA_PACHLI_ACCOUNT_ID, pachliAccountId)
} }
@ -300,6 +300,7 @@ class MainActivityIntent(context: Context) : Intent() {
putExtra(EXTRA_COMPOSE_OPTIONS, options) putExtra(EXTRA_COMPOSE_OPTIONS, options)
putExtra(EXTRA_NOTIFICATION_TAG, notificationTag) putExtra(EXTRA_NOTIFICATION_TAG, notificationTag)
putExtra(EXTRA_NOTIFICATION_ID, notificationId) putExtra(EXTRA_NOTIFICATION_ID, notificationId)
flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
} }
/** /**