Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we schedule the vacuum task only if there isn't an existing one

Browse source
This commit is contained in:
Jorge Martín 2025-12-09 13:50:21 +01:00 • committed by Jorge Martin Espinosa
parent 95cded80a6
commit 2e88815e1b
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/VacuumDatabaseWorker.kt
View file

@ -15,6 +15,7 @@ import dev.zacsweers.metro.AssistedInject
import io.element.android.libraries.di.annotations.ApplicationContext
import io.element.android.libraries.matrix.api.MatrixClientProvider
import io.element.android.libraries.matrix.api.core.SessionId
import timber.log.Timber
@AssistedInject
class VacuumDatabaseWorker(
@ -27,12 +28,19 @@ class VacuumDatabaseWorker(
}
override suspend fun doWork(): Result {
Timber.d("Starting database vacuuming...")
val sessionId = inputData.getString(SESSION_ID_PARAM)?.let(::SessionId) ?: return Result.failure()
val client = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return Result.failure()
return client.performDatabaseVacuum()
.fold(
onSuccess = { Result.success() },
onFailure = { Result.failure() }
onSuccess = {
Timber.d("Database vacuuming finished successfully")
Result.success()
},
onFailure = {
Timber.e(it, "Database vacuuming failed")
Result.failure()
}
)
}
}

5
libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerScheduler.kt
View file

@ -12,7 +12,6 @@ import androidx.work.WorkManager
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.SingleIn
import io.element.android.libraries.core.bool.orFalse
import io.element.android.libraries.matrix.api.core.SessionId
import io.element.android.libraries.sessionstorage.api.observer.SessionListener
import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
@ -53,7 +52,9 @@ class DefaultWorkManagerScheduler(
}
override fun hasPendingWork(sessionId: SessionId, requestType: WorkManagerRequestType): Boolean {
return workManager.getWorkInfosByTag(workManagerTag(sessionId, requestType)).get()?.isNotEmpty().orFalse()
val workInfos = workManager.getWorkInfosByTag(workManagerTag(sessionId, requestType)).get().orEmpty()
// It has pending work if it's periodic or it isn't but it's not finished
return workInfos.any { it.periodicityInfo != null || !it.state.isFinished }
}
override fun cancel(sessionId: SessionId) {