yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use "isOnline" utils in DownloadService (#5863)

Browse Source 
* Use isOnline

* when -> if/else
This commit is contained in:
FourTOne5 2021-09-06 22:31:03 +06:00 committed by GitHub
parent e942b8a402
commit 156feb6e8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt
View File

@ -4,8 +4,6 @@ import android.app.Notification
import android.app.Service import android.app.Service
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Network
import android.net.NetworkCapabilities
import android.os.IBinder import android.os.IBinder
import android.os.PowerManager import android.os.PowerManager
import androidx.annotation.StringRes import androidx.annotation.StringRes
@ -17,7 +15,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.util.lang.plusAssign import eu.kanade.tachiyomi.util.lang.plusAssign
import eu.kanade.tachiyomi.util.lang.withUIContext import eu.kanade.tachiyomi.util.lang.withUIContext
import eu.kanade.tachiyomi.util.system.acquireWakeLock import eu.kanade.tachiyomi.util.system.acquireWakeLock
import eu.kanade.tachiyomi.util.system.connectivityManager import eu.kanade.tachiyomi.util.system.isOnline
import eu.kanade.tachiyomi.util.system.isServiceRunning import eu.kanade.tachiyomi.util.system.isServiceRunning
import eu.kanade.tachiyomi.util.system.notification import eu.kanade.tachiyomi.util.system.notification
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
@ -155,18 +153,15 @@ class DownloadService : Service() {
* Called when the network state changes. * Called when the network state changes.
*/ */
private fun onNetworkStateChanged() { private fun onNetworkStateChanged() {
val manager = connectivityManager if (isOnline()) {
val activeNetwork: Network = manager.activeNetwork ?: return if (preferences.downloadOnlyOverWifi() && !wifiManager.isWifiEnabled) {
val networkCapabilities = manager.getNetworkCapabilities(activeNetwork) ?: return stopDownloads(R.string.download_notifier_text_only_wifi)
if (!networkCapabilities.connectedToInternet()) { } else {
return stopDownloads(R.string.download_notifier_no_network) val started = downloadManager.startDownloads()
} if (!started) stopSelf()
}
if (preferences.downloadOnlyOverWifi() && !wifiManager.isWifiEnabled) {
stopDownloads(R.string.download_notifier_text_only_wifi)
} else { } else {
val started = downloadManager.startDownloads() stopDownloads(R.string.download_notifier_no_network)
if (!started) stopSelf()
} }
} }
@ -174,11 +169,6 @@ class DownloadService : Service() {
downloadManager.stopDownloads(getString(string)) downloadManager.stopDownloads(getString(string))
} }
private fun NetworkCapabilities.connectedToInternet(): Boolean {
return this.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
this.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
}
/** /**
* Listens to downloader status. Enables or disables the wake lock depending on the status. * Listens to downloader status. Enables or disables the wake lock depending on the status.
*/ */