Build and crash fixes

Author: syt0r

app/src/googlePlay/java/ua/syt0r/kanji/core/review/ReviewEligibilityUseCase.kt

@@ -1,6 +1,6 @@
 package ua.syt0r.kanji.core.review
 
-import ua.syt0r.kanji.core.user_data.practice.ReviewHistoryRepository
+import ua.syt0r.kanji.core.user_data.database.ReviewHistoryRepository
 
 class ReviewEligibilityUseCase(
     private val reviewHistoryRepository: ReviewHistoryRepository

core/src/commonMain/kotlin/ua/syt0r/kanji/core/VocabCardResolver.kt

@@ -1,7 +1,5 @@
 package ua.syt0r.kanji.core
 
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import ua.syt0r.kanji.core.app_data.AppDataRepository
 import ua.syt0r.kanji.core.app_data.data.FuriganaString
@@ -41,19 +39,17 @@ class VocabCardResolver(
             val kanjiReading = vocabCard.data.kanjiReading
             val kanaReading = vocabCard.data.kanaReading
 
-            val word = async(start = CoroutineStart.LAZY) {
-                vocabCard.data
-                    .run { appDataRepository.findWords(dictionaryId, kanjiReading, kanaReading) }
-                    .firstOrNull()
+            val word = vocabCard.data.run {
+                appDataRepository.getWord(dictionaryId, kanjiReading, kanaReading)
             }
 
             ResolvedVocabCard(
                 dictionaryId = vocabCard.data.dictionaryId,
                 kanjiReading = kanjiReading,
                 kanaReading = kanaReading,
-                furigana = word.await()?.reading?.furigana,
-                meaning = vocabCard.data.meaning ?: word.await()!!.combinedGlossary(),
-                pos = word.await()?.partOfSpeechList ?: emptyList()
+                furigana = word.reading.furigana,
+                meaning = vocabCard.data.meaning ?: word.combinedGlossary(),
+                pos = word.partOfSpeechList
             )
         }
     }

core/src/commonMain/kotlin/ua/syt0r/kanji/core/app_data/SqlDelightAppDataRepository.kt

@@ -178,7 +178,8 @@ class SqlDelightAppDataRepository(
                     else -> {
                         val element = elements
                             .sortedBy { it.priority ?: Long.MAX_VALUE }
-                            .first { it.reading == kanjiReading || it.reading == kanaReading }
+                            .firstOrNull { it.reading == kanjiReading || it.reading == kanaReading }
+                            ?: return@mapNotNull null
                         getWord(
                             id = wordId,
                             kanaReading = element.reading.takeIf { element.isKana == 1L },

core/src/commonMain/kotlin/ua/syt0r/kanji/core/user_data/database/sqldelight/SqlDelightReviewHistoryRepository.kt

@@ -93,8 +93,8 @@ class SqlDelightReviewHistoryRepository(
     ): Map<String, ReviewHistoryStatItem> = userDataDatabaseManager.readTransaction {
         val timeDelimiter = "|"
         val practiceTypeDelimiter = ";"
-        getReviewHistoryStatsForKeys(keys)
-            .executeAsList()
+        keys.chunked(500)
+            .flatMap { getReviewHistoryStatsForKeys(it).executeAsList() }
             .associate {
                 it.key to ReviewHistoryStatItem(
                     key = it.key,