Potential fix for ZIP methods

ME1312 · Jun 28, 2021 · c1d4454 · c1d4454
1 parent 960b0d0
commit c1d4454
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/Util.java b/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/Util.java
@@ -316,18 +316,15 @@ public static void zip(File file, OutputStream zip) {
         File dir = (file.isFile())?file.getParentFile():file;
         byte[] buffer = new byte[4096];
 
-        try{
+        try {
             ZipOutputStream zos = new ZipOutputStream(zip);
 
-            for(String next : zipsearch(file, file)){
-
-                ZipEntry ze= new ZipEntry(next.replace(File.separatorChar, '/'));
-                zos.putNextEntry(ze);
-
+            for (String next : zipsearch(file, file)) {
+                zos.putNextEntry(new ZipEntry(next.replace(File.separatorChar, '/')));
                 FileInputStream in = new FileInputStream(dir.getAbsolutePath() + File.separator + next);
 
                 int len;
-                while ((len = in.read(buffer)) > 0) {
+                while ((len = in.read(buffer)) != -1) {
                     zos.write(buffer, 0, len);
                 }
 
@@ -336,7 +333,7 @@ public static void zip(File file, OutputStream zip) {
 
             zos.closeEntry();
             zos.close();
-        } catch(IOException ex){
+        } catch(IOException ex) {
             ex.printStackTrace();
         }
     }
@@ -363,15 +360,15 @@ public static void unzip(InputStream zip, File dir) {
                 }
                 FileOutputStream fos = new FileOutputStream(newFile);
                 int len;
-                while ((len = zis.read(buffer)) > 0) {
+                while ((len = zis.read(buffer)) != -1) {
                     fos.write(buffer, 0, len);
                 }
 
                 fos.close();
             }
             zis.closeEntry();
             zis.close();
-        } catch(IOException ex) {
+        } catch (IOException ex) {
             ex.printStackTrace();
         }
     }