mirror/tempo
1
0
Fork 0
mirror of https://github.com/CappielloAntonio/tempo.git synced 2025-12-23 16:08:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: delete deprecated code to check connectivity

Browse Source
This commit is contained in:
CappielloAntonio
2024-12-30 16:45:38 +01:00
parent f0d31e425a
commit d3ca43ed49
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/CacheUtil.java
View File

@@ -2,7 +2,8 @@ package com.cappielloantonio.tempo.subsonic.utils;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Network;
import android.net.NetworkCapabilities;
import com.cappielloantonio.tempo.App;
@@ -39,7 +40,19 @@ public class CacheUtil {
private boolean isConnected() {
ConnectivityManager connectivityManager = (ConnectivityManager) App.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
return (netInfo != null && netInfo.isConnected());
if (connectivityManager != null) {
Network network = connectivityManager.getActiveNetwork();
if (network != null) {
NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
if (capabilities != null) {
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
}
}
}
return false;
}
}

12
app/src/main/java/com/cappielloantonio/tempo/util/NetworkUtil.java
View File

@@ -2,6 +2,8 @@ package com.cappielloantonio.tempo.util;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import com.cappielloantonio.tempo.App;
@@ -11,9 +13,15 @@ public class NetworkUtil {
ConnectivityManager connectivityManager = (ConnectivityManager) App.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivityManager != null) {
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
Network network = connectivityManager.getActiveNetwork();
return networkInfo == null || !networkInfo.isConnected();
if (network != null) {
NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
if (capabilities != null) {
return !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) || !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
}
}
}
return true;