Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not allow multiple instances of LoadingDialog #13551

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Do not allow multiple instances of LoadingDialog #13551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,14 +543,16 @@ protected void updateFileFromDB(){
public void showLoadingDialog(String message) {
dismissLoadingDialog();

Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
if (frag == null) {
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
if (fragment == null) {
Log_OC.d(TAG, "show loading dialog");
LoadingDialog loadingDialogFragment = LoadingDialog.newInstance(message);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
boolean isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, loadingDialogFragment);
if (isDialogFragmentReady) {
loadingDialogFragment.show(fragmentTransaction, DIALOG_WAIT_TAG);
fragmentTransaction.add(loadingDialogFragment, DIALOG_WAIT_TAG);
fragmentTransaction.commitNow();
}
}
}
Expand All @@ -559,13 +561,15 @@ public void showLoadingDialog(String message) {
* Dismiss loading dialog
*/
public void dismissLoadingDialog() {
Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
if (frag != null) {
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
if (fragment != null) {
Log_OC.d(TAG, "dismiss loading dialog");
LoadingDialog loadingDialogFragment = (LoadingDialog) frag;
LoadingDialog loadingDialogFragment = (LoadingDialog) fragment;
boolean isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, loadingDialogFragment);
if (isDialogFragmentReady) {
loadingDialogFragment.dismiss();
fragmentManager.executePendingTransactions();
}
}
}
Expand Down
Loading