Skip to content

Fix: Prevent premature finish() from canceling async location removal (#6872) #6875

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
PatilParas05 wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −8
Open

Fix: Prevent premature finish() from canceling async location removal (#6872) #6875

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
23 changes: 15 additions & 8 deletions app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,16 +405,23 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
)
?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread())
?.subscribe { _ ->
Timber.d("Coordinates removed from the image")
}?.let { it1 ->
compositeDisposable.add(
it1
)
?.subscribe(
{ _ ->
Timber.d("Coordinates removed from the image")
// Finish AFTER removal is complete
setResult(RESULT_OK, Intent())
finish()
},
{ error ->
Timber.e(error, "Failed to remove coordinates")
// Handle error gracefully
setResult(RESULT_CANCELED, Intent())
finish()
}
)?.let { it1 ->
compositeDisposable.add(it1)
}
}
setResult(RESULT_OK, Intent())
finish()
}

/**
Expand Down