diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
index 9d681b61..28be0aa8 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
@@ -160,7 +160,10 @@ class HHBuilder {
when (actionType) {
Action.Type.CALL -> {
- val significantAmount = getLastSignificantAction(index)?.action?.amount ?: throw PAIllegalStateException("Cannot happen")
+ val significantAction = getLastSignificantAction(index)
+ ?: throw PAIllegalStateException("There must be a previously set significant action for a call to be set")
+ val significantAmount = significantAction.action.amount
+ ?: throw PAIllegalStateException("There must be a set amount on the action for the call to be set")
val committedAmount = getPreviousCommittedAmount(index) ?: 0.0
computedAction.setEffectiveAmount(significantAmount - committedAmount)
}
@@ -181,8 +184,8 @@ class HHBuilder {
* We want drop all non-auto added rows after the index
*/
private fun dropNextActionsIfNecessary(index: Int) {
- val dropIndex = index + 1 // TODO determine dropIndex
- this.sortedActions.drop(dropIndex)
+// val dropIndex = index + 1 // TODO determine dropIndex
+// this.sortedActions = this.sortedActions.take(dropIndex)
}
/***
@@ -235,7 +238,7 @@ class HHBuilder {
val position = action.position
val street = action.street
- val previousActions = this.sortedActions.drop(index)
+ val previousActions = this.sortedActions.take(index)
val previousComputedAction = previousActions.lastOrNull {
it.action.position == position && it.action.street == street
}
@@ -257,7 +260,9 @@ class HHBuilder {
*/
private fun getLastUserAction(index: Int): ComputedAction? {
val action = this.actionForIndex(index).action
- val previousActions = this.sortedActions.drop(index)
+ Timber.d("**** this.sortedActions.size = ${this.sortedActions.size}")
+ val previousActions = this.sortedActions.take(index)
+ Timber.d("**** this.sortedActions.size = ${this.sortedActions.size}")
return previousActions.lastOrNull { it.action.position == action.position }
}
@@ -265,7 +270,9 @@ class HHBuilder {
* Returns the last significant player action, if any, for the action at the provided [index]
*/
private fun getLastSignificantAction(index: Int): ComputedAction? {
- val previousActions = this.sortedActions.drop(index)
+ Timber.d("**** this.sortedActions.size = ${this.sortedActions.size}")
+ val previousActions = this.sortedActions.take(index)
+ Timber.d("**** this.sortedActions.size = ${this.sortedActions.size}")
return previousActions.lastOrNull { it.action.isActionSignificant }
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e19b5906..9c1e62ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -703,7 +703,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 50d6744a..1662c45e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -704,7 +704,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6ab3869b..294eff5a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -772,7 +772,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 25d447e0..2e18b096 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -703,7 +703,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e1a2650c..8431ceef 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -703,7 +703,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 43e00b40..8a100d3c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -703,7 +703,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bede1f8c..fa1927c5 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -702,7 +702,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fa100226..aae49ccb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -704,7 +704,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin
diff --git a/app/src/main/res/values-v24/strings.xml b/app/src/main/res/values-v24/strings.xml
deleted file mode 100644
index 4bf776ab..00000000
--- a/app/src/main/res/values-v24/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Poker Rumble
- We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!
- Good for you!
- posts
- posts
- fold
- straddle
- check
- check
-
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 8e263b0a..c166f067 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -698,7 +698,7 @@
fold
straddle
check
- check
+ call
bet
raise
allin