global: get rid of nonnull gradle hack

Hacking things up via gradle is not right, and package-info.java poses problems with two modules, so instead we just apply it manually to every class. Remember to add this to new classes! Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-03-09 12:19:15 -06:00
parent c00a0b12e4
commit 8e8643122e
77 changed files with 216 additions and 89 deletions
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply from: rootProject.file('nonnull.gradle')

 android {
    buildToolsVersion '29.0.3'
@@ -5,6 +5,8 @@

 package com.wireguard.android.backend;

+import com.wireguard.util.NonNullForAll;
+
 import com.wireguard.config.Config;

 import java.util.Collection;
@@ -16,6 +18,7 @@ import androidx.annotation.Nullable;
 * Interface for implementations of the WireGuard secure network tunnel.
 */

+@NonNullForAll
 public interface Backend {
    /**
     * Enumerate names of currently-running tunnels.
@@ -5,6 +5,9 @@

 package com.wireguard.android.backend;

+import com.wireguard.util.NonNullForAll;
+
+@NonNullForAll
 public final class BackendException extends Exception {
    public enum Reason {
        UNKNOWN_KERNEL_MODULE_NAME,
@@ -5,6 +5,8 @@

 package com.wireguard.android.backend;

+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -30,6 +32,7 @@ import java.util.concurrent.TimeoutException;

 import java9.util.concurrent.CompletableFuture;

+@NonNullForAll
 public final class GoBackend implements Backend {
    private static final String TAG = "WireGuard/" + GoBackend.class.getSimpleName();
    private static CompletableFuture<VpnService> vpnService = new CompletableFuture<>();
@@ -5,6 +5,8 @@

 package com.wireguard.android.backend;

+import com.wireguard.util.NonNullForAll;
+
 import android.os.SystemClock;
 import android.util.Pair;

@@ -13,6 +15,7 @@ import com.wireguard.crypto.Key;
 import java.util.HashMap;
 import java.util.Map;

+@NonNullForAll
 public class Statistics {
    private long lastTouched = SystemClock.elapsedRealtime();
    private final Map<Key, Pair<Long, Long>> peerBytes = new HashMap<>();
@@ -5,12 +5,15 @@

 package com.wireguard.android.backend;

+import com.wireguard.util.NonNullForAll;
+
 import java.util.regex.Pattern;

 /**
 * Represents a WireGuard tunnel.
 */

+@NonNullForAll
 public interface Tunnel {
    enum State {
        DOWN,
@@ -5,6 +5,8 @@

 package com.wireguard.android.backend;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import android.content.Context;
@@ -39,6 +41,7 @@ import java9.util.stream.Stream;
 * WireGuard backend that uses {@code wg-quick} to implement tunnel configuration.
 */

+@NonNullForAll
 public final class WgQuickBackend implements Backend {
    private static final String TAG = "WireGuard/" + WgQuickBackend.class.getSimpleName();

@@ -5,6 +5,8 @@

 package com.wireguard.android.util;

+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import android.system.OsConstants;
 import android.util.Base64;
@@ -36,6 +38,7 @@ import java.util.Map;

 import androidx.annotation.Nullable;

+@NonNullForAll
 public class ModuleLoader {
    private static final String MODULE_PUBLIC_KEY_BASE64 = "RWRmHuT9PSqtwfsLtEx+QS06BJtLgFYteL9WCNjH7yuyu5Y1DieSN7If";
    private static final String MODULE_LIST_URL = "https://download.wireguard.com/android-module/modules.txt.sig";
@@ -5,6 +5,8 @@

 package com.wireguard.android.util;

+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import androidx.annotation.Nullable;
 import android.util.Log;
@@ -24,6 +26,7 @@ import java.util.UUID;
 * Helper class for running commands as root.
 */

+@NonNullForAll
 public class RootShell {
    private static final String SU = "su";
    private static final String TAG = "WireGuard/" + RootShell.class.getSimpleName();
@@ -5,6 +5,8 @@

 package com.wireguard.android.util;

+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import android.os.Build;
 import android.util.Log;
@@ -19,6 +21,7 @@ import java.util.HashSet;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;

+@NonNullForAll
 public final class SharedLibraryLoader {
    private static final String TAG = "WireGuard/" + SharedLibraryLoader.class.getSimpleName();

@@ -5,6 +5,8 @@

 package com.wireguard.android.util;

+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import androidx.annotation.Nullable;
 import android.system.OsConstants;
@@ -22,6 +24,7 @@ import java.util.List;
 * Helper to install WireGuard tools to the system partition.
 */

+@NonNullForAll
 public final class ToolsInstaller {
    public static final int ERROR = 0x0;
    public static final int MAGISK = 0x4;
@@ -5,12 +5,15 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import java.util.Iterator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import java9.util.Optional;

+@NonNullForAll
 public final class Attribute {
    private static final Pattern LINE_PATTERN = Pattern.compile("(\\w+)\\s*=\\s*([^\\s#][^#]*)");
    private static final Pattern LIST_SEPARATOR = Pattern.compile("\\s*,\\s*");
@@ -5,10 +5,13 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import com.wireguard.crypto.KeyFormatException;

+@NonNullForAll
 public class BadConfigException extends Exception {
    private final Location location;
    private final Reason reason;
@@ -5,6 +5,8 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import com.wireguard.config.BadConfigException.Location;
@@ -29,6 +31,7 @@ import java.util.Set;
 * <p>
 * Instances of this class are immutable.
 */
+@NonNullForAll
 public final class Config {
    private final Interface interfaze;
    private final List<Peer> peers;
@@ -5,6 +5,8 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import java.lang.reflect.Method;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -17,6 +19,7 @@ import androidx.annotation.Nullable;
 /**
 * Utility methods for creating instances of {@link InetAddress}.
 */
+@NonNullForAll
 public final class InetAddresses {
    @Nullable private static final Method PARSER_METHOD;
    private static final Pattern WONT_TOUCH_RESOLVER = Pattern.compile("^(((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?)|((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$");
@@ -5,6 +5,8 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import org.threeten.bp.Duration;
@@ -25,6 +27,7 @@ import java9.util.Optional;
 * <p>
 * Instances of this class are externally immutable.
 */
+@NonNullForAll
 public final class InetEndpoint {
    private static final Pattern BARE_IPV6 = Pattern.compile("^[^\\[\\]]*:[^\\[\\]]*");
    private static final Pattern FORBIDDEN_CHARACTERS = Pattern.compile("[/?#]");
@@ -5,6 +5,8 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import java.net.Inet4Address;
 import java.net.InetAddress;

@@ -13,6 +15,7 @@ import java.net.InetAddress;
 * <p>
 * Instances of this class are immutable.
 */
+@NonNullForAll
 public final class InetNetwork {
    private final InetAddress address;
    private final int mask;
@@ -5,6 +5,8 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import com.wireguard.config.BadConfigException.Location;
@@ -35,6 +37,7 @@ import java9.util.stream.StreamSupport;
 * <p>
 * Instances of this class are immutable.
 */
+@NonNullForAll
 public final class Interface {
    private static final int MAX_UDP_PORT = 65535;
    private static final int MIN_UDP_PORT = 0;
@@ -5,10 +5,13 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 /**
 */
+@NonNullForAll
 public class ParseException extends Exception {
    private final Class<?> parsingClass;
    private final CharSequence text;
@@ -5,6 +5,8 @@

 package com.wireguard.config;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import com.wireguard.config.BadConfigException.Location;
@@ -28,6 +30,7 @@ import java9.util.Optional;
 * <p>
 * Instances of this class are immutable.
 */
+@NonNullForAll
 public final class Peer {
    private final Set<InetNetwork> allowedIps;
    private final Optional<InetEndpoint> endpoint;
@@ -6,6 +6,8 @@

 package com.wireguard.crypto;

+import com.wireguard.util.NonNullForAll;
+
 import androidx.annotation.Nullable;

 import java.util.Arrays;
@@ -25,6 +27,7 @@ import java.util.Arrays;
 * References: http://cr.yp.to/ecdh.html, RFC 7748
 */
@SuppressWarnings({"MagicNumber", "NonConstantFieldWithUpperCaseName", "SuspiciousNameCombination"})
+@NonNullForAll
 public final class Curve25519 {
    // Numbers modulo 2^255 - 19 are broken up into ten 26-bit words.
    private static final int NUM_LIMBS_255BIT = 10;
@@ -5,6 +5,8 @@

 package com.wireguard.crypto;

+import com.wireguard.util.NonNullForAll;
+
 import com.wireguard.crypto.KeyFormatException.Type;

 import java.security.MessageDigest;
@@ -18,6 +20,7 @@ import java.util.Arrays;
 * Instances of this class are immutable.
 */
@SuppressWarnings("MagicNumber")
+@NonNullForAll
 public final class Key {
    private final byte[] key;

@@ -5,11 +5,14 @@

 package com.wireguard.crypto;

+import com.wireguard.util.NonNullForAll;
+
 /**
 * An exception thrown when attempting to parse an invalid key (too short, too long, or byte
 * data inappropriate for the format). The format being parsed can be accessed with the
 * {@link #getFormat} method.
 */
+@NonNullForAll
 public final class KeyFormatException extends Exception {
    private final Key.Format format;
    private final Type type;
@@ -5,11 +5,14 @@

 package com.wireguard.crypto;

+import com.wireguard.util.NonNullForAll;
+
 /**
 * Represents a Curve25519 key pair as used by WireGuard.
 * <p>
 * Instances of this class are immutable.
 */
+@NonNullForAll
 public class KeyPair {
    private final Key privateKey;
    private final Key publicKey;
@@ -22,5 +22,6 @@ import javax.annotation.meta.TypeQualifierDefault;
@Nonnull
@TypeQualifierDefault({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
+
 public @interface NonNullForAll {
 }