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

Fix unzip issues

Browse Source
This commit is contained in:
topjohnwu 2017-09-03 21:05:57 +08:00
parent 4d8d79372a
commit b4d948886c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View File

@ -91,11 +91,11 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
if (in == null) throw new FileNotFoundException(); if (in == null) throw new FileNotFoundException();
BufferedInputStream buf = new BufferedInputStream(in); BufferedInputStream buf = new BufferedInputStream(in);
buf.mark(Integer.MAX_VALUE); buf.mark(Integer.MAX_VALUE);
ZipUtils.unzip(buf, install, arch, true); ZipUtils.unzip(buf, install, arch + "/", true);
buf.reset(); buf.reset();
ZipUtils.unzip(buf, install, "common", true); ZipUtils.unzip(buf, install, "common/", true);
buf.reset(); buf.reset();
ZipUtils.unzip(buf, install, "chromeos", false); ZipUtils.unzip(buf, install, "chromeos/", false);
buf.reset(); buf.reset();
ZipUtils.unzip(buf, install, "META-INF/com/google/android/update-binary", true); ZipUtils.unzip(buf, install, "META-INF/com/google/android/update-binary", true);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {

2
app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
View File

@ -139,7 +139,7 @@ public class ZipUtils {
continue; continue;
} }
// Don't include placeholder // Don't include placeholder
if (path.contains("system/placeholder")) { if (path.equals("system/placeholder")) {
continue; continue;
} }
dest.putNextEntry(new JarEntry(path)); dest.putNextEntry(new JarEntry(path));