mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed VPN active / only

This commit is contained in:
M66B 2023-09-14 17:56:50 +02:00
parent 3c8336de2f
commit da3ad56941
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/ConnectionHelper.java
View File

@ -535,17 +535,14 @@ public class ConnectionHelper {
if (cm == null)
return false;
// The active network doesn't necessarily have VPN transport
// active=... caps=[ Transports: WIFI Capabilities: ...&NOT_VPN&...
// network=... caps=[ Transports: WIFI|VPN Capabilities: ...
try {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
for (Network network : cm.getAllNetworks()) {
NetworkCapabilities caps = cm.getNetworkCapabilities(network);
if (caps != null && !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN))
return true;
}
} else {
Network active = cm.getActiveNetwork();
NetworkCapabilities caps = (active == null ? null : cm.getNetworkCapabilities(active));
if (caps != null && !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN))
for (Network network : cm.getAllNetworks()) {
NetworkCapabilities caps = cm.getNetworkCapabilities(network);
if (caps != null && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN))
return true;
}
} catch (Throwable ex) {