gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-18 15:47:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Start moving things outside of top Application class

Browse Source
This commit is contained in:
topjohnwu
2018-07-31 03:51:11 +08:00
parent e39f83edbf
commit 914b7ee056
32 changed files with 237 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java
View File

@@ -119,7 +119,7 @@ public class MagiskFragment extends Fragment
shownDialog = true;
// Show Manager update first
if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
if (Global.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
new ManagerInstallDialog((Activity) requireActivity()).show();
return;
}
@@ -146,10 +146,10 @@ public class MagiskFragment extends Fragment
expandableContainer.expandLayout = expandLayout;
setupExpandable();
keepVerityChkbox.setChecked(mm.keepVerity);
keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepVerity = checked);
keepEncChkbox.setChecked(mm.keepEnc);
keepEncChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepEnc = checked);
keepVerityChkbox.setChecked(Global.keepVerity);
keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> Global.keepVerity = checked);
keepEncChkbox.setChecked(Global.keepEnc);
keepEncChkbox.setOnCheckedChangeListener((view, checked) -> Global.keepEnc = checked);
mSwipeRefreshLayout.setOnRefreshListener(this);
updateUI();
@@ -159,7 +159,7 @@ public class MagiskFragment extends Fragment
@Override
public void onRefresh() {
mm.loadMagiskInfo();
Global.loadMagiskInfo();
updateUI();
magiskUpdateText.setText(R.string.checking_for_updates);
@@ -170,8 +170,8 @@ public class MagiskFragment extends Fragment
mm.safetyNetDone.reset();
mm.updateCheckDone.reset();
mm.remoteMagiskVersionString = null;
mm.remoteMagiskVersionCode = -1;
Global.remoteMagiskVersionString = null;
Global.remoteMagiskVersionCode = -1;
collapse();
shownDialog = false;
@@ -214,7 +214,7 @@ public class MagiskFragment extends Fragment
boolean hasNetwork = Download.checkNetworkStatus(mm);
boolean hasRoot = Shell.rootAccess();
boolean isUpToDate = mm.magiskVersionCode > Const.MAGISK_VER.UNIFIED;
boolean isUpToDate = Global.magiskVersionCode > Const.MAGISK_VER.UNIFIED;
magiskUpdate.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
safetyNetCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
@@ -223,14 +223,14 @@ public class MagiskFragment extends Fragment
int image, color;
if (mm.magiskVersionCode < 0) {
if (Global.magiskVersionCode < 0) {
color = colorBad;
image = R.drawable.ic_cancel;
magiskVersionText.setText(R.string.magisk_version_error);
} else {
color = colorOK;
image = R.drawable.ic_check_circle;
magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + mm.magiskVersionString));
magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + Global.magiskVersionString));
}
magiskStatusIcon.setImageResource(image);
@@ -240,7 +240,7 @@ public class MagiskFragment extends Fragment
private void updateCheckUI() {
int image, color;
if (mm.remoteMagiskVersionCode < 0) {
if (Global.remoteMagiskVersionCode < 0) {
color = colorNeutral;
image = R.drawable.ic_help;
magiskUpdateText.setText(R.string.invalid_update_channel);
@@ -248,11 +248,11 @@ public class MagiskFragment extends Fragment
} else {
color = colorOK;
image = R.drawable.ic_check_circle;
magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + mm.remoteMagiskVersionString));
magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + Global.remoteMagiskVersionString));
installButton.setVisibility(View.VISIBLE);
if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
if (Global.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
installText.setText(getString(R.string.update, getString(R.string.app_name)));
} else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
} else if (Global.magiskVersionCode > 0 && Global.remoteMagiskVersionCode > Global.magiskVersionCode) {
installText.setText(getString(R.string.update, getString(R.string.magisk)));
} else {
installText.setText(R.string.install);
@@ -267,10 +267,10 @@ public class MagiskFragment extends Fragment
mSwipeRefreshLayout.setRefreshing(false);
if (!shownDialog) {
if (mm.remoteMagiskVersionCode > mm.magiskVersionCode
|| mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
if (Global.remoteMagiskVersionCode > Global.magiskVersionCode
|| Global.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
install();
} else if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
} else if (Global.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
!ShellUtils.fastCmdResult("env_check")) {
new EnvFixDialog(requireActivity()).show();
}