sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-31 19:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #1614

Browse source
This commit is contained in:
Phillip Thelen 2021-09-22 14:20:32 +02:00
parent 326d5250e9
commit 78d03edbd2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -549,7 +549,7 @@ class TaskFormActivity : BaseActivity() {
compositeSubscription.add(
challengeRepository.leaveChallenge(it, "keep-all")
.flatMap { taskRepository.deleteTask(task?.id ?: "") }
.flatMap { userRepository.retrieveUser(true) }
.flatMap { userRepository.retrieveUser(true, true) }
.subscribe(
{
finish()
@ -563,7 +563,7 @@ class TaskFormActivity : BaseActivity() {
challenge?.let {
compositeSubscription.add(
challengeRepository.leaveChallenge(it, "remove-all")
.flatMap { userRepository.retrieveUser(true) }
.flatMap { userRepository.retrieveUser(true, true) }
.subscribe(
{
finish()
@ -594,7 +594,9 @@ class TaskFormActivity : BaseActivity() {
dialog.setTitle(R.string.broken_challenge)
dialog.setMessage(this.getString(R.string.broken_challenge_description, taskCount))
dialog.addButton(this.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
taskRepository.unlinkAllTasks(task.challengeID, "keep-all").subscribe(
taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
.flatMap { userRepository.retrieveUser(true, true) }
.subscribe(
{
finish()
},
@ -602,7 +604,9 @@ class TaskFormActivity : BaseActivity() {
)
}
dialog.addButton(this.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
taskRepository.unlinkAllTasks(task.challengeID, "remove-all").subscribe(
taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
.flatMap { userRepository.retrieveUser(true, true) }
.subscribe(
{
finish()
},