From ab58ae49003c3571d944550092e227c6e3df7b97 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Sun, 8 May 2022 23:37:48 -0400 Subject: [PATCH] Reset Fixes to 3.6 branch --- .../android/habitica/ui/activities/MainActivity.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 201b3bbaa..9f42bd813 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -287,9 +287,12 @@ open class MainActivity : BaseActivity(), SnackbarActivity { MainNavigationController.setup(navigationController) navigationController.addOnDestinationChangedListener { _, destination, arguments -> updateToolbarTitle(destination, arguments) } + if (launchScreen == "/party") { - if (viewModel.userViewModel.isUserInParty) { - MainNavigationController.navigate(R.id.partyFragment) + viewModel.user.observeOnce(this) { + if (viewModel.userViewModel.isUserInParty) { + MainNavigationController.navigate(R.id.partyFragment) + } } } launchScreen = null