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(); }