Adds crash logs to better understand how stopping a pending session happens

kmm_hh
Laurent 5 years ago
parent 1484ed2f74
commit 772b304877
  1. 14
      app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt
  2. 13
      app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt

@ -5,12 +5,10 @@ import androidx.work.Data
import androidx.work.OneTimeWorkRequestBuilder import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager import androidx.work.WorkManager
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.TournamentType import net.pokeranalytics.android.model.TournamentType
import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.util.NotificationSchedule import net.pokeranalytics.android.util.NotificationSchedule
import net.pokeranalytics.android.util.extensions.toCurrency import net.pokeranalytics.android.util.extensions.toCurrency
import timber.log.Timber
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -37,17 +35,17 @@ enum class SessionState {
fun Session.getState(): SessionState { fun Session.getState(): SessionState {
val start = this.startDate val start = this.startDate
if (start == null) { return if (start == null) {
return SessionState.PENDING SessionState.PENDING
} else { } else {
if (start > Date()) { if (start > Date()) {
return SessionState.PLANNED SessionState.PLANNED
} else if (this.endDate != null) { } else if (this.endDate != null) {
return SessionState.FINISHED SessionState.FINISHED
} else if (this.pauseDate != null) { } else if (this.pauseDate != null) {
return SessionState.PAUSED SessionState.PAUSED
} else { } else {
return SessionState.STARTED SessionState.STARTED
} }
} }
} }

@ -72,9 +72,6 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr
private var _binding: FragmentSessionBinding? = null private var _binding: FragmentSessionBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
// private val coroutineContext: CoroutineContext
// get() = Dispatchers.Main
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
@ -282,6 +279,9 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr
*/ */
private fun updateSessionUI(firstDisplay: Boolean = false) { private fun updateSessionUI(firstDisplay: Boolean = false) {
val state = currentSession.getState()
CrashLogging.log("Update session UI: $state")
this.updateRowRepresentation() this.updateRowRepresentation()
handler.removeCallbacksAndMessages(null) handler.removeCallbacksAndMessages(null)
@ -289,7 +289,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr
val animationDuration = if (firstDisplay) 0L else 300L val animationDuration = if (firstDisplay) 0L else 300L
val floatingActionButton = binding.floatingActionButton val floatingActionButton = binding.floatingActionButton
when (currentSession.getState()) { when (state) {
SessionState.PENDING, SessionState.PLANNED -> { SessionState.PENDING, SessionState.PLANNED -> {
sessionMenu?.findItem(R.id.restart)?.isVisible = false sessionMenu?.findItem(R.id.restart)?.isVisible = false
floatingActionButton.setImageResource(R.drawable.ic_outline_play) floatingActionButton.setImageResource(R.drawable.ic_outline_play)
@ -334,7 +334,10 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr
*/ */
private fun updateMenuUI() { private fun updateMenuUI() {
when (currentSession.getState()) { val state = currentSession.getState()
CrashLogging.log("Update menu UI: $state")
when (state) {
SessionState.PENDING, SessionState.PLANNED -> { SessionState.PENDING, SessionState.PLANNED -> {
sessionMenu?.findItem(R.id.restart)?.isVisible = false sessionMenu?.findItem(R.id.restart)?.isVisible = false
sessionMenu?.findItem(R.id.stop)?.isVisible = false sessionMenu?.findItem(R.id.stop)?.isVisible = false

Loading…
Cancel
Save