Skip to content

[stable-3.35] fix(file-activity): loading dialog illegal-state-exception #16391

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

Merged
alperozturk96 merged 1 commit into from
Jan 28, 2026
Merged

[stable-3.35] fix(file-activity): loading dialog illegal-state-exception #16391

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: 17 additions & 1 deletion 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 @@ -41,6 +41,7 @@
import com.nextcloud.receiver.NetworkChangeListener;
import com.nextcloud.receiver.NetworkChangeReceiver;
import com.nextcloud.utils.EditorUtils;
import com.nextcloud.utils.extensions.ActivityExtensionsKt;
import com.nextcloud.utils.extensions.BundleExtensionsKt;
import com.nextcloud.utils.extensions.FileExtensionsKt;
import com.nextcloud.utils.extensions.IntentExtensionsKt;
Expand Down Expand Up @@ -562,13 +563,23 @@ protected void updateFileFromDB(){
*/
public void showLoadingDialog(String message) {
runOnUiThread(() -> {
if (!ActivityExtensionsKt.isActive(this)) {
Log_OC.w(TAG, "cannot show loading dialog, activity is finishing");
return;
}

FragmentManager fragmentManager = getSupportFragmentManager();
fragmentManager.executePendingTransactions();
Fragment existingDialog = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);

if (existingDialog instanceof LoadingDialog loadingDialog) {
Log_OC.d(TAG, "dismiss previous loading dialog");
loadingDialog.dismiss();

if (!fragmentManager.isStateSaved()) {
loadingDialog.dismiss();
} else {
loadingDialog.dismissAllowingStateLoss();
}
}

// Show new dialog
Expand All @@ -585,6 +596,11 @@ public void showLoadingDialog(String message) {
*/
public void dismissLoadingDialog() {
runOnUiThread(() -> {
if (!ActivityExtensionsKt.isActive(this)) {
Log_OC.w(TAG, "cannot dismiss loading dialog, activity is finishing");
return;
}

FragmentManager fragmentManager = getSupportFragmentManager();
fragmentManager.executePendingTransactions();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
Expand Down
Loading