prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade WorkManager

Browse Source
This commit is contained in:
Koitharu
2023-11-30 12:53:44 +02:00
parent c0062c83c8
commit ff05f3f79d
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt
View File

@@ -56,6 +56,11 @@ open class BaseApp : Application(), Configuration.Provider {
@Inject
lateinit var workManagerProvider: Provider<WorkManager>
override val workManagerConfiguration: Configuration
get() = Configuration.Builder()
.setWorkerFactory(workerFactory)
.build()
override fun onCreate() {
super.onCreate()
ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
@@ -110,12 +115,6 @@ open class BaseApp : Application(), Configuration.Provider {
}
}
override fun getWorkManagerConfiguration(): Configuration {
return Configuration.Builder()
.setWorkerFactory(workerFactory)
.build()
}
@WorkerThread
private fun setupDatabaseObservers() {
val tracker = database.invalidationTracker

4
app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt
View File

@@ -1,7 +1,6 @@
package org.koitharu.kotatsu.core.util
import android.annotation.SuppressLint
import androidx.lifecycle.asFlow
import androidx.work.WorkInfo
import androidx.work.WorkManager
import androidx.work.WorkQuery
@@ -27,8 +26,7 @@ class WorkServiceStopHelper(
fun setup() {
processLifecycleScope.launch(Dispatchers.Default) {
workManagerProvider.get()
.getWorkInfosLiveData(WorkQuery.fromStates(WorkInfo.State.RUNNING))
.asFlow()
.getWorkInfosFlow(WorkQuery.fromStates(WorkInfo.State.RUNNING))
.map { it.isEmpty() }
.distinctUntilChanged()
.collectLatest {

4
app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt
View File

@@ -7,7 +7,6 @@ import android.os.Build
import android.webkit.MimeTypeMap
import androidx.core.content.ContextCompat
import androidx.hilt.work.HiltWorker
import androidx.lifecycle.asFlow
import androidx.work.BackoffPolicy
import androidx.work.Constraints
import androidx.work.CoroutineWorker
@@ -385,8 +384,7 @@ class DownloadWorker @AssistedInject constructor(
}
fun observeWorks(): Flow<List<WorkInfo>> = workManager
.getWorkInfosByTagLiveData(TAG)
.asFlow()
.getWorkInfosByTagFlow(TAG)
suspend fun cancel(id: UUID) {
workManager.cancelWorkById(id).await()

4
app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
View File

@@ -13,7 +13,6 @@ import androidx.core.app.PendingIntentCompat
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.hilt.work.HiltWorker
import androidx.lifecycle.asFlow
import androidx.work.BackoffPolicy
import androidx.work.Constraints
import androidx.work.CoroutineWorker
@@ -356,8 +355,7 @@ class TrackWorker @AssistedInject constructor(
fun observeIsRunning(): Flow<Boolean> {
val query = WorkQuery.Builder.fromTags(listOf(TAG, TAG_ONESHOT)).build()
return workManager.getWorkInfosLiveData(query)
.asFlow()
return workManager.getWorkInfosFlow(query)
.map { works ->
works.any { x -> x.state == WorkInfo.State.RUNNING }
}