sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-15 10:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #1685

Browse source
This commit is contained in:
Phillip Thelen 2022-01-12 15:49:16 +01:00
parent 2429d1fdf8
commit bfe0d3da71
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
View file

@ -22,6 +22,7 @@ import com.habitrpg.android.habitica.models.tasks.TaskType
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.core.Observable
import java.lang.ref.WeakReference
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.math.abs import kotlin.math.abs
@ -57,7 +58,12 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
override fun onAttachedToWindow() { override fun onAttachedToWindow() {
super.onAttachedToWindow() super.onAttachedToWindow()
isDisplaying = true displayedDialog = WeakReference(this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
displayedDialog = null
} }
private fun runCron() { private fun runCron() {
@ -69,7 +75,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
} }
lastCronRun = Date() lastCronRun = Date()
userRepository.runCron(completedTasks) userRepository.runCron(completedTasks)
isDisplaying = false displayedDialog = null
} }
private fun createTaskViews(inflater: LayoutInflater) { private fun createTaskViews(inflater: LayoutInflater) {
@ -174,7 +180,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
companion object { companion object {
internal var isDisplaying = false private var displayedDialog: WeakReference<YesterdailyDialog>? = null
internal var lastCronRun: Date? = null internal var lastCronRun: Date? = null
fun showDialogIfNeeded(activity: Activity, userId: String?, userRepository: UserRepository?, taskRepository: TaskRepository) { fun showDialogIfNeeded(activity: Activity, userId: String?, userRepository: UserRepository?, taskRepository: TaskRepository) {
@ -197,7 +203,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
.retry(1) .retry(1)
.throttleFirst(2, TimeUnit.SECONDS) .throttleFirst(2, TimeUnit.SECONDS)
.filter { .filter {
if (isDisplaying) { if (displayedDialog?.get()?.isShowing == true) {
return@filter false return@filter false
} }
@ -224,8 +230,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
AmplitudeManager.sendEvent("show cron", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData) AmplitudeManager.sendEvent("show cron", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
if (tasks.isNotEmpty()) { if (tasks.isNotEmpty()) {
isDisplaying = true displayedDialog = WeakReference(showDialog(activity, userRepository, taskRepository, tasks))
showDialog(activity, userRepository, taskRepository, tasks)
} else { } else {
lastCronRun = Date() lastCronRun = Date()
userRepository.runCron() userRepository.runCron()
@ -236,13 +241,14 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
} }
} }
private fun showDialog(activity: Activity, userRepository: UserRepository, taskRepository: TaskRepository, tasks: List<Task>) { private fun showDialog(activity: Activity, userRepository: UserRepository, taskRepository: TaskRepository, tasks: List<Task>): YesterdailyDialog {
val dialog = YesterdailyDialog(activity, userRepository, taskRepository, tasks) val dialog = YesterdailyDialog(activity, userRepository, taskRepository, tasks)
dialog.setCancelable(false) dialog.setCancelable(false)
dialog.setCanceledOnTouchOutside(false) dialog.setCanceledOnTouchOutside(false)
if (!activity.isFinishing) { if (!activity.isFinishing) {
dialog.enqueue() dialog.enqueue()
} }
return dialog
} }
} }
} }