Skip to content

Fix NullPointerException in onBackPressed() #6249

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

Merged
nicolas-raoul merged 1 commit into from
Mar 16, 2025
Merged

Fix NullPointerException in onBackPressed() #6249

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
35 changes: 20 additions & 15 deletions app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,35 +387,40 @@ after opening the app.
}

override fun onBackPressed() {
if (contributionsFragment != null && activeFragment == ActiveFragment.CONTRIBUTIONS) {
when (activeFragment) {
ActiveFragment.CONTRIBUTIONS -> {
// Means that contribution fragment is visible
if (!contributionsFragment!!.backButtonClicked()) { //If this one does not wan't to handle
if (contributionsFragment?.backButtonClicked() != true) { //If this one does not want to handle
// the back press, let the activity do so
super.onBackPressed()
}
}
} else if (nearbyParentFragment != null && activeFragment == ActiveFragment.NEARBY) {
ActiveFragment.NEARBY -> {
// Means that nearby fragment is visible
/* If function nearbyParentFragment.backButtonClick() returns false, it means that the bottomsheet is
not expanded. So if the back button is pressed, then go back to the Contributions tab */
if (!nearbyParentFragment!!.backButtonClicked()) {
supportFragmentManager.beginTransaction().remove(nearbyParentFragment!!)
.commit()
if (nearbyParentFragment?.backButtonClicked() != true) {
nearbyParentFragment?.let {
supportFragmentManager.beginTransaction().remove(it).commit()
}
setSelectedItemId(NavTab.CONTRIBUTIONS.code())
}
}
} else if (exploreFragment != null && activeFragment == ActiveFragment.EXPLORE) {
// Means that explore fragment is visible
if (!exploreFragment!!.onBackPressed()) {
if (applicationKvStore!!.getBoolean("login_skipped")) {
ActiveFragment.EXPLORE -> {
// Explore Fragment is visible
if (exploreFragment?.onBackPressed() != true) {
if (applicationKvStore?.getBoolean("login_skipped") == true) {
super.onBackPressed()
} else {
setSelectedItemId(NavTab.CONTRIBUTIONS.code())
}
}
}
} else if (bookmarkFragment != null && activeFragment == ActiveFragment.BOOKMARK) {
ActiveFragment.BOOKMARK -> {
// Means that bookmark fragment is visible
bookmarkFragment!!.onBackPressed()
} else {
bookmarkFragment?.onBackPressed()
}
else -> {
super.onBackPressed()
}
}
}

Expand Down