Skip to content

fix(manage-space): stop collectors when the view is destroyed #22787

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
mikehardy merged 2 commits into from
Oct 26, 2026
Merged

fix(manage-space): stop collectors when the view is destroyed #22787

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
0803cf0
fix(manage-space): stop collectors when the view is destroyed
david-allison Oct 26, 2026
f80bc73
test: remove 'knownFailures' lifecycle option
david-allison Oct 26, 2026
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
21 changes: 11 additions & 10 deletions AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.annotation.StringRes
import androidx.core.content.ContextCompat.getSystemService
import androidx.fragment.app.viewModels
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.viewModelScope
import androidx.preference.Preference
import com.ichi2.anki.BackupManager
Expand All @@ -32,6 +31,7 @@ import com.ichi2.anki.snackbar.showSnackbar
import com.ichi2.anki.ui.dialogs.tools.AsyncDialogBuilder.CheckedItems
import com.ichi2.anki.ui.dialogs.tools.DialogResult
import com.ichi2.anki.ui.dialogs.tools.awaitDialog
import com.ichi2.anki.utils.ext.launchCollectionInViewLifecycleScope
import com.ichi2.anki.utils.getUserFriendlyErrorText
import com.ichi2.preferences.TextWidgetPreference
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -233,15 +233,6 @@ class ManageSpaceFragment : SettingsFragment() {

adjustDeleteEverythingStringsDependingOnCollectionLocation(deleteEverythingPreference)

listOf(
viewModel.flowOfDeleteUnusedMediaSize to deleteUnusedMediaPreference,
viewModel.flowOfDeleteCollectionSize to deleteCollectionPreference,
viewModel.flowOfDeleteEverythingSize to deleteEverythingPreference,
viewModel.flowOfDeleteBackupsSize to deleteBackupsPreference,
).forEach { (flowOfSize, preference) ->
lifecycleScope.launch { flowOfSize.collect { size -> preference.setWidgetTextBy(size) } }
}

observeProgress(viewModel) { progress -> getString(progress.messageRes) }
}

Expand All @@ -253,6 +244,16 @@ class ManageSpaceFragment : SettingsFragment() {
binding.toolbar.apply {
title = getString(CommonString.pref__manage_space__screen_title)
}

listOf(
viewModel.flowOfDeleteUnusedMediaSize to R.string.pref_delete_media_key,
viewModel.flowOfDeleteCollectionSize to R.string.pref_delete_collection_key,
viewModel.flowOfDeleteEverythingSize to R.string.pref_delete_everything_key,
viewModel.flowOfDeleteBackupsSize to R.string.pref_delete_backups_key,
).forEach { (flowOfSize, key) ->
val preference = requirePreference<TextWidgetPreference>(key)
flowOfSize.launchCollectionInViewLifecycleScope { size -> preference.setWidgetTextBy(size) }
}
}

/************************************ Delete unused media *************************************/
Expand Down
2 changes: 0 additions & 2 deletions AnkiDroid/src/test/java/com/ichi2/anki/FragmentCoroutineLifecycleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.ichi2.anki.FragmentLifecycleFixture.Transition.REMOVE
import com.ichi2.testutils.FragmentCoroutineTracker
import kotlinx.coroutines.launch
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import org.junit.Assume.assumeFalse
import org.junit.Assume.assumeTrue
import org.junit.Test
import org.junit.runner.RunWith
Expand Down Expand Up @@ -111,7 +110,6 @@ class FragmentCoroutineLifecycleTest(
if (transition != REMOVE) {
assumeTrue("$fixture has no fragment view", fixture.hasFragmentView)
}
assumeFalse("Known startup failure: $fixture during $transition (Issue 22065)", transition in fixture.knownFailures)
withHost { activity, fragment ->
// Main.immediate queues nested launches until this outer coroutine finishes.
// This lets the test destroy the fragment/view before its startup work runs.
Expand Down
5 changes: 1 addition & 4 deletions AnkiDroid/src/test/java/com/ichi2/anki/FragmentLifecycleFixture.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package com.ichi2.anki

import androidx.fragment.app.Fragment
import com.ichi2.anki.FragmentLifecycleFixture.Transition.REMOVE
import com.ichi2.anki.browser.BrowserColumnSelectionFragment
import com.ichi2.anki.cardviewer.SingleCardSide
import com.ichi2.anki.dialogs.ChangeNoteTypeDialog
Expand Down Expand Up @@ -31,8 +30,6 @@ class FragmentLifecycleFixture(
private val name: String,
val host: Class<out AnkiActivity> = AnkiActivity::class.java,
val hasFragmentView: Boolean = true,
// Confirmed failures in the startup stress test. Remove each entry when its failure is fixed.
val knownFailures: Set<Transition> = emptySet(),
val create: RobolectricTest.() -> Fragment,
) {
enum class Transition { REMOVE, DESTROY_VIEW, RECREATE_VIEW }
Expand All @@ -56,7 +53,7 @@ fun fragmentLifecycleFixtures(): List<FragmentLifecycleFixture> =
FilteredDeckOptionsFragment()
},
FragmentLifecycleFixture("MediaCheck") { MediaCheckFragment() },
FragmentLifecycleFixture("ManageSpace", knownFailures = setOf(REMOVE)) { ManageSpaceFragment() },
FragmentLifecycleFixture("ManageSpace") { ManageSpaceFragment() },
FragmentLifecycleFixture("ChangeNoteType") {
ChangeNoteTypeDialog.newInstance(listOf(addBasicNote().id))
},
Expand Down
Loading