android: fix bugs: exception in StageShowScreen & correctAnswerIndexOf

crowdproj · Jan 19, 2025 · 1f55a84 · 1f55a84
1 parent 0d05fc0
commit 1f55a84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/android/app/src/main/java/com/github/sszuev/flashcards/android/ui/StageShowUI.kt b/android/app/src/main/java/com/github/sszuev/flashcards/android/ui/StageShowUI.kt
@@ -52,7 +52,7 @@ fun StageShowScreen(
 ) {
 
     if (dictionaryViewModel.selectedDictionaryIds.value.isEmpty()) {
-        throw IllegalStateException("no dictionaries selected")
+        return
     }
 
     BackHandler {

diff --git a/android/app/src/main/java/com/github/sszuev/flashcards/android/utils/CardsHelper.kt b/android/app/src/main/java/com/github/sszuev/flashcards/android/utils/CardsHelper.kt
@@ -3,6 +3,7 @@ package com.github.sszuev.flashcards.android.utils
 import com.github.sszuev.flashcards.android.CELL_TEXT_LIMIT
 import com.github.sszuev.flashcards.android.STAGE_WRITING_PREFIX_LENGTH
 import com.github.sszuev.flashcards.android.entities.CardEntity
+import kotlin.math.max
 
 fun examplesAsString(examples: List<String>) = examples.joinToString("\n")
 
@@ -19,18 +20,20 @@ fun translationFromString(translation: String) = translation.split(",").map { it
 
 fun wordAsList(word: String) = word.split(", ").map { it.trim() }
 
-fun correctAnswerIndexOf(translation: List<String>, input: String): Int {
+fun correctAnswerIndexOf(samples: List<String>, input: String): Int {
     val txt = input.trim()
     if (txt.length < STAGE_WRITING_PREFIX_LENGTH) {
-        translation.forEachIndexed { index, tr ->
+        samples.forEachIndexed { index, tr ->
             if (tr.trim().equals(txt, true)) {
                 return index
             }
         }
         return -1
     }
-    translation.forEachIndexed { index, tr ->
-        if (tr.trim().startsWith(txt.substring(0, STAGE_WRITING_PREFIX_LENGTH), true)) {
+    samples.forEachIndexed { index, tr ->
+        if (tr.trim()
+                .startsWith(txt.substring(0, max(input.length, STAGE_WRITING_PREFIX_LENGTH)), true)
+        ) {
             return index
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ fun StageShowScreen( @@
     ) {
         if (dictionaryViewModel.selectedDictionaryIds.value.isEmpty()) {
-            throw IllegalStateException("no dictionaries selected")
+            return
         }
         BackHandler {
@@ Expand Down @@