From 8b3d1f2a2ed88051686adf9e6b6f06063751726b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 18 Nov 2024 18:31:01 +0100
Subject: [PATCH] Ulteriori fix su DialogProgressView

---
 .../integrywmsnative/core/expansion/BaseActivity.java     | 8 ++++----
 .../core/expansion/BaseDialogFragment.java                | 8 ++++----
 .../integrywmsnative/core/expansion/BaseFragment.java     | 8 ++++----
 .../gest/settings/MainSettingsFragment.java               | 8 ++++----
 .../integrywmsnative/view/dialogs/DialogProgressView.java | 4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index d96a6950..5cf92c86 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -53,16 +53,16 @@ public class BaseActivity extends AppCompatActivity {
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+        //executorService.execute(() -> {
             this.mCurrentProgress.show(getSupportFragmentManager());
-        });
+        //});
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+        //executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+        //});
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
index 5f607310..4cb8d6d9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -77,16 +77,16 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+//        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
index 3df725b5..b3b79372 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -66,16 +66,16 @@ public abstract class BaseFragment extends Fragment {
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+//        });
     }
 
     public void onError(Exception ex) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index ac529751..fbe5a87c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -309,15 +309,15 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
 
     private void openProgress() {
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+//        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 37152686..2b4d0120 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -64,7 +64,7 @@ public class DialogProgressView extends DialogFragment {
     }
 
     public void show(@NonNull FragmentManager manager) {
-        if (!isAdded() && !isInLayout()) {
+        if (!isAdded() && !isInLayout() && !progressOpened) {
             this.progressOpened = true;
             super.show(manager, "loading-dialog");
         }
@@ -72,7 +72,7 @@ public class DialogProgressView extends DialogFragment {
 
     @Override
     public void dismiss() {
-        if (isAdded() || isInLayout()) {
+        if (isAdded() || isInLayout() || progressOpened) {
             this.progressOpened = false;
             super.dismissAllowingStateLoss();
         }