From a2544768a0b56d218fcdc5cbfad428a2b86cc0c3 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 1 Aug 2018 14:30:59 +0800 Subject: [PATCH] Remove boilderplate --- .../full/java/com/topjohnwu/magisk/MagiskFragment.java | 4 ---- app/src/full/java/com/topjohnwu/magisk/MainActivity.java | 4 ---- .../full/java/com/topjohnwu/magisk/ModulesFragment.java | 2 +- app/src/full/java/com/topjohnwu/magisk/ReposFragment.java | 2 -- .../full/java/com/topjohnwu/magisk/SettingsActivity.java | 6 +++--- .../full/java/com/topjohnwu/magisk/SplashActivity.java | 1 - app/src/full/java/com/topjohnwu/magisk/SuLogFragment.java | 2 -- .../full/java/com/topjohnwu/magisk/SuperuserFragment.java | 4 +--- .../com/topjohnwu/magisk/components/FlavorActivity.java | 6 ++---- .../java/com/topjohnwu/magisk/components/Fragment.java | 8 +++++--- .../topjohnwu/magisk/components/InstallMethodDialog.java | 2 -- .../topjohnwu/magisk/components/MagiskInstallDialog.java | 2 +- .../topjohnwu/magisk/components/ManagerInstallDialog.java | 2 +- .../com/topjohnwu/magisk/components/UninstallDialog.java | 3 +-- .../com/topjohnwu/magisk/database/RepoDatabaseHelper.java | 3 +-- .../com/topjohnwu/magisk/receivers/PackageReceiver.java | 4 ++-- .../com/topjohnwu/magisk/receivers/ShortcutReceiver.java | 3 +-- .../com/topjohnwu/magisk/superuser/RequestActivity.java | 4 ---- app/src/full/java/com/topjohnwu/magisk/utils/Utils.java | 7 +------ 19 files changed, 20 insertions(+), 49 deletions(-) diff --git a/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java b/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java index a356a5b45..87e927d33 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java @@ -45,8 +45,6 @@ public class MagiskFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener, ExpandableView, Topic.Subscriber { private Container expandableContainer = new Container(); - - private MagiskManager mm; private Unbinder unbinder; private static boolean shownDialog = false; @@ -140,8 +138,6 @@ public class MagiskFragment extends Fragment unbinder = ButterKnife.bind(this, v); requireActivity().setTitle(R.string.magisk); - mm = getApplication(); - expandableContainer.expandLayout = expandLayout; setupExpandable(); diff --git a/app/src/full/java/com/topjohnwu/magisk/MainActivity.java b/app/src/full/java/com/topjohnwu/magisk/MainActivity.java index dc6ecf8f4..e71db135d 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MainActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/MainActivity.java @@ -42,9 +42,6 @@ public class MainActivity extends Activity @Override protected void onCreate(final Bundle savedInstanceState) { - - MagiskManager mm = getMagiskManager(); - if (!mm.hasInit) { Intent intent = new Intent(this, SplashActivity.class); String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION); @@ -121,7 +118,6 @@ public class MainActivity extends Activity } public void checkHideSection() { - MagiskManager mm = getMagiskManager(); Menu menu = navigationView.getMenu(); menu.findItem(R.id.magiskhide).setVisible( Shell.rootAccess() && Data.magiskVersionCode >= Const.MAGISK_VER.UNIFIED diff --git a/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java b/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java index 03c47dae7..e10915bc1 100644 --- a/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java @@ -130,7 +130,7 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber { private void updateUI() { listModules.clear(); - listModules.addAll(getApplication().moduleMap.values()); + listModules.addAll(mm.moduleMap.values()); if (listModules.size() == 0) { emptyRv.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.GONE); diff --git a/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java b/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java index b70f2aaf4..e1c3aa34e 100644 --- a/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java @@ -26,7 +26,6 @@ import butterknife.Unbinder; public class ReposFragment extends Fragment implements Topic.Subscriber { private Unbinder unbinder; - private MagiskManager mm; @BindView(R.id.recyclerView) RecyclerView recyclerView; @BindView(R.id.empty_rv) TextView emptyRv; @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout; @@ -44,7 +43,6 @@ public class ReposFragment extends Fragment implements Topic.Subscriber { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_repos, container, false); unbinder = ButterKnife.bind(this, view); - mm = getApplication(); mSwipeRefreshLayout.setRefreshing(true); diff --git a/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java index a85a896f7..e4cafa0c6 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java @@ -97,7 +97,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { setPreferencesFromResource(R.xml.app_settings, rootKey); - mm = Utils.getMagiskManager(getActivity()); + mm = Data.MM(); prefs = mm.prefs; prefScreen = getPreferenceScreen(); @@ -126,10 +126,10 @@ public class SettingsActivity extends Activity implements Topic.Subscriber { updateChannel.setOnPreferenceChangeListener((pref, o) -> { Data.updateChannel = Integer.parseInt((String) o); if (Data.updateChannel == Const.Value.CUSTOM_CHANNEL) { - View v = LayoutInflater.from(getActivity()).inflate(R.layout.custom_channel_dialog, null); + View v = LayoutInflater.from(requireActivity()).inflate(R.layout.custom_channel_dialog, null); EditText url = v.findViewById(R.id.custom_url); url.setText(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, "")); - new AlertDialog.Builder(getActivity()) + new AlertDialog.Builder(requireActivity()) .setTitle(R.string.settings_update_custom) .setView(v) .setPositiveButton(R.string.ok, (d, i) -> diff --git a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java index e319ecc08..5289d2fe3 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java @@ -23,7 +23,6 @@ public class SplashActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - MagiskManager mm = getMagiskManager(); // Force create a shell if not created yet boolean root = Shell.rootAccess(); diff --git a/app/src/full/java/com/topjohnwu/magisk/SuLogFragment.java b/app/src/full/java/com/topjohnwu/magisk/SuLogFragment.java index 44bb9a932..ec7ec826a 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SuLogFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/SuLogFragment.java @@ -24,7 +24,6 @@ public class SuLogFragment extends Fragment { @BindView(R.id.recyclerView) RecyclerView recyclerView; private Unbinder unbinder; - private MagiskManager mm; private SuLogAdapter adapter; @Override @@ -45,7 +44,6 @@ public class SuLogFragment extends Fragment { // Inflate the layout for this fragment View v = inflater.inflate(R.layout.fragment_su_log, container, false); unbinder = ButterKnife.bind(this, v); - mm = getApplication(); adapter = new SuLogAdapter(mm.mDB); recyclerView.setAdapter(adapter); diff --git a/app/src/full/java/com/topjohnwu/magisk/SuperuserFragment.java b/app/src/full/java/com/topjohnwu/magisk/SuperuserFragment.java index 71f80d63a..bfb522d48 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SuperuserFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/SuperuserFragment.java @@ -23,7 +23,6 @@ public class SuperuserFragment extends Fragment { private Unbinder unbinder; private PackageManager pm; - private MagiskManager mm; @BindView(R.id.recyclerView) RecyclerView recyclerView; @BindView(R.id.empty_rv) TextView emptyRv; @@ -34,14 +33,13 @@ public class SuperuserFragment extends Fragment { unbinder = ButterKnife.bind(this, view); pm = getActivity().getPackageManager(); - mm = getApplication(); return view; } @Override public void onStart() { super.onStart(); - getActivity().setTitle(getString(R.string.superuser)); + requireActivity().setTitle(getString(R.string.superuser)); } @Override diff --git a/app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java b/app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java index b8bfb28e3..6472c1af2 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java @@ -19,6 +19,7 @@ public abstract class FlavorActivity extends AppCompatActivity implements Topic. private ActivityResultListener activityResultListener; static int[] EMPTY_INT_ARRAY = new int[0]; + public MagiskManager mm; @Override protected void attachBaseContext(Context base) { @@ -26,6 +27,7 @@ public abstract class FlavorActivity extends AppCompatActivity implements Topic. Configuration config = base.getResources().getConfiguration(); config.setLocale(LocaleManager.locale); applyOverrideConfiguration(config); + mm = Data.MM(); } @Override @@ -38,10 +40,6 @@ public abstract class FlavorActivity extends AppCompatActivity implements Topic. return -1; } - public MagiskManager getMagiskManager() { - return (MagiskManager) super.getApplication(); - } - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/full/java/com/topjohnwu/magisk/components/Fragment.java b/app/src/full/java/com/topjohnwu/magisk/components/Fragment.java index ded53aae6..d32b7c009 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/Fragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/Fragment.java @@ -2,14 +2,16 @@ package com.topjohnwu.magisk.components; import android.content.Intent; +import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.utils.Topic; -import com.topjohnwu.magisk.utils.Utils; public class Fragment extends android.support.v4.app.Fragment implements Topic.AutoSubscriber { - public MagiskManager getApplication() { - return Utils.getMagiskManager(getActivity()); + public MagiskManager mm; + + public Fragment() { + mm = Data.MM(); } @Override diff --git a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java index 0d38d835d..aaae7cc8b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java @@ -10,7 +10,6 @@ import android.widget.Toast; import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.FlashActivity; -import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.receivers.DownloadReceiver; import com.topjohnwu.magisk.utils.Download; @@ -22,7 +21,6 @@ class InstallMethodDialog extends AlertDialog.Builder { InstallMethodDialog(Activity activity, List options, String filename) { super(activity); - MagiskManager mm = Utils.getMagiskManager(activity); setTitle(R.string.select_method); setItems(options.toArray(new String [0]), (dialog, idx) -> { Intent intent; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java index 3e0b07d64..393482a34 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java @@ -18,7 +18,7 @@ import java.util.List; public class MagiskInstallDialog extends CustomAlertDialog { public MagiskInstallDialog(Activity activity) { super(activity); - MagiskManager mm = Utils.getMagiskManager(activity); + MagiskManager mm = Data.MM(); String filename = Utils.fmt("Magisk-v%s(%d).zip", Data.remoteMagiskVersionString, Data.remoteMagiskVersionCode); setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk))); diff --git a/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java index 3c068d6a7..6f4accf78 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java @@ -17,7 +17,7 @@ public class ManagerInstallDialog extends CustomAlertDialog { public ManagerInstallDialog(@NonNull Activity activity) { super(activity); - MagiskManager mm = Utils.getMagiskManager(activity); + MagiskManager mm = Data.MM(); String filename = Utils.fmt("MagiskManager-v%s(%d).apk", Data.remoteManagerVersionString, Data.remoteManagerVersionCode); setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name))); diff --git a/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java index 277ba5437..fa1ad9290 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java @@ -15,13 +15,12 @@ import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.RestoreImages; import com.topjohnwu.magisk.receivers.DownloadReceiver; import com.topjohnwu.magisk.utils.Download; -import com.topjohnwu.magisk.utils.Utils; public class UninstallDialog extends CustomAlertDialog { public UninstallDialog(@NonNull Activity activity) { super(activity); - MagiskManager mm = Utils.getMagiskManager(activity); + MagiskManager mm = Data.MM(); setTitle(R.string.uninstall_magisk_title); setMessage(R.string.uninstall_magisk_msg); setNeutralButton(R.string.restore_img, (d, i) -> new RestoreImages(activity).exec()); diff --git a/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java b/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java index 586f557f9..632f52013 100644 --- a/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java +++ b/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java @@ -9,7 +9,6 @@ import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.container.Repo; -import com.topjohnwu.magisk.utils.Utils; import java.util.HashSet; import java.util.Set; @@ -24,7 +23,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper { public RepoDatabaseHelper(Context context) { super(context, "repo.db", null, DATABASE_VER); - mm = Utils.getMagiskManager(context); + mm = Data.MM(); mDb = getWritableDatabase(); // Remove outdated repos diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java b/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java index 3342ca43c..153858071 100644 --- a/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java +++ b/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java @@ -5,14 +5,14 @@ import android.content.Context; import android.content.Intent; import com.topjohnwu.magisk.Const; +import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; -import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; public class PackageReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - MagiskManager mm = Utils.getMagiskManager(context); + MagiskManager mm = Data.MM(); String pkg = intent.getData().getEncodedSchemeSpecificPart(); diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java b/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java index 1edcc99ab..9997f64cd 100644 --- a/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java +++ b/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java @@ -14,7 +14,6 @@ import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.SplashActivity; -import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; import java.util.ArrayList; @@ -23,7 +22,7 @@ public class ShortcutReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { - MagiskManager mm = Utils.getMagiskManager(context); + MagiskManager mm = Data.MM(); ShortcutManager manager = context.getSystemService(ShortcutManager.class); manager.setDynamicShortcuts(getShortCuts(mm)); } diff --git a/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java b/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java index ada8ecb06..8de972cee 100644 --- a/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java @@ -21,13 +21,11 @@ import android.widget.TextView; import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; -import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.ParallelTask; import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.container.Policy; import com.topjohnwu.magisk.utils.FingerprintHelper; -import com.topjohnwu.magisk.utils.Utils; import java.io.DataInputStream; import java.io.IOException; @@ -50,7 +48,6 @@ public class RequestActivity extends Activity { private String socketPath; private LocalSocket socket; private PackageManager pm; - private MagiskManager mm; private boolean hasTimeout; private Policy policy; @@ -68,7 +65,6 @@ public class RequestActivity extends Activity { supportRequestWindowFeature(Window.FEATURE_NO_TITLE); pm = getPackageManager(); - mm = Utils.getMagiskManager(this); mm.mDB.clearOutdated(); Intent intent = getIntent(); diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java index 451dbbe9a..311709c02 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java @@ -27,10 +27,6 @@ public class Utils { return getPrefsInt(prefs, key, 0); } - public static MagiskManager getMagiskManager(Context context) { - return (MagiskManager) context.getApplicationContext(); - } - public static String getNameFromUri(Context context, Uri uri) { String name = null; try (Cursor c = context.getContentResolver().query(uri, null, null, null, null)) { @@ -50,8 +46,7 @@ public class Utils { } public static int dpInPx(int dp) { - Context context = Data.MM(); - float scale = context.getResources().getDisplayMetrics().density; + float scale = Data.MM().getResources().getDisplayMetrics().density; return (int) (dp * scale + 0.5); }