Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

InetAddresses: don't have global android import

Browse Source 
This allows a proper fallback on normal JRE.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-02-10 16:55:34 +01:00
parent 66b46c8618
commit f8c5f238ea
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/wireguard/config/InetAddresses.java
View File

@ -5,7 +5,6 @@
package com.wireguard.config; package com.wireguard.config;
import android.os.Build;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.Inet6Address; import java.net.Inet6Address;
@ -25,7 +24,7 @@ public final class InetAddresses {
static { static {
Method m = null; Method m = null;
try { try {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.Q)
// noinspection JavaReflectionMemberAccess // noinspection JavaReflectionMemberAccess
m = InetAddress.class.getMethod("parseNumericAddress", String.class); m = InetAddress.class.getMethod("parseNumericAddress", String.class);
} catch (final Exception ignored) { } catch (final Exception ignored) {
@ -45,7 +44,7 @@ public final class InetAddresses {
if (address.isEmpty()) if (address.isEmpty())
throw new ParseException(InetAddress.class, address, "Empty address"); throw new ParseException(InetAddress.class, address, "Empty address");
try { try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
return android.net.InetAddresses.parseNumericAddress(address); return android.net.InetAddresses.parseNumericAddress(address);
else if (PARSER_METHOD != null) else if (PARSER_METHOD != null)
return (InetAddress) PARSER_METHOD.invoke(null, address); return (InetAddress) PARSER_METHOD.invoke(null, address);