sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-19 12:18:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent RYA dialog from appearing twice in a row. Fixes #1035

Browse source
This commit is contained in:
Phillip Thelen 2018-08-31 12:28:17 +02:00
parent 6844177968
commit f9a916ca46
1 changed files with 11 additions and 1 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/views/yesterdailies/YesterdailyDialog.kt
View file

@ -38,7 +38,9 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
context.getString(R.string.start_day)
) { _, _ -> }
this.setOnDismissListener { runCron() }
this.setOnDismissListener {
lastCronRun = Date()
runCron() }
//Can't use by bindView() because the view doesn't seem to be available through that yet
val listView = view?.findViewById(R.id.yesterdailies_list) as? LinearLayout
@ -57,6 +59,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
completedTasks.add(task)
}
}
lastCronRun = Date()
userRepository.runCron(completedTasks)
isDisplaying = false
}
@ -129,6 +132,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
companion object {
internal var isDisplaying = false
internal var lastCronRun: Date? = null
fun showDialogIfNeeded(activity: Activity, userId: String?, userRepository: UserRepository?, taskRepository: TaskRepository) {
if (userRepository != null && userId != null) {
@ -150,9 +154,15 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
if (isDisplaying) {
return@Consumer
}
if (Math.abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
return@Consumer
}
if (tasks.isNotEmpty()) {
showDialog(activity, userRepository, taskRepository, tasks)
} else {
lastCronRun = Date()
userRepository.runCron()
}
}, RxErrorHandler.handleEmptyError())