- Better implementation of the wakelock to take into account multi-mods optimization

Author: Mathias-Boulay

app/src/main/java/com/spse/javamodsoptimiser/MainActivity.java

@@ -173,7 +173,9 @@ public void ShowFilepicker(){
             public void onSelect(String path) {
                 //We aren't optimizing multiple mods.
                 MULTIPLE_MODS_CHECKED = false;
-                AsyncTask task;
+
+                //Activate the CPU wakelock
+                setWakelockState(true);
 
                 init(path);
 
@@ -187,6 +189,9 @@ public void onDone(ArrayList<String> selectedFilePaths) {
                 //We are optimizing multiple mods
                 MULTIPLE_MODS_CHECKED = true;
 
+                //Activate the CPU wakelock
+                setWakelockState(true);
+
                 modList = new ArrayList<String>(selectedFilePaths.size());
 
                 for(String mods : selectedFilePaths){

app/src/main/java/com/spse/javamodsoptimiser/asynctask/FileCopier.java

@@ -22,8 +22,6 @@ public class FileCopier extends AsyncTask<Task, Object, MainActivity> {
     @Override
     protected MainActivity doInBackground(Task[] task) {
 
-        //Activate the CPU wakelock
-        task[0].getActivity().setWakelockState(true);
 
         //Parse arguments
         MinecraftMod mod = task[0].getMod();

app/src/main/java/com/spse/javamodsoptimiser/asynctask/FileZipper.java

@@ -27,10 +27,6 @@ protected MainActivity doInBackground(Task... task) {
 
         repackMod(task[0].getMod(), task[0].getProgressBar(), task[0].getActivity());
 
-        //Deactivate the CPU wakelock
-        task[0].getActivity().setWakelockState(false);
-
-
         return task[0].getActivity();
     }
 
@@ -144,6 +140,9 @@ protected void onPostExecute(MainActivity activity) {
             activity.modIndex++;
         }else{
             activity.filepickerBtn.setClickable(true);
+
+            //Deactivate the CPU wakelock
+            activity.setWakelockState(false);
         }
 
     }