Bladeren bron

InetAddresses: don't have global android import

This allows a proper fallback on normal JRE.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
master
Jason A. Donenfeld 4 jaren geleden
bovenliggende
commit
f8c5f238ea
1 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. +2
    -3
      app/src/main/java/com/wireguard/config/InetAddresses.java

+ 2
- 3
app/src/main/java/com/wireguard/config/InetAddresses.java Bestand weergeven

@@ -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);


Laden…
Annuleren
Opslaan