Fixes crashes

hh
Laurent 6 years ago
parent d5bc0309aa
commit 06c9fde229
  1. 4
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
  2. 1
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/CardsRow.kt
  3. 17
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerSetupRow.kt

@ -280,7 +280,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
override fun actionSelected(action: Action.Type) { override fun actionSelected(action: Action.Type) {
Timber.d(">>> action $action selected") Timber.d(">>> action $action selected")
this.model.actionSelected(action) getRealm().executeTransaction {
this.model.actionSelected(action)
}
this.findNextActionToEdit() this.findNextActionToEdit()
} }

@ -179,6 +179,7 @@ class StreetCardsRow(var street: Street, var handHistory: HandHistory) : CardsRo
fun cardsForTag(tag: Int): List<Card>? { fun cardsForTag(tag: Int): List<Card>? {
this.cardHolder?.cards?.let { cards -> this.cardHolder?.cards?.let { cards ->
return when (tag) { return when (tag) {
Street.PREFLOP.ordinal -> listOf()
Street.FLOP.ordinal -> cards.take(3) Street.FLOP.ordinal -> cards.take(3)
Street.TURN.ordinal -> { Street.TURN.ordinal -> {
if (cards.size > 3) { listOf(cards[4]!!) } else { null } if (cards.size > 3) { listOf(cards[4]!!) } else { null }

@ -58,15 +58,18 @@ class PlayerSetupRow(var hero: Boolean = false,
override fun tagForCompletion(handHistory: HandHistory): Int? { override fun tagForCompletion(handHistory: HandHistory): Int? {
// check cards // if the PlayerSetup exists
super.tagForCompletion(handHistory)?.let { tag -> this.playerSetup?.let {
return Tag.CARDS.ordinal super.tagForCompletion(handHistory)?.let { tag ->
} return Tag.CARDS.ordinal
}
// stack // stack
if (this.playerSetup?.stack == null) { if (it.stack == null) {
return Tag.STACK.ordinal return Tag.STACK.ordinal
}
} }
return null return null
} }

Loading…
Cancel
Save