frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

global: optimize imports

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2020-03-09 12:21:35 -06:00
parent 8e8643122e
commit 40ebf8006e
65 changed files with 223 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tunnel/src/main/java/com/wireguard/android/backend/Backend.java
+1 -3
View File
@@ -5,11 +5,9 @@
package com.wireguard.android.backend;
import com.wireguard.config.Config;
import com.wireguard.util.NonNullForAll;
import com.wireguard.config.Config;
import java.util.Collection;
import java.util.Set;
import androidx.annotation.Nullable;
tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+3 -4
View File
@@ -5,14 +5,10 @@
package com.wireguard.android.backend;
import com.wireguard.util.NonNullForAll;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import androidx.annotation.Nullable;
import androidx.collection.ArraySet;
import android.util.Log;
import com.wireguard.android.backend.BackendException.Reason;
@@ -23,6 +19,7 @@ import com.wireguard.config.InetNetwork;
import com.wireguard.config.Peer;
import com.wireguard.crypto.Key;
import com.wireguard.crypto.KeyFormatException;
import com.wireguard.util.NonNullForAll;
import java.net.InetAddress;
import java.util.Collections;
@@ -30,6 +27,8 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import androidx.annotation.Nullable;
import androidx.collection.ArraySet;
import java9.util.concurrent.CompletableFuture;
@NonNullForAll
tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
+1 -2
View File
@@ -5,12 +5,11 @@
package com.wireguard.android.backend;
import com.wireguard.util.NonNullForAll;
import android.os.SystemClock;
import android.util.Pair;
import com.wireguard.crypto.Key;
import com.wireguard.util.NonNullForAll;
import java.util.HashMap;
import java.util.Map;
tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+3 -5
View File
@@ -5,10 +5,6 @@
package com.wireguard.android.backend;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import android.content.Context;
import android.util.Log;
import android.util.Pair;
@@ -19,6 +15,7 @@ import com.wireguard.android.util.RootShell;
import com.wireguard.android.util.ToolsInstaller;
import com.wireguard.config.Config;
import com.wireguard.crypto.Key;
import com.wireguard.util.NonNullForAll;
import java.io.File;
import java.io.FileOutputStream;
@@ -26,14 +23,15 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.HashMap;
import androidx.annotation.Nullable;
import java9.util.stream.Collectors;
import java9.util.stream.Stream;
tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java
+1 -2
View File
@@ -5,13 +5,12 @@
package com.wireguard.android.util;
import com.wireguard.util.NonNullForAll;
import android.content.Context;
import android.system.OsConstants;
import android.util.Base64;
import com.wireguard.android.util.RootShell.RootShellException;
import com.wireguard.util.NonNullForAll;
import net.i2p.crypto.eddsa.EdDSAEngine;
import net.i2p.crypto.eddsa.EdDSAPublicKey;
tunnel/src/main/java/com/wireguard/android/util/RootShell.java
+3 -3
View File
@@ -5,13 +5,11 @@
package com.wireguard.android.util;
import com.wireguard.util.NonNullForAll;
import android.content.Context;
import androidx.annotation.Nullable;
import android.util.Log;
import com.wireguard.android.util.RootShell.RootShellException.Reason;
import com.wireguard.util.NonNullForAll;
import java.io.BufferedReader;
import java.io.File;
@@ -22,6 +20,8 @@ import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.UUID;
import androidx.annotation.Nullable;
/**
* Helper class for running commands as root.
*/
tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
+2 -2
View File
@@ -5,12 +5,12 @@
package com.wireguard.android.util;
import com.wireguard.util.NonNullForAll;
import android.content.Context;
import android.os.Build;
import android.util.Log;
import com.wireguard.util.NonNullForAll;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
+3 -3
View File
@@ -5,14 +5,12 @@
package com.wireguard.android.util;
import com.wireguard.util.NonNullForAll;
import android.content.Context;
import androidx.annotation.Nullable;
import android.system.OsConstants;
import android.util.Log;
import com.wireguard.android.util.RootShell.RootShellException;
import com.wireguard.util.NonNullForAll;
import java.io.File;
import java.io.FileNotFoundException;
@@ -20,6 +18,8 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import androidx.annotation.Nullable;
/**
* Helper to install WireGuard tools to the system partition.
*/
tunnel/src/main/java/com/wireguard/config/BadConfigException.java
+1 -2
View File
@@ -5,12 +5,11 @@
package com.wireguard.config;
import com.wireguard.crypto.KeyFormatException;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import com.wireguard.crypto.KeyFormatException;
@NonNullForAll
public class BadConfigException extends Exception {
private final Location location;
tunnel/src/main/java/com/wireguard/config/Config.java
+3 -4
View File
@@ -5,13 +5,10 @@
package com.wireguard.config;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import com.wireguard.config.BadConfigException.Location;
import com.wireguard.config.BadConfigException.Reason;
import com.wireguard.config.BadConfigException.Section;
import com.wireguard.util.NonNullForAll;
import java.io.BufferedReader;
import java.io.IOException;
@@ -25,6 +22,8 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
import androidx.annotation.Nullable;
/**
* Represents the contents of a wg-quick configuration file, made up of one or more "Interface"
* sections (combined together), and zero or more "Peer" sections (treated individually).
tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
+1 -2
View File
@@ -7,8 +7,6 @@ package com.wireguard.config;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import org.threeten.bp.Duration;
import org.threeten.bp.Instant;
@@ -19,6 +17,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.regex.Pattern;
import androidx.annotation.Nullable;
import java9.util.Optional;
tunnel/src/main/java/com/wireguard/config/Interface.java
+2 -4
View File
@@ -5,16 +5,13 @@
package com.wireguard.config;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import com.wireguard.config.BadConfigException.Location;
import com.wireguard.config.BadConfigException.Reason;
import com.wireguard.config.BadConfigException.Section;
import com.wireguard.crypto.Key;
import com.wireguard.crypto.KeyFormatException;
import com.wireguard.crypto.KeyPair;
import com.wireguard.util.NonNullForAll;
import java.net.InetAddress;
import java.util.Collection;
@@ -25,6 +22,7 @@ import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import androidx.annotation.Nullable;
import java9.util.Lists;
import java9.util.Optional;
import java9.util.stream.Collectors;
tunnel/src/main/java/com/wireguard/config/Peer.java
+2 -4
View File
@@ -5,15 +5,12 @@
package com.wireguard.config;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import com.wireguard.config.BadConfigException.Location;
import com.wireguard.config.BadConfigException.Reason;
import com.wireguard.config.BadConfigException.Section;
import com.wireguard.crypto.Key;
import com.wireguard.crypto.KeyFormatException;
import com.wireguard.util.NonNullForAll;
import java.util.Collection;
import java.util.Collections;
@@ -22,6 +19,7 @@ import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import androidx.annotation.Nullable;
import java9.util.Optional;
/**
tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
+2 -2
View File
@@ -8,10 +8,10 @@ package com.wireguard.crypto;
import com.wireguard.util.NonNullForAll;
import androidx.annotation.Nullable;
import java.util.Arrays;
import androidx.annotation.Nullable;
/**
* Implementation of the Curve25519 elliptic curve algorithm.
* <p>
tunnel/src/main/java/com/wireguard/crypto/Key.java
+1 -2
View File
@@ -5,9 +5,8 @@
package com.wireguard.crypto;
import com.wireguard.util.NonNullForAll;
import com.wireguard.crypto.KeyFormatException.Type;
import com.wireguard.util.NonNullForAll;
import java.security.MessageDigest;
import java.security.SecureRandom;