diff --git a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java index d9955a7cc..fa0a9b994 100644 --- a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java @@ -33,13 +33,10 @@ public class LogFragment extends Fragment { TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager()); - if (getApplication().isSuClient) { - adapter.addTab(new SuLogFragment(), getString(R.string.superuser)); - tab.setupWithViewPager(viewPager); - tab.setVisibility(View.VISIBLE); - } - + adapter.addTab(new SuLogFragment(), getString(R.string.superuser)); adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk)); + tab.setupWithViewPager(viewPager); + tab.setVisibility(View.VISIBLE); viewPager.setAdapter(adapter); diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java index 8c3a504ed..a11a4435a 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java @@ -17,6 +17,7 @@ import android.widget.CheckBox; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.Spinner; import android.widget.TextView; @@ -59,15 +60,12 @@ public class MagiskFragment extends Fragment @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout; - @BindView(R.id.magisk_update_card) CardView magiskUpdateCard; + @BindView(R.id.magisk_update) RelativeLayout magiskUpdate; @BindView(R.id.magisk_update_icon) ImageView magiskUpdateIcon; @BindView(R.id.magisk_update_status) TextView magiskUpdateText; @BindView(R.id.magisk_update_progress) ProgressBar magiskUpdateProgress; - @BindView(R.id.magisk_status_icon) ImageView magiskStatusIcon; @BindView(R.id.magisk_version) TextView magiskVersionText; - @BindView(R.id.root_status_icon) ImageView rootStatusIcon; - @BindView(R.id.root_status) TextView rootStatusText; @BindView(R.id.safetyNet_card) CardView safetyNetCard; @BindView(R.id.safetyNet_refresh) ImageView safetyNetRefreshIcon; @@ -235,7 +233,7 @@ public class MagiskFragment extends Fragment boolean hasRoot = Shell.rootAccess(); boolean isUpToDate = mm.magiskVersionCode > 1300; - magiskUpdateCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE); + magiskUpdate.setVisibility(hasNetwork ? View.VISIBLE : View.GONE); safetyNetCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE); bootImageCard.setVisibility(hasNetwork && hasRoot ? View.VISIBLE : View.GONE); installOptionCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE); @@ -256,29 +254,6 @@ public class MagiskFragment extends Fragment magiskStatusIcon.setImageResource(image); magiskStatusIcon.setColorFilter(color); - switch (Shell.status) { - case 0: - color = colorBad; - image = R.drawable.ic_cancel; - rootStatusText.setText(R.string.not_rooted); - break; - case 1: - if (mm.suVersion != null) { - color = colorOK; - image = R.drawable.ic_check_circle; - rootStatusText.setText(mm.suVersion); - break; - } - case -1: - default: - color = colorNeutral; - image = R.drawable.ic_help; - rootStatusText.setText(R.string.root_error); - } - - rootStatusIcon.setImageResource(image); - rootStatusIcon.setColorFilter(color); - List items = new ArrayList<>(); if (mm.bootBlock != null) { items.add(getString(R.string.auto_detect, mm.bootBlock)); diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java index 018f75c92..0b5ffa7fc 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java +++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java @@ -49,8 +49,6 @@ public class MagiskManager extends Application { public int remoteManagerVersionCode = -1; public String managerLink; public String bootBlock = null; - public boolean isSuClient = false; - public String suVersion = null; public boolean disabled; public int snet_version; public int updateServiceVersion; @@ -166,11 +164,6 @@ public class MagiskManager extends Application { public void loadMagiskInfo() { List ret; - ret = Shell.sh("su -v"); - if (Utils.isValidShellResponse(ret)) { - suVersion = ret.get(0); - isSuClient = suVersion.toUpperCase().contains("MAGISK"); - } ret = Shell.sh("magisk -v"); if (!Utils.isValidShellResponse(ret)) { ret = Shell.sh("getprop magisk.version"); diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java index 991c290a2..048ea0957 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java @@ -138,8 +138,7 @@ public class MainActivity extends Activity menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus() && Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0); menu.findItem(R.id.log).setVisible(Shell.rootAccess()); - menu.findItem(R.id.superuser).setVisible( - Shell.rootAccess() && getMagiskManager().isSuClient); + menu.findItem(R.id.superuser).setVisible(Shell.rootAccess()); } public void navigate(String item) { diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java index ffe23a714..dd955b40d 100644 --- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java @@ -138,13 +138,8 @@ public class SettingsActivity extends Activity implements Topic.Subscriber { prefScreen.removePreference(magiskCategory); prefScreen.removePreference(suCategory); generalCatagory.removePreference(hideManager); - } else { - if (!mm.isSuClient) { - prefScreen.removePreference(suCategory); - } - if (mm.magiskVersionCode < 1300) { - prefScreen.removePreference(magiskCategory); - } + } else if (mm.magiskVersionCode < 1300) { + prefScreen.removePreference(magiskCategory); } } diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml index d52eb8b7e..25ce1ef4d 100644 --- a/app/src/main/res/layout/fragment_magisk.xml +++ b/app/src/main/res/layout/fragment_magisk.xml @@ -21,7 +21,6 @@ android:orientation="vertical"> - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - -