diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index cb1ea89aa..e1aaf29c9 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -420,7 +420,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet is SourceNotInstalledException -> context.stringResource( MR.strings.loader_not_implemented_error, ) - else -> e.message } failedUpdates.add(manga to errorMessage) @@ -692,8 +691,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet } return file } - } catch (_: Exception) { - } + } catch (_: Exception) {} return File("") } @@ -737,10 +735,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet const val KEY_GROUP_EXTRA = "group_extra" // SY <-- - fun cancelAllWorks(context: Context) { - context.workManager.cancelAllWorkByTag(TAG) - } - fun setupTask( context: Context, prefInterval: Int? = null, @@ -754,16 +748,19 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet } else { NetworkType.CONNECTED } - val networkRequestBuilder = NetworkRequest.Builder() - if (DEVICE_ONLY_ON_WIFI in restrictions) { - networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_WIFI) - } - if (DEVICE_NETWORK_NOT_METERED in restrictions) { - networkRequestBuilder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) + val networkRequest = NetworkRequest.Builder().apply { + removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) + if (DEVICE_ONLY_ON_WIFI in restrictions) { + addTransportType(NetworkCapabilities.TRANSPORT_WIFI) + } + if (DEVICE_NETWORK_NOT_METERED in restrictions) { + addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) + } } + .build() val constraints = Constraints.Builder() // 'networkRequest' only applies to Android 9+, otherwise 'networkType' is used - .setRequiredNetworkRequest(networkRequestBuilder.build(), networkType) + .setRequiredNetworkRequest(networkRequest, networkType) .setRequiresCharging(DEVICE_CHARGING in restrictions) .setRequiresBatteryNotLow(true) .build()