diff options
| author | cyberta <cyberta@riseup.net> | 2021-12-11 16:30:36 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-12-11 16:30:36 +0000 |
| commit | 42a3735356881633004dfb6ed3c60fe8b7d26689 (patch) | |
| tree | 9f54e737b24f9877938e79dd5726cb084be02d7e /app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java | |
| parent | 5aaa3bb1c83d486e300eb98876eab26ad4325b82 (diff) | |
| parent | e7c09efba8a06bc7a000d525aff5ac027339023e (diff) | |
Merge branch 'bugfixes' into 'master'
bug fixes
See merge request leap/bitmask_android!153
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java b/app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java index a4f09806..5b11c0a0 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java +++ b/app/src/main/java/de/blinkt/openvpn/core/NetworkUtils.java @@ -27,28 +27,32 @@ public class NetworkUtils { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { Network[] networks = conn.getAllNetworks(); for (Network network : networks) { - NetworkInfo ni = conn.getNetworkInfo(network); - LinkProperties li = conn.getLinkProperties(network); + try { + NetworkInfo ni = conn.getNetworkInfo(network); + LinkProperties li = conn.getLinkProperties(network); - NetworkCapabilities nc = conn.getNetworkCapabilities(network); + NetworkCapabilities nc = conn.getNetworkCapabilities(network); - if (nc == null) { - continue; - } + if (nc == null) { + continue; + } - // Skip VPN networks like ourselves - if (nc.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) - continue; + // Skip VPN networks like ourselves + if (nc.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) + continue; - // Also skip mobile networks - if (nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) - continue; + // Also skip mobile networks + if (nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) + continue; - for (LinkAddress la : li.getLinkAddresses()) { - if ((la.getAddress() instanceof Inet4Address && !ipv6) || - (la.getAddress() instanceof Inet6Address && ipv6)) - nets.add(la.toString()); + for (LinkAddress la : li.getLinkAddresses()) { + if ((la.getAddress() instanceof Inet4Address && !ipv6) || + (la.getAddress() instanceof Inet6Address && ipv6)) + nets.add(la.toString()); + } + } catch (SecurityException se) { + se.printStackTrace(); } } } else { |