diff options
Diffstat (limited to 'ui/src/main/java/com/wireguard/android/util')
10 files changed, 22 insertions, 31 deletions
diff --git a/ui/src/main/java/com/wireguard/android/util/AsyncWorker.java b/ui/src/main/java/com/wireguard/android/util/AsyncWorker.java index f8341976..461e2b64 100644 --- a/ui/src/main/java/com/wireguard/android/util/AsyncWorker.java +++ b/ui/src/main/java/com/wireguard/android/util/AsyncWorker.java @@ -5,10 +5,10 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - import android.os.Handler; +import com.wireguard.util.NonNullForAll; + import java.util.concurrent.Executor; import java9.util.concurrent.CompletableFuture; diff --git a/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.java b/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.java index 649fe261..e9f65c59 100644 --- a/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.java +++ b/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.java @@ -5,15 +5,15 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import com.google.android.material.snackbar.Snackbar; import android.view.View; import android.widget.TextView; +import com.google.android.material.snackbar.Snackbar; +import com.wireguard.util.NonNullForAll; + /** * Standalone utilities for interacting with the system clipboard. */ diff --git a/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.java b/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.java index 3f80a562..b4772ef4 100644 --- a/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.java +++ b/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.java @@ -5,8 +5,6 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; @@ -18,6 +16,7 @@ import android.provider.MediaStore; import android.provider.MediaStore.MediaColumns; import com.wireguard.android.R; +import com.wireguard.util.NonNullForAll; import java.io.File; import java.io.FileOutputStream; diff --git a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.java b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.java index 3b818251..accc7ef7 100644 --- a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.java +++ b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.java @@ -5,13 +5,9 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - import android.content.res.Resources; import android.os.RemoteException; -import androidx.annotation.Nullable; - import com.wireguard.android.Application; import com.wireguard.android.R; import com.wireguard.android.backend.BackendException; @@ -24,11 +20,13 @@ import com.wireguard.config.ParseException; import com.wireguard.crypto.Key.Format; import com.wireguard.crypto.KeyFormatException; import com.wireguard.crypto.KeyFormatException.Type; +import com.wireguard.util.NonNullForAll; import java.net.InetAddress; import java.util.EnumMap; import java.util.Map; +import androidx.annotation.Nullable; import java9.util.Maps; @NonNullForAll diff --git a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.java b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.java index 3e56bd55..8a58afbe 100644 --- a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.java +++ b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.java @@ -5,11 +5,9 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - -import androidx.annotation.Nullable; import android.util.Log; +import androidx.annotation.Nullable; import java9.util.function.BiConsumer; /** diff --git a/ui/src/main/java/com/wireguard/android/util/FragmentUtils.java b/ui/src/main/java/com/wireguard/android/util/FragmentUtils.java index 50a49fa1..f93fd60d 100644 --- a/ui/src/main/java/com/wireguard/android/util/FragmentUtils.java +++ b/ui/src/main/java/com/wireguard/android/util/FragmentUtils.java @@ -4,13 +4,13 @@ */ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - import android.content.Context; -import androidx.preference.Preference; import android.view.ContextThemeWrapper; import com.wireguard.android.activity.SettingsActivity; +import com.wireguard.util.NonNullForAll; + +import androidx.preference.Preference; @NonNullForAll public final class FragmentUtils { diff --git a/ui/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java b/ui/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java index bf16d921..e233588c 100644 --- a/ui/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java +++ b/ui/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java @@ -5,17 +5,16 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - -import androidx.databinding.ObservableArrayList; -import androidx.annotation.Nullable; - import com.wireguard.util.Keyed; +import com.wireguard.util.NonNullForAll; import java.util.Collection; import java.util.ListIterator; import java.util.Objects; +import androidx.annotation.Nullable; +import androidx.databinding.ObservableArrayList; + /** * ArrayList that allows looking up elements by some key property. As the key property must always * be retrievable, this list cannot hold {@code null} elements. Because this class places no diff --git a/ui/src/main/java/com/wireguard/android/util/ObservableKeyedList.java b/ui/src/main/java/com/wireguard/android/util/ObservableKeyedList.java index 1c430493..b191655e 100644 --- a/ui/src/main/java/com/wireguard/android/util/ObservableKeyedList.java +++ b/ui/src/main/java/com/wireguard/android/util/ObservableKeyedList.java @@ -5,13 +5,12 @@ package com.wireguard.android.util; +import com.wireguard.util.Keyed; +import com.wireguard.util.KeyedList; import com.wireguard.util.NonNullForAll; import androidx.databinding.ObservableList; -import com.wireguard.util.Keyed; -import com.wireguard.util.KeyedList; - /** * A list that is both keyed and observable. */ diff --git a/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java b/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java index 77d6bbf3..3af354b2 100644 --- a/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java +++ b/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java @@ -5,11 +5,8 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - -import androidx.annotation.Nullable; - import com.wireguard.util.Keyed; +import com.wireguard.util.NonNullForAll; import com.wireguard.util.SortedKeyedList; import java.util.AbstractList; @@ -21,6 +18,8 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.Spliterator; +import androidx.annotation.Nullable; + /** * KeyedArrayList that enforces uniqueness and sorted order across the set of keys. This class uses * binary search to improve lookup and replacement times to O(log(n)). However, due to the diff --git a/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java b/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java index 59531408..84e72e1e 100644 --- a/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java +++ b/ui/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java @@ -5,9 +5,8 @@ package com.wireguard.android.util; -import com.wireguard.util.NonNullForAll; - import com.wireguard.util.Keyed; +import com.wireguard.util.NonNullForAll; import com.wireguard.util.SortedKeyedList; /** |