diff options
| author | cyberta <cyberta@riseup.net> | 2020-12-29 19:24:27 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2020-12-29 19:24:27 -0800 |
| commit | f03c21446566546e66c977c72c16fdb87f16ffed (patch) | |
| tree | 4e3d7c5561e963504553ee941cc258b6b2b06d14 /app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity | |
| parent | fd81f2e14e36adb59d534df257e6ba2262cc362f (diff) | |
| parent | 9b690df036cf91f749c0b6159a7035233a73315d (diff) | |
Merge branch 'update_android_10' into 'master'
Update android 10
See merge request leap/bitmask_android!118
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java index 44de1e6d..c5100a67 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java @@ -1,6 +1,6 @@ package se.leap.bitmaskclient.providersetup.connectivity; -import org.jetbrains.annotations.NotNull; +import androidx.annotation.NonNull; import java.net.InetAddress; import java.net.UnknownHostException; @@ -15,7 +15,7 @@ import se.leap.bitmaskclient.base.utils.IPAddress; class DnsResolver implements Dns { @Override - public List<InetAddress> lookup(@NotNull String hostname) throws UnknownHostException { + public List<InetAddress> lookup(@NonNull String hostname) throws UnknownHostException { try { return Dns.SYSTEM.lookup(hostname); } catch (UnknownHostException e) { |