MarcoBuster/Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Read only the first line instead of loading the whole file"

Browse Source 
This reverts commit a5b573eaaa.

The file shall always have one single line, no need to create a new method
This commit is contained in:
topjohnwu 2017-01-28 01:25:51 +08:00
parent 978b3a64c5
commit 09bdbc1224
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View File

@ -218,8 +218,9 @@ public class Async {
protected boolean unzipAndCheck() { protected boolean unzipAndCheck() {
ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android"); ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android");
String line = Utils.readFirstLine(mCachedFile.getParent() + "/META-INF/com/google/android/updater-script"); List<String> ret;
return line != null && line.contains("#MAGISK"); ret = Utils.readFile(mCachedFile.getParent() + "/META-INF/com/google/android/updater-script");
return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
} }
@Override @Override

11
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View File

@ -75,17 +75,6 @@ public class Utils {
return ret; return ret;
} }
public static String readFirstLine(String path) {
List<String> 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) { public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
if (isDownloading) { if (isDownloading) {
return; return;