From be88df436f32569c4b97f73d589cfd64351cf08f Mon Sep 17 00:00:00 2001 From: Srikanth Reddy Lingala Date: Wed, 23 Mar 2022 05:38:25 -0400 Subject: [PATCH] Remove duplicate code --- .../net/lingala/zip4j/headers/HeaderReader.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/lingala/zip4j/headers/HeaderReader.java b/src/main/java/net/lingala/zip4j/headers/HeaderReader.java index 36ddfd50..e60da7f5 100755 --- a/src/main/java/net/lingala/zip4j/headers/HeaderReader.java +++ b/src/main/java/net/lingala/zip4j/headers/HeaderReader.java @@ -19,6 +19,7 @@ import net.lingala.zip4j.exception.ZipException; import net.lingala.zip4j.io.inputstream.NumberedSplitRandomAccessFile; import net.lingala.zip4j.model.AESExtraDataRecord; +import net.lingala.zip4j.model.AbstractFileHeader; import net.lingala.zip4j.model.CentralDirectory; import net.lingala.zip4j.model.DataDescriptor; import net.lingala.zip4j.model.DigitalSignature; @@ -612,7 +613,7 @@ public DataDescriptor readDataDescriptor(InputStream inputStream, boolean isZip6 return dataDescriptor; } - private void readAesExtraDataRecord(FileHeader fileHeader, RawIO rawIO) throws ZipException { + private void readAesExtraDataRecord(AbstractFileHeader fileHeader, RawIO rawIO) throws ZipException { if (fileHeader.getExtraDataRecords() == null || fileHeader.getExtraDataRecords().size() <= 0) { return; } @@ -624,18 +625,6 @@ private void readAesExtraDataRecord(FileHeader fileHeader, RawIO rawIO) throws Z } } - private void readAesExtraDataRecord(LocalFileHeader localFileHeader, RawIO rawIO) throws ZipException { - if (localFileHeader.getExtraDataRecords() == null || localFileHeader.getExtraDataRecords().size() <= 0) { - return; - } - - AESExtraDataRecord aesExtraDataRecord = readAesExtraDataRecord(localFileHeader.getExtraDataRecords(), rawIO); - if (aesExtraDataRecord != null) { - localFileHeader.setAesExtraDataRecord(aesExtraDataRecord); - localFileHeader.setEncryptionMethod(EncryptionMethod.AES); - } - } - private AESExtraDataRecord readAesExtraDataRecord(List extraDataRecords, RawIO rawIO) throws ZipException {