Skip to content

Commit c5dfdfa

Browse files
committed
Fix bug commons-app#4950 back arrow still present on top-level activity
1 parent 6ad7093 commit c5dfdfa

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ public Integer getContributionStateAt(int position) {
661661
}
662662

663663
public boolean backButtonClicked() {
664-
if (null != mediaDetailPagerFragment && mediaDetailPagerFragment.isVisible()) {
664+
if (mediaDetailPagerFragment != null && mediaDetailPagerFragment.isVisible()) {
665665
if (store.getBoolean("displayNearbyCardView", true) && !isUserProfile) {
666666
if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
667667
nearbyNotificationCardView.setVisibility(View.VISIBLE);
@@ -678,9 +678,10 @@ public boolean backButtonClicked() {
678678
}else {
679679
fetchCampaigns();
680680
}
681-
if(getActivity() instanceof MainActivity) {
681+
if (getActivity() instanceof MainActivity) {
682682
// Fragment is associated with MainActivity
683-
((MainActivity)getActivity()).showTabs();
683+
((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
684+
((MainActivity) getActivity()).showTabs();
684685
}
685686
return true;
686687
}

0 commit comments

Comments
 (0)