Check unmetered again for download only via wifi instead of if wifi is on

Since wifiManager.isWifiEnabled only checks if wifi is on, not if conntected to a wifi network
This commit is contained in:
Jays2Kings 2021-10-03 22:52:28 -04:00
parent 8a8c068e23
commit cd33a1674a

View file

@ -7,6 +7,7 @@ import android.content.Intent
import android.net.ConnectivityManager
import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED
import android.net.NetworkRequest
import android.os.Build
import android.os.IBinder
@ -24,7 +25,6 @@ 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.powerManager
import eu.kanade.tachiyomi.util.system.wifiManager
import rx.subscriptions.CompositeSubscription
import uy.kohesive.injekt.injectLazy
@ -204,7 +204,7 @@ class DownloadService : Service() {
downloadManager.stopDownloads(getString(R.string.no_network_connection))
return
}
if (preferences.downloadOnlyOverWifi() && !wifiManager.isWifiEnabled) {
if (preferences.downloadOnlyOverWifi() && networkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED)) {
downloadManager.stopDownloads(getString(R.string.no_wifi_connection))
} else {
val started = downloadManager.startDownloads()