MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 18:45:49 +01:00
Code Releases Wiki Activity

refactor zip utility functions

Browse Source
This commit is contained in:
MPeter 2022-09-01 13:37:22 +02:00
parent ce18a5a6f8
commit ee7b76517a
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipUtils.java
View File

@ -15,23 +15,32 @@ public class ZipUtils {
public static byte[] getFileFromZip(final byte[] zipBytes, final String path) { public static byte[] getFileFromZip(final byte[] zipBytes, final String path) {
try (ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(zipBytes))) { try (ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
ZipEntry zipEntry; ZipEntry zipEntry;
while ((zipEntry = zipInputStream.getNextEntry()) != null) { while ((zipEntry = zipInputStream.getNextEntry()) != null) {
if (zipEntry.getName().equals(path)) { if (!zipEntry.getName().equals(path)) continue; // TODO: is this always a path? The documentation is very vague.
return readAllBytes(zipInputStream);
// Found, but not a file
if (zipEntry.isDirectory()) {
LOG.error(String.format("Path in ZIP file is a directory: %s", path));
return null;
} }
// Found, and it is a file
return readAllBytes(zipInputStream);
} }
// Not found
LOG.error(String.format("Path in ZIP file was not found: %s", path));
return null;
} catch (final IOException e) { } catch (final IOException e) {
LOG.error(String.format("Failed to read %s from zip", path), e); LOG.error(String.format("Unknown error while reading file from ZIP file: %s", path), e);
return null; return null;
} }
LOG.debug("{} not found in zip", path);
return null;
} }
public static byte[] readAllBytes(final InputStream is) throws IOException { private static byte[] readAllBytes(final InputStream is) throws IOException {
final ByteArrayOutputStream buffer = new ByteArrayOutputStream(); final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
int n; int n;