null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt
View file

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