diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java index 500618a..721085d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java @@ -38,6 +38,7 @@ import org.telegram.messenger.AndroidUtilities; import org.telegram.messenger.R; import org.telegram.ui.Components.LayoutHelper; +import org.telegram.ui.LaunchActivity; import java.util.ArrayList; @@ -525,6 +526,7 @@ } public void onBackPressed() { + if (startedTracking || checkTransitionAnimation() || fragmentsStack.isEmpty()) { return; } @@ -538,6 +540,9 @@ closeLastFragment(false); } } + if (getContext() instanceof LaunchActivity) { + ((LaunchActivity) getContext()).setMenu(); + } } public void onLowMemory() { @@ -672,6 +677,9 @@ } public boolean presentFragment(final BaseFragment fragment, final boolean removeLast, boolean forceWithoutAnimation, boolean check) { + if (getContext() instanceof LaunchActivity) { + ((LaunchActivity) getContext()).setMenu(fragment); + } if (checkTransitionAnimation() || delegate != null && check && !delegate.needPresentFragment(fragment, removeLast, forceWithoutAnimation, this) || !fragment.onFragmentCreate()) { return false; }