diff --git a/.gitignore b/.gitignore index fda3654d5..bd6c20234 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .gradle /local.properties .idea/ -/build \ No newline at end of file +/build +app/src/main/java/com/topjohnwu/magisk/RootFragment.java \ No newline at end of file diff --git a/app/src/main/java/com/topjohnwu/magisk/ReposAdapter.java b/app/src/main/java/com/topjohnwu/magisk/ReposAdapter.java index 26f136e66..b9b86ca78 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ReposAdapter.java +++ b/app/src/main/java/com/topjohnwu/magisk/ReposAdapter.java @@ -120,10 +120,7 @@ public class ReposAdapter extends RecyclerView.Adapter String logUrl = repo.getmLogUrl(); String supportUrl = repo.getmSupportUrl(); String donateUrl = repo.getmDonateUrl(); - if (supportUrl.equals("")) mHolder.supportLink.setBackgroundColor(Color.GRAY); - if (logUrl.equals("")) mHolder.changeLog.setBackgroundColor(Color.GRAY); - if (donateUrl.equals("")) mHolder.authorLink.setBackgroundColor(Color.GRAY); - if (prefs.contains("ignoreUpdateAlerts")) { + if (prefs.contains("ignoreUpdateAlerts")) { ignoreAlertUpdate = prefs.getBoolean("ignoreUpdateAlerts",false); } mHolder.installedStatus.setText(repo.isInstalled() ? this.context.getResources().getString(R.string.module_installed) : this.context.getResources().getString(R.string.module_not_installed)); diff --git a/app/src/main/java/com/topjohnwu/magisk/RootFragment.java b/app/src/main/java/com/topjohnwu/magisk/RootFragment.java index 175a21036..2c2ff9549 100644 --- a/app/src/main/java/com/topjohnwu/magisk/RootFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/RootFragment.java @@ -236,28 +236,27 @@ public class RootFragment extends Fragment { break; } else { rootToggle.setEnabled(true); - if (new File("/system/xbin/su").exists()) { - // Mounted - rootStatusContainer.setBackgroundColor(accent); - rootStatusIcon.setImageResource(statusError); - rootStatus.setTextColor(accent); - rootStatus.setText(R.string.root_mounted); - rootToggle.setChecked(true); - safetyNetStatusIcon.setImageResource(statusError); - safetyNetStatus.setText(R.string.root_mounted_info); - break; - } else { - // Not Mounted - rootStatusContainer.setBackgroundColor(green500); - rootStatusIcon.setImageResource(statusOK); - rootStatus.setTextColor(green500); - rootStatus.setText(R.string.root_unmounted); - rootToggle.setChecked(false); - safetyNetStatusIcon.setImageResource(statusOK); - safetyNetStatus.setText(R.string.root_unmounted_info); - break; + if (new File("/magisk/.core/bin/su").exists()) { + // Mounted + rootStatusContainer.setBackgroundColor(accent); + rootStatusIcon.setImageResource(statusError); + rootStatus.setTextColor(accent); + rootStatus.setText(R.string.root_mounted); + rootToggle.setChecked(true); + safetyNetStatusIcon.setImageResource(statusError); + safetyNetStatus.setText(R.string.root_mounted_info); + break; + } else { + // Not Mounted + rootStatusContainer.setBackgroundColor(green500); + rootStatusIcon.setImageResource(statusOK); + rootStatus.setTextColor(green500); + rootStatus.setText(R.string.root_unmounted); + rootToggle.setChecked(false); + safetyNetStatusIcon.setImageResource(statusOK); + safetyNetStatus.setText(R.string.root_unmounted_info); + break; } - } case 2: // Improper root