Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 11:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve wifi detection to account for VPNs.

Browse Source 
Fixes #14462
This commit is contained in:
Greyson Parrelli
2025-12-02 14:57:54 -05:00
committed by jeffrey-signal
parent 30e43e99fc
commit ba63a5255d
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/thoughtcrime/securesms/util/NetworkUtil.java
View File

@@ -19,8 +19,32 @@ public final class NetworkUtil {
private NetworkUtil() {} private NetworkUtil() {}
public static boolean isConnectedWifi(@NonNull Context context) { public static boolean isConnectedWifi(@NonNull Context context) {
final NetworkInfo info = getNetworkInfo(context); ConnectivityManager connectivityManager = ServiceUtil.getConnectivityManager(context);
return info != null && info.isConnected() && info.getType() == ConnectivityManager.TYPE_WIFI; Network activeNetwork = connectivityManager.getActiveNetwork();
if (activeNetwork == null) {
return false;
}
NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(activeNetwork);
if (capabilities == null) {
return false;
}
if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
return true;
}
if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
for (Network underlyingNetwork : connectivityManager.getAllNetworks()) {
NetworkCapabilities underlyingCapabilities = connectivityManager.getNetworkCapabilities(underlyingNetwork);
if (underlyingCapabilities != null && underlyingCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
return true;
}
}
}
return false;
} }
public static boolean isConnectedMobile(@NonNull Context context) { public static boolean isConnectedMobile(@NonNull Context context) {