organize all imports

app/src/main/java/com/btchip/comm/BTChipTransport.java

@@ -20,8 +20,6 @@
 
 package com.btchip.comm;
 
-import com.btchip.BTChipException;
-
 public interface BTChipTransport {
     byte[] exchange(byte[] command);
 

app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java

@@ -28,7 +28,6 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbRequest;
 
-import com.btchip.BTChipException;
 import com.btchip.comm.BTChipTransport;
 import com.btchip.comm.LedgerHelper;
 import com.btchip.utils.Dump;

app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java

@@ -16,8 +16,6 @@
 
 package com.m2049r.xmrwallet;
 
-import androidx.annotation.NonNull;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -37,6 +35,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -49,7 +49,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.m2049r.xmrwallet.data.DefaultNodes;
 import com.m2049r.xmrwallet.data.Node;
 import com.m2049r.xmrwallet.data.NodeInfo;
-import com.m2049r.xmrwallet.dialog.CreditsFragment;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
 import com.m2049r.xmrwallet.ledger.Ledger;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;

app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java

@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;

app/src/main/java/com/m2049r/xmrwallet/MainActivity.java

@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 import com.m2049r.xmrwallet.onboarding.OnBoardingActivity;
 import com.m2049r.xmrwallet.onboarding.OnBoardingManager;

app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java

@@ -19,12 +19,13 @@ package com.m2049r.xmrwallet;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 

app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java

@@ -16,6 +16,8 @@
 
 package com.m2049r.xmrwallet;
 
+import static android.view.WindowManager.LayoutParams;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
@@ -29,8 +31,6 @@ import com.m2049r.xmrwallet.util.LocaleHelper;
 
 import java.util.Locale;
 
-import static android.view.WindowManager.LayoutParams;
-
 public abstract class SecureActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {

app/src/main/java/com/m2049r/xmrwallet/TxFragment.java

@@ -44,8 +44,6 @@ import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.service.WalletService;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;

app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java

@@ -21,8 +21,6 @@ import android.text.Html;
 import android.text.Spanned;
 import android.widget.TextView;
 
-import androidx.core.content.ContextCompat;
-
 import com.m2049r.levin.scanner.LevinPeer;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.util.NetCipherHelper;

app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java

@@ -19,15 +19,16 @@ package com.m2049r.xmrwallet.dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java

@@ -17,9 +17,6 @@
 package com.m2049r.xmrwallet.fragment.send;
 
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,7 +25,6 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputLayout;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.data.UserNotes;

app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java

@@ -17,10 +17,11 @@
 package com.m2049r.xmrwallet.layout;
 
 import android.content.Context;
-import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import androidx.viewpager.widget.ViewPager;
+
 import com.m2049r.xmrwallet.fragment.send.SendFragment;
 
 public class SpendViewPager extends ViewPager {

app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java

@@ -26,7 +26,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -35,8 +34,6 @@ import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.service.WalletService;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 

app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java

@@ -25,7 +25,6 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 import lombok.Getter;

app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingManager.java

@@ -19,8 +19,6 @@ package com.m2049r.xmrwallet.onboarding;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.m2049r.xmrwallet.util.KeyStoreHelper;
-
 import java.util.Date;
 
 import timber.log.Timber;

app/src/main/java/com/m2049r/xmrwallet/service/exchange/krakenEcb/ExchangeApiImpl.java

@@ -25,7 +25,6 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
 import com.m2049r.xmrwallet.util.Helper;
 
-import okhttp3.OkHttpClient;
 import timber.log.Timber;
 
 /*

app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/CreateOrderImpl.java

@@ -23,7 +23,6 @@ import com.m2049r.xmrwallet.service.shift.NetworkCallback;
 import com.m2049r.xmrwallet.service.shift.ShiftApiCall;
 import com.m2049r.xmrwallet.service.shift.ShiftCallback;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.CreateOrder;
-import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
 import com.m2049r.xmrwallet.util.DateHelper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 

app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderParametersImpl.java

@@ -20,9 +20,8 @@ import androidx.annotation.NonNull;
 
 import com.m2049r.xmrwallet.service.shift.NetworkCallback;
 import com.m2049r.xmrwallet.service.shift.ShiftApiCall;
-import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters;
-import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
 import com.m2049r.xmrwallet.service.shift.ShiftCallback;
+import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 
 import org.json.JSONException;

app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderStatusImpl.java

@@ -20,9 +20,9 @@ import androidx.annotation.NonNull;
 
 import com.m2049r.xmrwallet.service.shift.NetworkCallback;
 import com.m2049r.xmrwallet.service.shift.ShiftApiCall;
-import com.m2049r.xmrwallet.util.DateHelper;
-import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderStatus;
 import com.m2049r.xmrwallet.service.shift.ShiftCallback;
+import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderStatus;
+import com.m2049r.xmrwallet.util.DateHelper;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -32,7 +32,6 @@ import java.text.ParseException;
 import java.util.Date;
 
 import lombok.Getter;
-import timber.log.Timber;
 
 class QueryOrderStatusImpl implements QueryOrderStatus {
 

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -68,7 +68,6 @@ import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
-import java.util.Calendar;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 

app/src/main/java/com/m2049r/xmrwallet/util/NightmodeHelper.java

@@ -18,7 +18,6 @@ package com.m2049r.xmrwallet.util;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import androidx.appcompat.app.AppCompatDelegate;

app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java

@@ -19,10 +19,11 @@
 package com.m2049r.xmrwallet.widget;
 
 import android.content.Context;
-import com.google.android.material.textfield.TextInputLayout;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
+import com.google.android.material.textfield.TextInputLayout;
+
 public class CTextInputLayout extends TextInputLayout {
     public CTextInputLayout(Context context) {
         super(context);

app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java

@@ -20,9 +20,10 @@ package com.m2049r.xmrwallet.widget;
 
 import android.content.Context;
 import android.graphics.Rect;
-import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
+
 public class DropDownEditText extends AppCompatAutoCompleteTextView {
 
     public DropDownEditText(Context context) {

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java

@@ -42,9 +42,9 @@ import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

app/src/main/java/com/theromus/sha/Keccak.java

@@ -1,9 +1,9 @@
 package com.theromus.sha;
 
-import static com.theromus.utils.HexUtils.leftRotate64;
-import static com.theromus.utils.HexUtils.convertToUint;
-import static com.theromus.utils.HexUtils.convertFromLittleEndianTo64;
 import static com.theromus.utils.HexUtils.convertFrom64ToLittleEndian;
+import static com.theromus.utils.HexUtils.convertFromLittleEndianTo64;
+import static com.theromus.utils.HexUtils.convertToUint;
+import static com.theromus.utils.HexUtils.leftRotate64;
 import static java.lang.Math.min;
 import static java.lang.System.arraycopy;
 import static java.util.Arrays.fill;

app/src/test/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeRateTest.java

@@ -16,6 +16,8 @@
 
 package com.m2049r.xmrwallet.service.exchange.ecb;
 
+import static org.junit.Assert.assertEquals;
+
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeException;
@@ -38,8 +40,6 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-import static org.junit.Assert.assertEquals;
-
 
 public class ExchangeRateTest {
 

app/src/test/java/com/m2049r/xmrwallet/service/exchange/kraken/ExchangeRateTest.java

@@ -16,6 +16,8 @@
 
 package com.m2049r.xmrwallet.service.exchange.kraken;
 
+import static org.junit.Assert.assertEquals;
+
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeException;
@@ -38,8 +40,6 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-import static org.junit.Assert.assertEquals;
-
 
 public class ExchangeRateTest {
 

app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiOrderParameterTest.java

@@ -16,10 +16,12 @@
 
 package com.m2049r.xmrwallet.service.shift.sideshift;
 
+import static org.junit.Assert.assertEquals;
+
+import com.m2049r.xmrwallet.service.shift.ShiftCallback;
 import com.m2049r.xmrwallet.service.shift.ShiftException;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
-import com.m2049r.xmrwallet.service.shift.ShiftCallback;
 import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl;
 import com.m2049r.xmrwallet.util.NetCipherHelper;
 
@@ -38,8 +40,6 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-import static org.junit.Assert.assertEquals;
-
 public class SideShiftApiOrderParameterTest {
 
     private MockWebServer mockWebServer;

app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiRequestQuoteTest.java

@@ -16,6 +16,8 @@
 
 package com.m2049r.xmrwallet.service.shift.sideshift;
 
+import static org.junit.Assert.assertEquals;
+
 import com.m2049r.xmrwallet.service.shift.ShiftCallback;
 import com.m2049r.xmrwallet.service.shift.ShiftError;
 import com.m2049r.xmrwallet.service.shift.ShiftException;
@@ -40,8 +42,6 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-import static org.junit.Assert.assertEquals;
-
 public class SideShiftApiRequestQuoteTest {
 
     private MockWebServer mockWebServer;

app/src/test/java/com/m2049r/xmrwallet/util/HelperTest.java

@@ -16,12 +16,10 @@
 
 package com.m2049r.xmrwallet.util;
 
-import org.junit.Test;
-
-import java.math.BigDecimal;
-
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 public class HelperTest {
 
     @Test

app/src/test/java/com/m2049r/xmrwallet/util/OpenAliasHelperTest.java

@@ -16,7 +16,9 @@
 
 package com.m2049r.xmrwallet.util;
 
-import com.m2049r.xmrwallet.data.BarcodeData;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -24,10 +26,6 @@ import org.junit.rules.ExpectedException;
 
 import java.util.Map;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 public class OpenAliasHelperTest {
 
     private final static String MONERUJO = "oa1:xmr recipient_address=4AdkPJoxn7JCvAby9szgnt93MSEwdnxdhaASxbTBm6x5dCwmsDep2UYN4FhStDn5i11nsJbpU7oj59ahg8gXb1Mg3viqCuk; recipient_name=Monerujo Development; tx_description=Donation to Monerujo Core Team;";

app/src/test/java/com/m2049r/xmrwallet/util/RestoreHeightTest.java

@@ -16,12 +16,12 @@
 
 package com.m2049r.xmrwallet.util;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import static org.junit.Assert.assertTrue;
-
 // all ranges go back 5 days
 
 public class RestoreHeightTest {

app/src/test/java/com/m2049r/xmrwallet/util/UserNoteTest.java

@@ -16,14 +16,14 @@
 
 package com.m2049r.xmrwallet.util;
 
-import com.m2049r.xmrwallet.data.UserNotes;
-
-import org.junit.Test;
-
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import com.m2049r.xmrwallet.data.UserNotes;
+
+import org.junit.Test;
+
 public class UserNoteTest {
 
     @Test

app/src/test/java/com/m2049r/xmrwallet/util/ledger/MoneroTest.java

@@ -16,13 +16,13 @@
 
 package com.m2049r.xmrwallet.util.ledger;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 public class MoneroTest {
 
     @Rule

app/src/test/java/com/m2049r/xmrwallet/util/validator/BitcoinAddressValidatorTest.java

@@ -16,11 +16,11 @@
 
 package com.m2049r.xmrwallet.util.validator;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 
 public class BitcoinAddressValidatorTest {
 

app/src/test/java/com/m2049r/xmrwallet/util/validator/EthAddressValidatorTest.java

@@ -16,11 +16,11 @@
 
 package com.m2049r.xmrwallet.util.validator;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 
 public class EthAddressValidatorTest {