From a501940909e489de13baf4f43357e19462f499b2 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 13 May 2022 14:27:12 -0400 Subject: [PATCH] Fix Payment to Help navigation. --- .../securesms/components/settings/app/AppSettingsActivity.kt | 2 ++ app/src/main/res/navigation/app_settings.xml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt index 426b87c4b..308956935 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt @@ -65,6 +65,8 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent { } } + intent = intent.putExtra(START_LOCATION, StartLocation.HOME) + if (startingAction == null && savedInstanceState != null) { wasConfigurationUpdated = savedInstanceState.getBoolean(STATE_WAS_CONFIGURATION_UPDATED) } diff --git a/app/src/main/res/navigation/app_settings.xml b/app/src/main/res/navigation/app_settings.xml index 8c81daf3c..6d3eb39bc 100644 --- a/app/src/main/res/navigation/app_settings.xml +++ b/app/src/main/res/navigation/app_settings.xml @@ -461,7 +461,9 @@ app:enterAnim="@anim/fragment_open_enter" app:exitAnim="@anim/fragment_open_exit" app:popEnterAnim="@anim/fragment_close_enter" - app:popExitAnim="@anim/fragment_close_exit" /> + app:popExitAnim="@anim/fragment_close_exit" + app:popUpTo="@id/app_settings" + app:popUpToInclusive="true" />