From 834c16485c0e490d68b0b0391d497f7267e59394 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 3 Sep 2017 02:34:23 +0800 Subject: [PATCH] Reduce unnecessary code --- .../com/topjohnwu/magisk/MagiskFragment.java | 21 +++++++++---------- .../com/topjohnwu/magisk/utils/Utils.java | 8 ------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java index 02d42e937..8d9638cef 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java @@ -351,17 +351,16 @@ public class MagiskFragment extends Fragment private void updateUI() { ((MainActivity) getActivity()).checkHideSection(); - final int ROOT = 0x1, NETWORK = 0x2, UPTODATE = 0x4; - int status = 0; - status |= Shell.rootAccess() ? ROOT : 0; - status |= Utils.checkNetworkStatus(magiskManager) ? NETWORK : 0; - status |= magiskManager.magiskVersionCode >= 1300 ? UPTODATE : 0; - magiskUpdateCard.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE); - safetyNetCard.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE); - bootImageCard.setVisibility(Utils.checkBits(status, NETWORK, ROOT) ? View.VISIBLE : View.GONE); - installOptionCard.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE); - installButton.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE); - uninstallButton.setVisibility(Utils.checkBits(status, UPTODATE, ROOT) ? View.VISIBLE : View.GONE); + boolean hasNetwork = Utils.checkNetworkStatus(getActivity()); + boolean hasRoot = Shell.rootAccess(); + boolean isUpToDate = magiskManager.magiskVersionCode > 1300; + + magiskUpdateCard.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); + installButton.setVisibility(hasNetwork ? View.VISIBLE : View.GONE); + uninstallButton.setVisibility(isUpToDate && hasRoot ? View.VISIBLE : View.GONE); int image, color; diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java index 859b2878c..80131912e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java @@ -185,14 +185,6 @@ public class Utils { return networkInfo != null && networkInfo.isConnected(); } - public static boolean checkBits(int bits, int... masks) { - for (int mask : masks) { - if ((bits & mask) == 0) - return false; - } - return true; - } - public static void showMagiskUpdate(MagiskManager magiskManager) { NotificationCompat.Builder builder = new NotificationCompat.Builder(magiskManager, MagiskManager.NOTIFICATION_CHANNEL); builder.setSmallIcon(R.drawable.ic_magisk)