From 81c6813a6bea19559b1a2319f534b6a2d471aba5 Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Sat, 15 Feb 2025 18:33:54 +0300
Subject: [PATCH] Fix[nativesextractor]: improve style, address
 performance/debuggability concerns

---
 .../pojavlaunch/tasks/NativesExtractor.java   | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/NativesExtractor.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/NativesExtractor.java
index feabd6afc..c7453ab49 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/NativesExtractor.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/NativesExtractor.java
@@ -42,7 +42,8 @@ public class NativesExtractor {
     }
 
     private static String getAarArchitectureName() {
-        switch (Architecture.getDeviceArchitecture()) {
+        int architecture = Architecture.getDeviceArchitecture();
+        switch (architecture) {
             case Architecture.ARCH_ARM:
                 return "armeabi-v7a";
             case Architecture.ARCH_ARM64:
@@ -52,37 +53,33 @@ public class NativesExtractor {
             case Architecture.ARCH_X86_64:
                 return "x86_64";
         }
-        throw new RuntimeException("Unknown CPU architecture!");
+        throw new RuntimeException("Unknown CPU architecture: "+architecture);
     }
 
     public void extractFromAar(File source) throws IOException {
-        try (FileInputStream fileInputStream = new FileInputStream(source)) {
-            try(ZipInputStream zipInputStream = new ZipInputStream(fileInputStream)) {
-                // Wrap the ZIP input stream into a non-closeable stream to
-                // avoid it being closed by processEntry()
-                NonCloseableInputStream entryCopyStream = new NonCloseableInputStream(zipInputStream);
+        byte[] buffer = new byte[8192];
+        try (FileInputStream fileInputStream = new FileInputStream(source);
+             ZipInputStream zipInputStream = new ZipInputStream(fileInputStream)) {
+            // Wrap the ZIP input stream into a non-closeable stream to
+            // avoid it being closed by processEntry()
+            NonCloseableInputStream entryCopyStream = new NonCloseableInputStream(zipInputStream);
+            ZipEntry entry;
+            while((entry = zipInputStream.getNextEntry()) != null) {
+                String entryName = entry.getName();
+                if(!entryName.startsWith(mLibraryLocation) || entry.isDirectory()) continue;
+                // Entry name is actually the full path, so we need to strip the path before extraction
+                entryName = FileUtils.getFileName(entryName);
+                // getFileName may make the file name null, avoid that case.
+                if(entryName == null || LIBRARY_BLACKLIST.contains(entryName)) continue;
 
-                while(true) {
-                    ZipEntry entry = zipInputStream.getNextEntry();
-                    if(entry == null) break;
-
-                    String entryName = entry.getName();
-                    if(!entryName.startsWith(mLibraryLocation) || entry.isDirectory()) continue;
-                    // Entry name is actually the full path, so we need to strip the path before extraction
-                    entryName = FileUtils.getFileName(entryName);
-                    // getFileName may make the file name null, avoid that case.
-                    if(entryName == null || LIBRARY_BLACKLIST.contains(entryName)) continue;
-
-                    processEntry(entryCopyStream, entry, new File(mDestinationDir, entryName));
-                }
+                processEntry(entryCopyStream, entry, new File(mDestinationDir, entryName), buffer);
             }
         }
     }
 
-    private static long fileCrc32(File target) throws IOException {
+    private static long fileCrc32(File target, byte[] buffer) throws IOException {
         try(FileInputStream fileInputStream = new FileInputStream(target)) {
             CRC32 crc32 = new CRC32();
-            byte[] buffer = new byte[1024];
             int len;
             while((len = fileInputStream.read(buffer)) != -1) {
                 crc32.update(buffer, 0, len);
@@ -91,12 +88,12 @@ public class NativesExtractor {
         }
     }
 
-    private void processEntry(InputStream sourceStream, ZipEntry zipEntry, File entryDestination) throws IOException {
+    private void processEntry(InputStream sourceStream, ZipEntry zipEntry, File entryDestination, byte[] buffer) throws IOException {
         if(entryDestination.exists()) {
             long expectedSize = zipEntry.getSize();
             long expectedCrc32 = zipEntry.getCrc();
             long realSize = entryDestination.length();
-            long realCrc32 = fileCrc32(entryDestination);
+            long realCrc32 = fileCrc32(entryDestination, buffer);
             // File in archive is the same as the local one, don't extract
             if(realSize == expectedSize && realCrc32 == expectedCrc32) return;
         }