From 5c6484358b55f3ab08a747f78f98c59a887b86f9 Mon Sep 17 00:00:00 2001
From: Harald Gutsche <hg42@gmx.net>
Date: Fri, 25 Sep 2020 14:58:05 +0200
Subject: [PATCH] fix refresh e.g. single backup/restore task

---
 .../java/com/machiav3lli/backup/activities/MainActivityX.java   | 2 +-
 .../main/java/com/machiav3lli/backup/fragments/AppSheet.java    | 2 +-
 app/src/main/java/com/machiav3lli/backup/tasks/BaseTask.java    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/machiav3lli/backup/activities/MainActivityX.java b/app/src/main/java/com/machiav3lli/backup/activities/MainActivityX.java
index a3ec0bf882..83c32a01bd 100644
--- a/app/src/main/java/com/machiav3lli/backup/activities/MainActivityX.java
+++ b/app/src/main/java/com/machiav3lli/backup/activities/MainActivityX.java
@@ -476,7 +476,7 @@ public void resumeRefresh(List<String> checkedList) {
     public void refresh(boolean mainBoolean, boolean backupOrAppSheetBoolean, List<String> checkedList) {
         Log.d(MainActivityX.TAG, "refreshing");
         runOnUiThread(() -> {
-            binding.refreshLayout.setRefreshing(true);
+            binding.refreshLayout.setRefreshing(true);  //TODO: hg42 refresh can run in parallel, needs counting or multiple (overlaying?) Spinners
             searchViewController.clean();
         });
         badgeCounter = 0;
diff --git a/app/src/main/java/com/machiav3lli/backup/fragments/AppSheet.java b/app/src/main/java/com/machiav3lli/backup/fragments/AppSheet.java
index 1b6d29df7b..30bb742428 100644
--- a/app/src/main/java/com/machiav3lli/backup/fragments/AppSheet.java
+++ b/app/src/main/java/com/machiav3lli/backup/fragments/AppSheet.java
@@ -394,7 +394,7 @@ private void setupOnClicks(AppSheet fragment) {
     public void onActionCalled(BackupRestoreHelper.ActionType actionType, int mode) {
         if (actionType == BackupRestoreHelper.ActionType.BACKUP) {
             new BackupTask(this.app, handleMessages, requireMainActivity(), backupDir, MainActivityX.getShellHandlerInstance(), mode).execute();
-            requireMainActivity().refreshWithAppSheet();
+            //TODO: hg42: requireMainActivity().refreshWithAppSheet();  // too early...seems to prevent later refresh (check it! if so, why?)
         } else if (actionType == BackupRestoreHelper.ActionType.RESTORE) {
             // Latest Backup for now
             BackupItem selectedBackup = this.app.getLatestBackup();
diff --git a/app/src/main/java/com/machiav3lli/backup/tasks/BaseTask.java b/app/src/main/java/com/machiav3lli/backup/tasks/BaseTask.java
index 9b81152773..74e586d22e 100644
--- a/app/src/main/java/com/machiav3lli/backup/tasks/BaseTask.java
+++ b/app/src/main/java/com/machiav3lli/backup/tasks/BaseTask.java
@@ -80,6 +80,7 @@ public void onPostExecute(Integer result) {
             }
             UIUtils.showActionResult(mainActivityX, this.result, null);
         }
+        mainActivityX.refreshWithAppSheet();
         if (signal != null) {
             signal.countDown();
         }