Improve logs

hh
Laurent 6 years ago
parent ab1b7a1435
commit f0ebd16462
  1. 6
      app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt
  2. 12
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@ -14,7 +14,7 @@ enum class SessionState {
PAUSED, PAUSED,
FINISHED; FINISHED;
var hasStarted: Boolean = false val hasStarted: Boolean
get() { get() {
return when (this) { return when (this) {
STARTED, PAUSED, FINISHED -> true STARTED, PAUSED, FINISHED -> true
@ -50,7 +50,7 @@ fun Session.getState(): SessionState {
*/ */
fun Session.getFormattedGameType(context: Context): String { fun Session.getFormattedGameType(context: Context): String {
var parameters = mutableListOf<String>() val parameters = mutableListOf<String>()
if (isTournament()) { if (isTournament()) {
tournamentEntryFee?.let { tournamentEntryFee?.let {
@ -113,7 +113,7 @@ fun MutableList<TimeInterval>.update(timeInterval: TimeInterval): MutableList<Ti
} }
if (overlapped.size == 0) { // add if (overlapped.isEmpty()) { // add
this.add(timeInterval) this.add(timeInterval)
} else { // update } else { // update

@ -512,7 +512,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
*/ */
fun startOrContinue() { fun startOrContinue() {
realm.executeTransaction { realm.executeTransaction {
when (getState()) { when (val state = getState()) {
SessionState.PENDING, SessionState.PLANNED -> { SessionState.PENDING, SessionState.PLANNED -> {
this.startDate = Date() this.startDate = Date()
this.defineDefaultTournamentBuyinIfNecessary() this.defineDefaultTournamentBuyinIfNecessary()
@ -527,7 +527,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
this.pauseDate = null this.pauseDate = null
} }
else -> { else -> {
throw PAIllegalStateException("unmanaged session state") throw PAIllegalStateException("unmanaged session state: $state")
} }
} }
} }
@ -544,11 +544,11 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
*/ */
fun pause() { fun pause() {
realm.executeTransaction { realm.executeTransaction {
when (getState()) { when (val state = getState()) {
SessionState.STARTED -> { SessionState.STARTED -> {
this.pauseDate = Date() this.pauseDate = Date()
} }
else -> throw PAIllegalStateException("Pausing a session in an unmanaged state") else -> throw PAIllegalStateException("Pausing a session in an unmanaged state: $state")
} }
} }
} }
@ -558,11 +558,11 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
*/ */
fun stop() { fun stop() {
realm.executeTransaction { realm.executeTransaction {
when (getState()) { when (val state = getState()) {
SessionState.STARTED, SessionState.PAUSED -> { SessionState.STARTED, SessionState.PAUSED -> {
this.end() this.end()
} }
else -> throw Exception("Stopping session in unmanaged state") else -> throw Exception("Stopping session in unmanaged state: $state")
} }
} }
} }

Loading…
Cancel
Save