Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Use_ConnectivityManagerCompat' into 'master'

Browse Source 
Use ConnectivityManagerCompat.isActiveNetworkMetered().

See merge request fdroid/fdroidclient!915
This commit is contained in:
Hans-Christoph Steiner 2020-08-25 11:35:30 +00:00
commit a8f1a58f2d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
View File

@ -9,6 +9,8 @@ import android.net.NetworkInfo;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.core.app.JobIntentService;
import androidx.core.net.ConnectivityManagerCompat;
import android.util.Log;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.fdroid.fdroid.FDroidApp;
@ -115,7 +117,7 @@ public class ConnectivityMonitorService extends JobIntentService {
switch (networkType) {
case ConnectivityManager.TYPE_ETHERNET:
case ConnectivityManager.TYPE_WIFI:
if (Build.VERSION.SDK_INT >= 16 && cm.isActiveNetworkMetered()) {
if (ConnectivityManagerCompat.isActiveNetworkMetered(cm)) {
return FLAG_NET_METERED;
} else {
return FLAG_NET_NO_LIMIT;