mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-25 07:23:03 +00:00
Code Issues Releases Wiki Activity

Simplified transport check

Browse source
This commit is contained in:
M66B 2023-07-28 19:03:02 +02:00
parent e434adbaa0
commit f19f5908c9
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/ConnectionHelper.java
View file

@ -27,6 +27,7 @@ import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.TransportInfo;
import android.os.Build;
import android.provider.Settings;
import android.telephony.TelephonyManager;
@ -346,11 +347,6 @@ public class ConnectionHelper {
}
// VPN: evaluate underlying networks
Integer transport = null;
if (caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR))
transport = NetworkCapabilities.TRANSPORT_CELLULAR;
else if (caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI))
transport = NetworkCapabilities.TRANSPORT_WIFI;
boolean underlying = false;
for (Network network : networks) {
@ -378,11 +374,8 @@ public class ConnectionHelper {
continue;
}
if (!caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) &&
(caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) &&
(transport != null && !caps.hasTransport(transport))) {
Log.i("isMetered: underlying other transport");
if (caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
Log.i("isMetered: underlying VPN transport");
continue;
}