From be4c52f6a3e1c87fb8f16c7eafc1beca0d8d36a4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 10 Feb 2020 16:55:34 +0100 Subject: InetAddresses: don't have global android import This allows a proper fallback on normal JRE. --- app/src/main/java/com/wireguard/config/InetAddresses.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/wireguard/config/InetAddresses.java b/app/src/main/java/com/wireguard/config/InetAddresses.java index d24c5716..5303e27f 100644 --- a/app/src/main/java/com/wireguard/config/InetAddresses.java +++ b/app/src/main/java/com/wireguard/config/InetAddresses.java @@ -5,7 +5,6 @@ package com.wireguard.config; -import android.os.Build; import java.lang.reflect.Method; import java.net.Inet4Address; import java.net.Inet6Address; @@ -25,7 +24,7 @@ public final class InetAddresses { static { Method m = null; 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 m = InetAddress.class.getMethod("parseNumericAddress", String.class); } catch (final Exception ignored) { @@ -45,7 +44,7 @@ public final class InetAddresses { if (address.isEmpty()) throw new ParseException(InetAddress.class, address, "Empty address"); 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); else if (PARSER_METHOD != null) return (InetAddress) PARSER_METHOD.invoke(null, address); -- cgit v1.2.3-59-g8ed1b