Merges, and stuff
This commit is contained in:
commit
2abd0265c8
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
|||||||
/local.properties
|
/local.properties
|
||||||
.idea/
|
.idea/
|
||||||
/build
|
/build
|
||||||
|
app/src/main/java/com/topjohnwu/magisk/RootFragment.java
|
@ -120,9 +120,6 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
|
|||||||
String logUrl = repo.getmLogUrl();
|
String logUrl = repo.getmLogUrl();
|
||||||
String supportUrl = repo.getmSupportUrl();
|
String supportUrl = repo.getmSupportUrl();
|
||||||
String donateUrl = repo.getmDonateUrl();
|
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);
|
ignoreAlertUpdate = prefs.getBoolean("ignoreUpdateAlerts",false);
|
||||||
}
|
}
|
||||||
|
@ -236,7 +236,7 @@ public class RootFragment extends Fragment {
|
|||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
rootToggle.setEnabled(true);
|
rootToggle.setEnabled(true);
|
||||||
if (new File("/system/xbin/su").exists()) {
|
if (new File("/magisk/.core/bin/su").exists()) {
|
||||||
// Mounted
|
// Mounted
|
||||||
rootStatusContainer.setBackgroundColor(accent);
|
rootStatusContainer.setBackgroundColor(accent);
|
||||||
rootStatusIcon.setImageResource(statusError);
|
rootStatusIcon.setImageResource(statusError);
|
||||||
@ -257,7 +257,6 @@ public class RootFragment extends Fragment {
|
|||||||
safetyNetStatus.setText(R.string.root_unmounted_info);
|
safetyNetStatus.setText(R.string.root_unmounted_info);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
case 2:
|
case 2:
|
||||||
// Improper root
|
// Improper root
|
||||||
|
Loading…
Reference in New Issue
Block a user