sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix potential crashes

Browse source
This commit is contained in:
Phillip Thelen 2019-09-09 11:55:10 +02:00
parent 5445d54c43
commit b67d6c3edf
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
View file

@ -209,7 +209,11 @@ class ChallengeFormActivity : BaseActivity() {
val bundle = intent.extras
challengeTasks = ChallengeTasksRecyclerViewAdapter(null, 0, this, "", null, false, true)
compositeSubscription.add(challengeTasks.taskOpenEvents.subscribe { openNewTaskActivity(it.type, it) })
compositeSubscription.add(challengeTasks.taskOpenEvents.subscribe {
if (it.isValid) {
openNewTaskActivity(it.type, it)
}
})
locationAdapter = GroupArrayAdapter(this)
if (bundle != null) {

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.ui.views.dialogs
import android.app.Activity
import android.content.Context
import android.view.LayoutInflater
import android.view.View
@ -215,7 +216,9 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
dialogQueue.removeAt(0)
}
if (dialogQueue.size > 0) {
dialogQueue[0].show()
if ((dialogQueue[0].context as? Activity)?.isFinishing == false) {
dialogQueue[0].show()
}
}
}