Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: Infinite Reader loading if open book while language model is downloading. (v1.0.1)

Browse source
This commit is contained in:
acclorite 2024-06-14 20:54:33 +03:00
parent 3f3e285b60
commit 98b9257866
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
View file

@ -21,6 +21,7 @@ import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.data.local.data_store.DataStore import ua.acclorite.book_story.data.local.data_store.DataStore
@ -664,7 +665,7 @@ class BookRepositoryImpl @Inject constructor(
override suspend fun isLanguageModelDownloaded(languageCode: String): Boolean { override suspend fun isLanguageModelDownloaded(languageCode: String): Boolean {
val model = TranslateRemoteModel.Builder(languageCode).build() val model = TranslateRemoteModel.Builder(languageCode).build()
return suspendCoroutine { continuation -> return suspendCancellableCoroutine { continuation ->
modelManager.isModelDownloaded(model) modelManager.isModelDownloaded(model)
.addOnSuccessListener { .addOnSuccessListener {
continuation.resume(it) continuation.resume(it)
@ -686,7 +687,12 @@ class BookRepositoryImpl @Inject constructor(
return return
} }
return suspendCoroutine { continuation -> return suspendCancellableCoroutine { continuation ->
continuation.invokeOnCancellation {
Log.i("TRANSLATOR", "Downloading Model: Coroutine Canceled")
onCompleted()
}
val language = TranslateRemoteModel.Builder(languageCode).build() val language = TranslateRemoteModel.Builder(languageCode).build()
val conditions = DownloadConditions.Builder().build() val conditions = DownloadConditions.Builder().build()
@ -714,7 +720,7 @@ class BookRepositoryImpl @Inject constructor(
return true return true
} }
return suspendCoroutine { continuation -> return suspendCancellableCoroutine { continuation ->
val language = TranslateRemoteModel.Builder(languageCode).build() val language = TranslateRemoteModel.Builder(languageCode).build()
modelManager.deleteDownloadedModel(language) modelManager.deleteDownloadedModel(language)
@ -728,7 +734,7 @@ class BookRepositoryImpl @Inject constructor(
} }
override suspend fun identifyLanguage(text: String): Resource<String> { override suspend fun identifyLanguage(text: String): Resource<String> {
return suspendCoroutine { continuation -> return suspendCancellableCoroutine { continuation ->
languageIdentifier.identifyLanguage(text) languageIdentifier.identifyLanguage(text)
.addOnSuccessListener { .addOnSuccessListener {
val languageCode = it.trim().lowercase().take(2) val languageCode = it.trim().lowercase().take(2)

7
app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
View file

@ -733,11 +733,10 @@ class ReaderViewModel @Inject constructor(
languageCode = lang.languageCode, languageCode = lang.languageCode,
onCompleted = { onCompleted = {
launch(Dispatchers.IO) { launch(Dispatchers.IO) {
val modelDownloaded = yield()
isLanguageModelDownloaded.execute(
lang.languageCode
)
val modelDownloaded =
isLanguageModelDownloaded.execute(lang.languageCode)
if (!modelDownloaded) { if (!modelDownloaded) {
onEvent( onEvent(
ReaderEvent.OnUpdateLanguage(lang.languageCode) { ReaderEvent.OnUpdateLanguage(lang.languageCode) {