admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run automatic library updates even when connected to a VPN (#2996)

Browse Source 
Co-authored-by: jeremiejig <3978761+jeremiejig@users.noreply.github.com>
(cherry picked from commit 039471427448347a1c12c39a488a1127a3ea1497)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
This commit is contained in:
AntsyLich
2026-02-25 19:05:30 +06:00
committed by Jobobby04
parent d250a9a680
commit f843de28d7
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
+11 -14
View File
@@ -420,7 +420,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
is SourceNotInstalledException -> context.stringResource( is SourceNotInstalledException -> context.stringResource(
MR.strings.loader_not_implemented_error, MR.strings.loader_not_implemented_error,
) )
else -> e.message else -> e.message
} }
failedUpdates.add(manga to errorMessage) failedUpdates.add(manga to errorMessage)
@@ -692,8 +691,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
} }
return file return file
} }
} catch (_: Exception) { } catch (_: Exception) {}
}
return File("") return File("")
} }
@@ -737,10 +735,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
const val KEY_GROUP_EXTRA = "group_extra" const val KEY_GROUP_EXTRA = "group_extra"
// SY <-- // SY <--
fun cancelAllWorks(context: Context) {
context.workManager.cancelAllWorkByTag(TAG)
}
fun setupTask( fun setupTask(
context: Context, context: Context,
prefInterval: Int? = null, prefInterval: Int? = null,
@@ -754,16 +748,19 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
} else { } else {
NetworkType.CONNECTED NetworkType.CONNECTED
} }
val networkRequestBuilder = NetworkRequest.Builder() val networkRequest = NetworkRequest.Builder().apply {
if (DEVICE_ONLY_ON_WIFI in restrictions) { removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_WIFI) if (DEVICE_ONLY_ON_WIFI in restrictions) {
} addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
if (DEVICE_NETWORK_NOT_METERED in restrictions) { }
networkRequestBuilder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) if (DEVICE_NETWORK_NOT_METERED in restrictions) {
addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
}
} }
.build()
val constraints = Constraints.Builder() val constraints = Constraints.Builder()
// 'networkRequest' only applies to Android 9+, otherwise 'networkType' is used // 'networkRequest' only applies to Android 9+, otherwise 'networkType' is used
.setRequiredNetworkRequest(networkRequestBuilder.build(), networkType) .setRequiredNetworkRequest(networkRequest, networkType)
.setRequiresCharging(DEVICE_CHARGING in restrictions) .setRequiresCharging(DEVICE_CHARGING in restrictions)
.setRequiresBatteryNotLow(true) .setRequiresBatteryNotLow(true)
.build() .build()