#313 Check for busy state at Abstract zip task level

srikanth-lingala · May 24, 2021 · a84daeb · a84daeb
1 parent c818bfd
commit a84daeb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/main/java/net/lingala/zip4j/ZipFile.java b/src/main/java/net/lingala/zip4j/ZipFile.java
@@ -302,10 +302,6 @@ public void addFiles(List<File> filesToAdd, ZipParameters parameters) throws Zip
       throw new ZipException("input parameters are null");
     }
 
-    if (progressMonitor.getState() == ProgressMonitor.State.BUSY) {
-      throw new ZipException("invalid operation - Zip4j is in busy state");
-    }
-
     readZipInfo();
 
     if (zipModel == null) {
@@ -467,10 +463,6 @@ public void extractAll(String destinationPath, UnzipParameters unzipParameters)
       throw new ZipException("Internal error occurred when extracting zip file");
     }
 
-    if (progressMonitor.getState() == ProgressMonitor.State.BUSY) {
-      throw new ZipException("invalid operation - Zip4j is in busy state");
-    }
-
     new ExtractAllFilesTask(zipModel, password, unzipParameters, buildAsyncParameters()).execute(
         new ExtractAllFilesTaskParameters(destinationPath, buildConfig()));
   }
@@ -676,10 +668,6 @@ public void extractFile(FileHeader fileHeader, String destinationPath, String ne
       throw new ZipException("destination path is empty or null, cannot extract file");
     }
 
-    if (progressMonitor.getState() == ProgressMonitor.State.BUSY) {
-      throw new ZipException("invalid operation - Zip4j is in busy state");
-    }
-
     if (unzipParameters == null) {
       unzipParameters = new UnzipParameters();
     }

diff --git a/src/main/java/net/lingala/zip4j/tasks/AsyncZipTask.java b/src/main/java/net/lingala/zip4j/tasks/AsyncZipTask.java
@@ -19,9 +19,11 @@ public AsyncZipTask(AsyncTaskParameters asyncTaskParameters) {
   }
 
   public void execute(T taskParameters) throws ZipException {
-    progressMonitor.fullReset();
-    progressMonitor.setState(ProgressMonitor.State.BUSY);
-    progressMonitor.setCurrentTask(getTask());
+    if (runInThread && ProgressMonitor.State.BUSY.equals(progressMonitor.getState())) {
+      throw new ZipException("invalid operation - Zip4j is in busy state");
+    }
+
+    initProgressMonitor();
 
     if (runInThread) {
       long totalWorkToBeDone = calculateTotalWork(taskParameters);
@@ -64,6 +66,12 @@ protected void verifyIfTaskIsCancelled() throws ZipException {
     throw new ZipException("Task cancelled", ZipException.Type.TASK_CANCELLED_EXCEPTION);
   }
 
+  private void initProgressMonitor() {
+    progressMonitor.fullReset();
+    progressMonitor.setState(ProgressMonitor.State.BUSY);
+    progressMonitor.setCurrentTask(getTask());
+  }
+
   protected abstract void executeTask(T taskParameters, ProgressMonitor progressMonitor) throws IOException;
 
   protected abstract long calculateTotalWork(T taskParameters) throws ZipException;