Просмотр исходного кода

Revert "Set background job expedited policies"

This reverts commit c69420373a7e61c1b4eea038447cff6f0409a201.

Caused crashes in TachiyomiSY for some reason. Will have to redo this once we target Android 12.
arkon 4 лет назад
Родитель
Сommit
07de367476

+ 0 - 4
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt

@@ -3,8 +3,6 @@ package eu.kanade.tachiyomi.data.backup
 import android.content.Context
 import android.content.Context
 import androidx.core.net.toUri
 import androidx.core.net.toUri
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.ExperimentalExpeditedWork
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.Worker
@@ -33,7 +31,6 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
     companion object {
     companion object {
         private const val TAG = "BackupCreator"
         private const val TAG = "BackupCreator"
 
 
-        @ExperimentalExpeditedWork
         fun setupTask(context: Context, prefInterval: Int? = null) {
         fun setupTask(context: Context, prefInterval: Int? = null) {
             val preferences = Injekt.get<PreferencesHelper>()
             val preferences = Injekt.get<PreferencesHelper>()
             val interval = prefInterval ?: preferences.backupInterval().get()
             val interval = prefInterval ?: preferences.backupInterval().get()
@@ -44,7 +41,6 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
                     10,
                     10,
                     TimeUnit.MINUTES
                     TimeUnit.MINUTES
                 )
                 )
-                    .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
                     .addTag(TAG)
                     .addTag(TAG)
                     .build()
                     .build()
 
 

+ 0 - 4
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt

@@ -3,9 +3,7 @@ package eu.kanade.tachiyomi.data.library
 import android.content.Context
 import android.content.Context
 import androidx.work.Constraints
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.ExperimentalExpeditedWork
 import androidx.work.NetworkType
 import androidx.work.NetworkType
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.Worker
@@ -31,7 +29,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
     companion object {
     companion object {
         private const val TAG = "LibraryUpdate"
         private const val TAG = "LibraryUpdate"
 
 
-        @ExperimentalExpeditedWork
         fun setupTask(context: Context, prefInterval: Int? = null) {
         fun setupTask(context: Context, prefInterval: Int? = null) {
             val preferences = Injekt.get<PreferencesHelper>()
             val preferences = Injekt.get<PreferencesHelper>()
             val interval = prefInterval ?: preferences.libraryUpdateInterval().get()
             val interval = prefInterval ?: preferences.libraryUpdateInterval().get()
@@ -55,7 +52,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
                     10,
                     10,
                     TimeUnit.MINUTES
                     TimeUnit.MINUTES
                 )
                 )
-                    .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
                     .addTag(TAG)
                     .addTag(TAG)
                     .setConstraints(constraints)
                     .setConstraints(constraints)
                     .build()
                     .build()

+ 0 - 4
app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt

@@ -3,9 +3,7 @@ package eu.kanade.tachiyomi.data.updater
 import android.content.Context
 import android.content.Context
 import androidx.work.Constraints
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.ExperimentalExpeditedWork
 import androidx.work.NetworkType
 import androidx.work.NetworkType
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.Worker
@@ -32,7 +30,6 @@ class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
     companion object {
     companion object {
         private const val TAG = "UpdateChecker"
         private const val TAG = "UpdateChecker"
 
 
-        @ExperimentalExpeditedWork
         fun setupTask(context: Context) {
         fun setupTask(context: Context) {
             val constraints = Constraints.Builder()
             val constraints = Constraints.Builder()
                 .setRequiredNetworkType(NetworkType.CONNECTED)
                 .setRequiredNetworkType(NetworkType.CONNECTED)
@@ -44,7 +41,6 @@ class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
                 3,
                 3,
                 TimeUnit.HOURS
                 TimeUnit.HOURS
             )
             )
-                .setExpedited(OutOfQuotaPolicy.DROP_WORK_REQUEST)
                 .addTag(TAG)
                 .addTag(TAG)
                 .setConstraints(constraints)
                 .setConstraints(constraints)
                 .build()
                 .build()

+ 0 - 4
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt

@@ -6,9 +6,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.work.Constraints
 import androidx.work.Constraints
 import androidx.work.CoroutineWorker
 import androidx.work.CoroutineWorker
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.ExperimentalExpeditedWork
 import androidx.work.NetworkType
 import androidx.work.NetworkType
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import androidx.work.WorkerParameters
@@ -66,7 +64,6 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam
     companion object {
     companion object {
         private const val TAG = "ExtensionUpdate"
         private const val TAG = "ExtensionUpdate"
 
 
-        @ExperimentalExpeditedWork
         fun setupTask(context: Context, forceAutoUpdateJob: Boolean? = null) {
         fun setupTask(context: Context, forceAutoUpdateJob: Boolean? = null) {
             val preferences = Injekt.get<PreferencesHelper>()
             val preferences = Injekt.get<PreferencesHelper>()
             val autoUpdateJob = forceAutoUpdateJob ?: preferences.automaticExtUpdates().get()
             val autoUpdateJob = forceAutoUpdateJob ?: preferences.automaticExtUpdates().get()
@@ -81,7 +78,6 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam
                     1,
                     1,
                     TimeUnit.HOURS
                     TimeUnit.HOURS
                 )
                 )
-                    .setExpedited(OutOfQuotaPolicy.DROP_WORK_REQUEST)
                     .addTag(TAG)
                     .addTag(TAG)
                     .setConstraints(constraints)
                     .setConstraints(constraints)
                     .build()
                     .build()