global: optimize imports

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-03-09 12:21:35 -06:00
parent 8e8643122e
commit 40ebf8006e
65 changed files with 223 additions and 281 deletions
@@ -5,8 +5,6 @@

 package com.wireguard.android.fragment;

-import com.wireguard.util.NonNullForAll;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -14,10 +12,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.app.AlertDialog;
 import android.widget.Toast;

 import com.wireguard.android.Application;
@@ -27,11 +21,16 @@ import com.wireguard.android.model.ApplicationData;
 import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.util.ObservableKeyedArrayList;
 import com.wireguard.android.util.ObservableKeyedList;
+import com.wireguard.util.NonNullForAll;

 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import java9.util.Comparators;
 import java9.util.stream.Collectors;
 import java9.util.stream.StreamSupport;
@@ -5,29 +5,29 @@

 package com.wireguard.android.fragment;

-import com.wireguard.util.NonNullForAll;
-
 import android.content.Context;
 import android.content.Intent;
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
-import androidx.annotation.Nullable;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;

+import com.google.android.material.snackbar.Snackbar;
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.activity.BaseActivity;
 import com.wireguard.android.activity.BaseActivity.OnSelectedTunnelChangedListener;
 import com.wireguard.android.backend.GoBackend;
+import com.wireguard.android.backend.Tunnel.State;
 import com.wireguard.android.databinding.TunnelDetailFragmentBinding;
 import com.wireguard.android.databinding.TunnelListItemBinding;
 import com.wireguard.android.model.ObservableTunnel;
-import com.wireguard.android.backend.Tunnel.State;
 import com.wireguard.android.util.ErrorMessages;
+import com.wireguard.util.NonNullForAll;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.fragment.app.Fragment;

 /**
 * Base class for fragments that need to know the currently-selected tunnel. Only does anything when
@@ -5,16 +5,11 @@

 package com.wireguard.android.fragment;

-import com.wireguard.util.NonNullForAll;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
 import android.view.inputmethod.InputMethodManager;

 import com.wireguard.android.Application;
@@ -22,12 +17,17 @@ import com.wireguard.android.R;
 import com.wireguard.android.databinding.ConfigNamingDialogFragmentBinding;
 import com.wireguard.config.BadConfigException;
 import com.wireguard.config.Config;
+import com.wireguard.util.NonNullForAll;

 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;

+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
@NonNullForAll
 public class ConfigNamingDialogFragment extends DialogFragment {
    private static final String KEY_CONFIG_TEXT = "config_text";
@@ -5,12 +5,7 @@

 package com.wireguard.android.fragment;

-import com.wireguard.util.NonNullForAll;
-
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -18,16 +13,20 @@ import android.view.View;
 import android.view.ViewGroup;

 import com.wireguard.android.R;
+import com.wireguard.android.backend.Tunnel.State;
 import com.wireguard.android.databinding.TunnelDetailFragmentBinding;
 import com.wireguard.android.databinding.TunnelDetailPeerBinding;
 import com.wireguard.android.model.ObservableTunnel;
-import com.wireguard.android.backend.Tunnel.State;
 import com.wireguard.android.ui.EdgeToEdge;
 import com.wireguard.crypto.Key;
+import com.wireguard.util.NonNullForAll;

 import java.util.Timer;
 import java.util.TimerTask;

+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+
 /**
 * Fragment that shows details about a specific tunnel.
 */
@@ -5,15 +5,9 @@

 package com.wireguard.android.fragment;

-import com.wireguard.util.NonNullForAll;
-
 import android.app.Activity;
 import android.content.Context;
-import androidx.databinding.ObservableList;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import com.google.android.material.snackbar.Snackbar;
-
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -24,6 +18,7 @@ import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;

+import com.google.android.material.snackbar.Snackbar;
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.databinding.TunnelEditorFragmentBinding;
@@ -34,11 +29,15 @@ import com.wireguard.android.ui.EdgeToEdge;
 import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.viewmodel.ConfigProxy;
 import com.wireguard.config.Config;
+import com.wireguard.util.NonNullForAll;

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

+import androidx.annotation.Nullable;
+import androidx.databinding.ObservableList;
+
 /**
 * Fragment for editing a WireGuard configuration.
 */
@@ -5,8 +5,6 @@

 package com.wireguard.android.fragment;

-import com.wireguard.util.NonNullForAll;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -16,13 +14,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.OpenableColumns;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.snackbar.Snackbar;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.view.ActionMode;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -30,6 +21,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;

+import com.google.android.material.snackbar.Snackbar;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 import com.wireguard.android.Application;
@@ -44,6 +36,7 @@ import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.widget.MultiselectableRelativeLayout;
 import com.wireguard.config.BadConfigException;
 import com.wireguard.config.Config;
+import com.wireguard.util.NonNullForAll;

 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -59,6 +52,11 @@ import java.util.Locale;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
 import java9.util.concurrent.CompletableFuture;
 import java9.util.stream.StreamSupport;