Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Avoid reentrant UniFFI polling in Ensu asset operations

Manav Rathi7f7037858107
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/assets/AssetStore.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/assets/AssetStore.kt
index 23820a078b..9d179485b0 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/assets/AssetStore.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/assets/AssetStore.kt
@@ -17,6 +17,8 @@ import io.ente.ensu.bindings.reconcileKnowledgePack
import io.ente.ensu.bindings.uniffiEnsureInitialized
import java.io.File
import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
class AssetStore(context: Context) {
private val appContext = context.applicationContext
@@ -69,13 +71,15 @@ class AssetStore(context: Context) {
internal fun cleanupKnowledgeRevisions(stableId: String, activeIdentity: String) =
cleanupObsoleteKnowledgePackRevisions(core, stableId, activeIdentity)
- suspend fun estimateDownloadSize(asset: Asset): Long? = core.estimatedDownloadSize(asset)
+ suspend fun estimateDownloadSize(asset: Asset): Long? = withContext(Dispatchers.IO) {
+ core.estimatedDownloadSize(asset)
+ }
suspend fun download(
assets: List<Asset>,
onProgress: (AssetDownloadProgress) -> Unit
- ) {
- if (assets.all { core.isDownloaded(it) }) return
+ ) = withContext(Dispatchers.IO) {
+ if (assets.all { core.isDownloaded(it) }) return@withContext
val token = CancellationToken()
val lease = AssetDownloadJobService.begin { token.cancel() }