Skip to content

Fix Double location off messages in explore/map #6598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Salehcodes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Double location off messages in explore/map #6598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
override fun onPageScrollStateChanged(state: Int) = Unit
override fun onPageSelected(position: Int) {
binding!!.viewPager.canScroll = position != 2
// based on which tab we are now recreate the options menu
activity?.invalidateOptionsMenu()

if (position == 2) {
mapRootFragment?.requestLocationIfNeeded()
}
Expand Down Expand Up @@ -178,19 +181,6 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
if (binding!!.viewPager.currentItem == 2) {
others.setVisible(true)
}

// if on Map tab, show all menu options, else only show search
binding!!.viewPager.addOnPageChangeListener(object : OnPageChangeListener {
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
Copy link
Collaborator

@RitikaPahwa4444 RitikaPahwa4444 Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these functions no longer needed? Is this change really required to fix the issue?

Copy link
Author

@Salehcodes Salehcodes Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These functions are still needed, but only one instance of the OnPageChangeListener is required.
Before this change, the same ViewPager.OnPageChangeListener logic was being registered in two different lifecycle methods:
once in onCreateView()
and again in onCreateOptionsMenu()
Since onCreateOptionsMenu() can be invoked multiple times during the fragment lifecycle, this resulted in multiple listeners being added over time.
Each listener triggers:
mapRootFragment?.requestLocationIfNeeded()
when the Map tab is selected, so switching to the Map tab caused requestLocationIfNeeded() to be called multiple times, which led to the duplicate location-off dialogs.
The listener in onCreateView() already handles:
detecting when the Map tab is selected
triggering requestLocationIfNeeded() exactly once per tab selection
Therefore, the additional listener in onCreateOptionsMenu() was redundant and was the source of the repeated calls. Removing it ensures the logic runs only once, while preserving all existing behavior.

override fun onPageScrollStateChanged(state: Int) = Unit
override fun onPageSelected(position: Int) {
binding!!.viewPager.canScroll = position != 2
others.setVisible(position == 2)
if (position == 2) {
mapRootFragment?.requestLocationIfNeeded()
}
}
})
} else {
inflater.inflate(R.menu.menu_search, menu)
}
Expand Down