github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-21 20:47:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

DownloadJob: Network check changes (#10242)

Browse source 
Mostly pulled from WorkManager
This commit is contained in:
Ivan Iskandar 2023-12-17 21:57:55 +07:00 committed by GitHub
parent 387159b5af
commit f9b57800b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 101 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt
View file

@ -13,13 +13,17 @@ import androidx.work.WorkManager
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.util.system.isConnectedToWifi import eu.kanade.tachiyomi.util.system.NetworkState
import eu.kanade.tachiyomi.util.system.isOnline import eu.kanade.tachiyomi.util.system.activeNetworkState
import eu.kanade.tachiyomi.util.system.networkStateFlow
import eu.kanade.tachiyomi.util.system.notificationBuilder import eu.kanade.tachiyomi.util.system.notificationBuilder
import eu.kanade.tachiyomi.util.system.setForegroundSafely import eu.kanade.tachiyomi.util.system.setForegroundSafely
import kotlinx.coroutines.delay import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combineTransform
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import tachiyomi.domain.download.service.DownloadPreferences import tachiyomi.domain.download.service.DownloadPreferences
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
@ -50,7 +54,11 @@ class DownloadJob(context: Context, workerParams: WorkerParameters) : CoroutineW
} }
override suspend fun doWork(): Result { override suspend fun doWork(): Result {
var active = checkConnectivity() && downloadManager.downloaderStart() var networkCheck = checkNetworkState(
applicationContext.activeNetworkState(),
downloadPreferences.downloadOnlyOverWifi().get(),
)
var active = networkCheck && downloadManager.downloaderStart()
if (!active) { if (!active) {
return Result.failure() return Result.failure()
@ -58,19 +66,27 @@ class DownloadJob(context: Context, workerParams: WorkerParameters) : CoroutineW
setForegroundSafely() setForegroundSafely()
coroutineScope {
combineTransform(
applicationContext.networkStateFlow(),
downloadPreferences.downloadOnlyOverWifi().changes(),
transform = { a, b -> emit(checkNetworkState(a, b)) },
)
.onEach { networkCheck = it }
.launchIn(this)
}
// Keep the worker running when needed // Keep the worker running when needed
while (active) { while (active) {
delay(100) active = !isStopped && downloadManager.isRunning && networkCheck
active = !isStopped && downloadManager.isRunning && checkConnectivity()
} }
return Result.success() return Result.success()
} }
private fun checkConnectivity(): Boolean { private fun checkNetworkState(state: NetworkState, requireWifi: Boolean): Boolean {
return with(applicationContext) { return if (state.isOnline) {
if (isOnline()) { val noWifi = requireWifi && !state.isWifi
val noWifi = downloadPreferences.downloadOnlyOverWifi().get() && !isConnectedToWifi()
if (noWifi) { if (noWifi) {
downloadManager.downloaderStop( downloadManager.downloaderStop(
applicationContext.getString(R.string.download_notifier_text_only_wifi), applicationContext.getString(R.string.download_notifier_text_only_wifi),
@ -82,7 +98,6 @@ class DownloadJob(context: Context, workerParams: WorkerParameters) : CoroutineW
false false
} }
} }
}
companion object { companion object {
private const val TAG = "Downloader" private const val TAG = "Downloader"

67
app/src/main/java/eu/kanade/tachiyomi/util/system/NetworkStateTracker.kt Normal file
View file

@ -0,0 +1,67 @@
package eu.kanade.tachiyomi.util.system
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
import android.net.NetworkCapabilities
import android.os.Build
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow
data class NetworkState(
val isConnected: Boolean,
val isValidated: Boolean,
val isWifi: Boolean,
) {
val isOnline = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
isConnected && isValidated
} else {
isConnected
}
}
@Suppress("DEPRECATION")
fun Context.activeNetworkState(): NetworkState {
val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
return NetworkState(
isConnected = connectivityManager.activeNetworkInfo?.isConnected ?: false,
isValidated = capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false,
isWifi = wifiManager.isWifiEnabled && capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ?: false,
)
}
@Suppress("DEPRECATION")
fun Context.networkStateFlow() = callbackFlow {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val networkCallback = object : NetworkCallback() {
override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
trySend(activeNetworkState())
}
override fun onLost(network: Network) {
trySend(activeNetworkState())
}
}
connectivityManager.registerDefaultNetworkCallback(networkCallback)
awaitClose {
connectivityManager.unregisterNetworkCallback(networkCallback)
}
} else {
val receiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
if (intent.action == ConnectivityManager.CONNECTIVITY_ACTION) {
trySend(activeNetworkState())
}
}
}
registerReceiver(receiver, IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION))
awaitClose {
unregisterReceiver(receiver)
}
}
}