Skip to content
This repository was archived by the owner on Jun 24, 2024. It is now read-only.

Fix Zlib bug in android 12 and above #193

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions applier/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-keep class com.google.archivepatcher.applier.zip.CustomDeflater {*;}
-keepclassmembers class com.google.archivepatcher.applier.zip.CustomDeflater {*;}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.archivepatcher.applier;

import com.google.archivepatcher.shared.JreDeflateParameters;
import com.google.archivepatcher.applier.zip.CustomDeflater;
import com.google.archivepatcher.shared.TypedRange;

import java.io.FilterOutputStream;
Expand Down Expand Up @@ -135,11 +136,11 @@ private int writeChunk(byte[] buffer, int offset, int length) throws IOException
// Compression will begin immediately.
JreDeflateParameters parameters = nextCompressedRange.getMetadata();
if (deflater == null) {
deflater = new Deflater(parameters.level, parameters.nowrap);
deflater = new CustomDeflater(parameters.level, parameters.nowrap);
} else if (lastDeflateParameters.nowrap != parameters.nowrap) {
// Last deflater must be destroyed because nowrap settings do not match.
deflater.end();
deflater = new Deflater(parameters.level, parameters.nowrap);
deflater = new CustomDeflater(parameters.level, parameters.nowrap);
}
// Deflater will already have been reset at the end of this method, no need to do it again.
// Just set up the right parameters.
Expand Down
Loading