From 9880d7ea7e5e8ad2057a38e2eaf3461d61ca73eb Mon Sep 17 00:00:00 2001 From: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Date: Mon, 2 May 2022 11:12:08 +0530 Subject: [PATCH] Fix bug #4950 back arrow still present on top-level activity (#4952) --- .../nrw/commons/contributions/ContributionsFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index 25d6e7d33..45ae66e4a 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -662,7 +662,7 @@ public class ContributionsFragment } public boolean backButtonClicked() { - if (null != mediaDetailPagerFragment && mediaDetailPagerFragment.isVisible()) { + if (mediaDetailPagerFragment != null && mediaDetailPagerFragment.isVisible()) { if (store.getBoolean("displayNearbyCardView", true) && !isUserProfile) { if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) { nearbyNotificationCardView.setVisibility(View.VISIBLE); @@ -679,9 +679,10 @@ public class ContributionsFragment }else { fetchCampaigns(); } - if(getActivity() instanceof MainActivity) { + if (getActivity() instanceof MainActivity) { // Fragment is associated with MainActivity - ((MainActivity)getActivity()).showTabs(); + ((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false); + ((MainActivity) getActivity()).showTabs(); } return true; }