global: optimize imports

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

3 files changed, 15 insertions, 17 deletions

diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java
index cc7bc082..d44a5976 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java
@@ -5,20 +5,20 @@
 
 package com.wireguard.android.viewmodel;
 
-import com.wireguard.util.NonNullForAll;
-
-import androidx.databinding.ObservableArrayList;
-import androidx.databinding.ObservableList;
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.wireguard.config.BadConfigException;
 import com.wireguard.config.Config;
 import com.wireguard.config.Peer;
+import com.wireguard.util.NonNullForAll;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+
 @NonNullForAll
 public class ConfigProxy implements Parcelable {
     public static final Parcelable.Creator<ConfigProxy> CREATOR = new ConfigProxyCreator();
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java
index da9c4f10..2bf87ea4 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java
@@ -5,12 +5,6 @@
 
 package com.wireguard.android.viewmodel;
 
-import com.wireguard.util.NonNullForAll;
-
-import androidx.databinding.BaseObservable;
-import androidx.databinding.Bindable;
-import androidx.databinding.ObservableArrayList;
-import androidx.databinding.ObservableList;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -21,10 +15,15 @@ import com.wireguard.config.Interface;
 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.List;
 
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
 import java9.util.stream.Collectors;
 import java9.util.stream.StreamSupport;
 
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java b/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java
index 7fc614a1..6e01d35c 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java
@@ -5,15 +5,8 @@
 
 package com.wireguard.android.viewmodel;
 
-import com.wireguard.util.NonNullForAll;
-
-import androidx.databinding.BaseObservable;
-import androidx.databinding.Bindable;
-import androidx.databinding.Observable;
-import androidx.databinding.ObservableList;
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.annotation.Nullable;
 
 import com.wireguard.android.BR;
 import com.wireguard.config.Attribute;
@@ -21,6 +14,7 @@ import com.wireguard.config.BadConfigException;
 import com.wireguard.config.InetEndpoint;
 import com.wireguard.config.Peer;
 import com.wireguard.crypto.Key;
+import com.wireguard.util.NonNullForAll;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -29,6 +23,11 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.annotation.Nullable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.databinding.Observable;
+import androidx.databinding.ObservableList;
 import java9.util.Lists;
 import java9.util.Sets;
 import java9.util.stream.Collectors;