Skip to content

Fixing timing issue with FileActivity's loading dialog show and dismiss #16145

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

Open
PhilLab wants to merge 2 commits into
base: master
Choose a base branch
from
+56 −0
Open

Fixing timing issue with FileActivity's loading dialog show and dismiss #16145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c6eaa9
Illustrating timing issue with FileActivity#dismissLoadingDialog
PhilLab Dec 15, 2025
4dcbad8
Fixing timing issue with FileActivity's loading dialog show and dismiss.
PhilLab Dec 16, 2025
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
54 changes: 54 additions & 0 deletions app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2025 Philipp Hasper <vcs@hasper.info>
* SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
Expand All @@ -14,12 +15,14 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.IdlingRegistry
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.DrawerActions
import androidx.test.espresso.contrib.NavigationViewActions
import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
Expand All @@ -36,6 +39,7 @@ import com.owncloud.android.operations.CreateFolderOperation
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.adapter.OCFileListItemViewHolder
import com.owncloud.android.utils.EspressoIdlingResource
import org.hamcrest.Matchers.allOf
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
Expand All @@ -44,6 +48,7 @@ import org.junit.Rule
import org.junit.Test

class FileDisplayActivityIT : AbstractOnServerIT() {

@Before
fun registerIdlingResource() {
IdlingRegistry.getInstance().register(EspressoIdlingResource.countingIdlingResource)
Expand Down Expand Up @@ -236,4 +241,53 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
}
}
}

@Test
fun testShowAndDismissLoadingDialog() {
launchActivity<FileDisplayActivity>().use { scenario ->
val loadingText = "Some text displayed while loading"

// Test that display works
scenario.onActivity { sut ->
sut.showLoadingDialog(loadingText)
}
onView(withText(loadingText))
.check(matches(isDisplayed()))

// Test that hiding works
scenario.onActivity { sut ->
sut.dismissLoadingDialog()
}
onView(allOf(withText(loadingText), isDisplayed()))
.check(doesNotExist())

// Test that there is no timing issue when hiding the dialog directly after.
// This timing issue was reproducible when testing RemoveFilesDialogFragment#removeFiles
// as well as sporadically "in the wild".
scenario.onActivity { sut ->
sut.showLoadingDialog(loadingText)
sut.dismissLoadingDialog()
}
onView(allOf(withText(loadingText), isDisplayed()))
.check(doesNotExist())
// Wait for a potential timing issue - dialog appearing belatedly
Thread.sleep(1000)
onView(allOf(withText(loadingText), isDisplayed()))
.check(doesNotExist())

// Test that multiple display calls after another don't cause a timing issue
scenario.onActivity { sut ->
sut.showLoadingDialog(loadingText)
sut.showLoadingDialog(loadingText)
sut.showLoadingDialog(loadingText)
sut.dismissLoadingDialog()
}
onView(allOf(withText(loadingText), isDisplayed()))
.check(doesNotExist())
// Wait for a potential timing issue - dialog appearing belatedly
Thread.sleep(1000)
onView(allOf(withText(loadingText), isDisplayed()))
.check(doesNotExist())
}
}
}
2 changes: 2 additions & 0 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 @@ -563,6 +563,7 @@ protected void updateFileFromDB(){
public void showLoadingDialog(String message) {
runOnUiThread(() -> {
FragmentManager fragmentManager = getSupportFragmentManager();
fragmentManager.executePendingTransactions();
Fragment existingDialog = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);

if (existingDialog instanceof LoadingDialog loadingDialog) {
Expand All @@ -585,6 +586,7 @@ public void showLoadingDialog(String message) {
public void dismissLoadingDialog() {
runOnUiThread(() -> {
FragmentManager fragmentManager = getSupportFragmentManager();
fragmentManager.executePendingTransactions();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);

if (fragment instanceof LoadingDialog loadingDialogFragment) {
Expand Down