diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java index f408e3dff..5989c324e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java @@ -218,8 +218,9 @@ public class Async { protected boolean unzipAndCheck() { ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android"); - String line = Utils.readFirstLine(mCachedFile.getParent() + "/META-INF/com/google/android/updater-script"); - return line != null && line.contains("#MAGISK"); + List ret; + ret = Utils.readFile(mCachedFile.getParent() + "/META-INF/com/google/android/updater-script"); + return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK"); } @Override 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 08aeddd1a..36a90e652 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java @@ -75,17 +75,6 @@ public class Utils { return ret; } - public static String readFirstLine(String path) { - List ret; - String command = "head -1 " + path; - if (Shell.rootAccess()) { - ret = Shell.su(command); - } else { - ret = Shell.sh(command); - } - return isValidShellResponse(ret) ? ret.get(0) : null; - } - public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) { if (isDownloading) { return;