refresh adapter after extraction end even if there were errors (show possibly created files from a partial extraction)

Author: pgp

app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         multiDexEnabled true
-        versionCode 175201227
+        versionCode 175201229
         versionName "1.7.5"
         externalNativeBuild {
             cmake {

app/src/main/java/it/pgp/xfiles/service/CompressTask.java

@@ -19,9 +19,6 @@
 
 public class CompressTask extends RootHelperClientTask {
 
-//    public static final SocketNames compressSocketName = SocketNames.thecompressor;
-//    public static final SocketNames compressSocketName = SocketNames.theroothelper;
-
     // direct input to compressArchive
     public CompressParams params;
 

app/src/main/java/it/pgp/xfiles/service/ExtractTask.java

@@ -23,9 +23,6 @@
 
 public class ExtractTask extends RootHelperClientTask {
 
-//    public static final SocketNames extractSocketName = SocketNames.theextractor;
-//    public static final SocketNames extractSocketName = SocketNames.theroothelper;
-
     // direct input to extractArchive
     private List<BasePathContent> srcArchives; // subDir taken from here
     private BasePathContent destDirectory;
@@ -100,17 +97,14 @@ protected void onPostExecute(Object o) {
         super.onPostExecute(o);
         MainActivity activity = MainActivity.mainActivity;
         if (allOk) {
-            if (activity == null) return; // activity closed while service active, nothing to refresh
-            BasePathContent cd = activity.getCurrentDirCommander().getCurrentDirectoryPathname();
-            if (cd.equals(currentDir) && !(params instanceof TestParams))
-                activity.browserPagerAdapter.showDirContent(activity.getCurrentDirCommander().refresh(),activity.browserPager.getCurrentItem(),null);
             Toast.makeText(service.getApplicationContext(), prefix+" completed", Toast.LENGTH_LONG).show();
         }
         else if (results.size()==1) {
             if (result == FileOpsErrorCodes.NULL_OR_WRONG_PASSWORD) {
                 Toast.makeText(service.getApplicationContext(),"Empty or wrong password",Toast.LENGTH_LONG).show();
-                if (activity == null) return; // activity closed while service active, nothing to refresh
-                new AskPasswordDialogOnExtract(MainActivity.mainActivity,(ExtractParams)params).show();
+                if (activity != null)
+                    new AskPasswordDialogOnExtract(activity,(ExtractParams)params).show();
+                return;
             }
             else if (result == FileOpsErrorCodes.CRC_FAILED) {
                 Toast.makeText(service.getApplicationContext(),"CRC failed in data, damaged archive?",Toast.LENGTH_LONG).show();
@@ -126,5 +120,12 @@ else if (result == FileOpsErrorCodes.CRC_FAILED) {
             if(activity != null) new ExtractResultsDialog(activity, srcArchives, results, params instanceof TestParams).show();
             else Toast.makeText(activity, "There were extraction/test errors, unable to display them without an active activity", Toast.LENGTH_SHORT).show();
         }
+
+        // anyway, if we are not testing archives, refresh adapter if we are in the same folder
+        if(activity != null && !(params instanceof TestParams)) {
+            BasePathContent cd = activity.getCurrentDirCommander().getCurrentDirectoryPathname();
+            if (cd.equals(currentDir))
+                activity.browserPagerAdapter.showDirContent(activity.getCurrentDirCommander().refresh(),activity.browserPager.getCurrentItem(),null);
+        }
     }
 }