Upgrade Android Studio

ddm · Mar 7, 2019 · 32c65d8 · 32c65d8
1 parent a49328e
commit 32c65d8
Show file tree

Hide file tree

Showing 50 changed files with 157 additions and 142 deletions.
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/Const.java b/app-core/src/main/java/com/topjohnwu/magisk/Const.java
@@ -4,8 +4,6 @@
 import android.os.Process;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
 
 public class Const {
 

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/BaseModule.java b/app-core/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
@@ -5,10 +5,10 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.util.List;
-
 import androidx.annotation.NonNull;
 
+import java.util.List;
+
 public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
 
     private String mId, mName, mVersion, mAuthor, mDescription;

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/Policy.java b/app-core/src/main/java/com/topjohnwu/magisk/container/Policy.java
@@ -4,10 +4,10 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
-import com.topjohnwu.magisk.utils.Utils;
-
 import androidx.annotation.NonNull;
 
+import com.topjohnwu.magisk.utils.Utils;
+
 
 public class Policy implements Comparable<Policy>{
     public static final int INTERACTIVE = 0;

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java b/app-core/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java
@@ -1,14 +1,14 @@
 package com.topjohnwu.magisk.container;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-
 public class ValueSortedMap<K, V extends Comparable<? super V>> extends HashMap<K, V> {
 
     private List<V> sorted = new ArrayList<>();

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java b/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
@@ -4,6 +4,9 @@
 import android.os.Build;
 import android.text.TextUtils;
 
+import androidx.annotation.MainThread;
+import androidx.annotation.WorkerThread;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
@@ -37,9 +40,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import androidx.annotation.MainThread;
-import androidx.annotation.WorkerThread;
-
 public abstract class MagiskInstaller {
 
     private List<String> console, logs;

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java b/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
@@ -6,6 +6,8 @@
 import android.content.res.Resources;
 import android.os.Build;
 
+import androidx.annotation.StringRes;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.superuser.Shell;
@@ -17,8 +19,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.StringRes;
-
 public class LocaleManager {
     public static Locale locale = Locale.getDefault();
     public final static Locale defaultLocale = Locale.getDefault();

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java b/app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.core.R;
@@ -11,8 +13,6 @@
 
 import java.io.InputStream;
 
-import androidx.annotation.NonNull;
-
 public class RootUtils extends Shell.Initializer {
 
     public static void rmAndLaunch(String rm, String launch) {

diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java b/app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java
@@ -1,14 +1,14 @@
 package com.topjohnwu.magisk.utils;
 
+import androidx.annotation.IntDef;
+
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashSet;
 import java.util.Set;
 
-import androidx.annotation.IntDef;
-
 public class Topic {
 
     public static final int MAGISK_HIDE_DONE = 0;

diff --git a/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java b/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
@@ -8,6 +8,11 @@
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.topjohnwu.magisk.adapters.StringListAdapter;
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.tasks.FlashZip;
@@ -26,10 +31,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.OnClick;

diff --git a/app/src/full/java/com/topjohnwu/magisk/MainActivity.java b/app/src/full/java/com/topjohnwu/magisk/MainActivity.java
@@ -8,6 +8,13 @@
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.google.android.material.navigation.NavigationView;
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.fragments.LogFragment;
@@ -22,12 +29,6 @@
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.widget.Toolbar;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
 import butterknife.BindView;
 
 public class MainActivity extends BaseActivity

diff --git a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
@@ -5,6 +5,8 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.tasks.UpdateRepos;
@@ -16,8 +18,6 @@
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
 
-import androidx.appcompat.app.AlertDialog;
-
 public class SplashActivity extends BaseActivity {
 
     @Override

diff --git a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
@@ -4,7 +4,6 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.text.TextUtils;
@@ -17,6 +16,9 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
@@ -25,8 +27,6 @@
 
 import java.io.IOException;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
 import butterknife.BindView;
 
 public class SuRequestActivity extends BaseActivity {

diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
@@ -9,6 +9,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.Module;
@@ -17,8 +20,6 @@
 
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 
 public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {

diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
@@ -9,6 +9,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.Policy;
@@ -22,9 +26,6 @@
 
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 
 public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {

diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
@@ -12,6 +12,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.BaseActivity;
@@ -26,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 
 public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder> {

diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java
@@ -7,13 +7,13 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import java.util.List;
-
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.List;
+
 public abstract class StringListAdapter<VH extends StringListAdapter.ViewHolder>
         extends RecyclerView.Adapter<VH> {
 

diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
@@ -9,6 +9,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.SuLogEntry;
 import com.topjohnwu.magisk.database.MagiskDB;
@@ -19,7 +21,6 @@
 import java.util.List;
 import java.util.Set;
 
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 
 public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {

diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java
@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.adapters;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TabFragmentAdapter extends FragmentPagerAdapter {
 
     private List<Fragment> fragmentList;

diff --git a/app/src/full/java/com/topjohnwu/magisk/components/BaseActivity.java b/app/src/full/java/com/topjohnwu/magisk/components/BaseActivity.java
@@ -10,13 +10,6 @@
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.Topic;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
@@ -25,6 +18,13 @@
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Topic;
+
 public abstract class BaseActivity extends AppCompatActivity implements Topic.AutoSubscriber {
 
     public static final String INTENT_PERM = "perm_dialog";

diff --git a/app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java b/app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
@@ -2,10 +2,11 @@
 
 import android.content.Intent;
 
+import androidx.fragment.app.Fragment;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.utils.Topic;
 
-import androidx.fragment.app.Fragment;
 import butterknife.Unbinder;
 
 public abstract class BaseFragment extends Fragment implements Topic.AutoSubscriber {

diff --git a/app/src/full/java/com/topjohnwu/magisk/components/BasePreferenceFragment.java b/app/src/full/java/com/topjohnwu/magisk/components/BasePreferenceFragment.java
@@ -8,10 +8,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Topic;
-
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
@@ -20,6 +16,10 @@
 import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Topic;
+
 public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
         implements SharedPreferences.OnSharedPreferenceChangeListener, Topic.AutoSubscriber {