diff options
Diffstat (limited to 'tunnel/src/main/java/com/wireguard/android/backend')
4 files changed, 8 insertions, 14 deletions
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java index 853802d2..4c18d98b 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java @@ -5,11 +5,9 @@ package com.wireguard.android.backend; -import com.wireguard.util.NonNullForAll; - import com.wireguard.config.Config; +import com.wireguard.util.NonNullForAll; -import java.util.Collection; import java.util.Set; import androidx.annotation.Nullable; diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java index bf434cf5..54dc913a 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java @@ -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 diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java index f878a1f0..54bbe912 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java @@ -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; diff --git a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java index c4434e4d..d57a92f9 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java @@ -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; |