float3 · Oct 29, 2026 · Oct 21, 2026 · Oct 26, 2026 · Oct 26, 2026 · Oct 26, 2026
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
@@ -10,12 +10,12 @@ import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.dialogs.NoteTypeFieldEditorContextMenu.NoteTypeFieldEditorContextMenuAction
 import com.ichi2.anki.tests.InstrumentedTest
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 /** Tests [NoteTypeFieldEditorContextMenu] */
 @RunWith(AndroidJUnit4::class)
@@ -27,7 +27,7 @@ class NoteTypeFieldEditorContextMenuTest : InstrumentedTest() {
     fun showsAllOptions() {
         launchFragment(
             fragmentArgs = Bundle().apply { putString(NoteTypeFieldEditorContextMenu.ARG_LABEL, testDialogTitle) },
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ) { NoteTypeFieldEditorContextMenu() }
         onView(withText(testDialogTitle))
             .inRoot(isDialog())

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
@@ -26,6 +26,7 @@ import com.ichi2.anki.AnkiDroidApp.Companion.sharedPreferencesTestingOverride
 import com.ichi2.anki.analytics.initializeAnalytics
 import com.ichi2.anki.analytics.launchPreviousAnrReporting
 import com.ichi2.anki.ankiquest.Ankiquest
+import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
 import com.ichi2.anki.common.android.AdaptionUtil
 import com.ichi2.anki.common.android.Animations
@@ -41,6 +42,7 @@ import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.anki.common.storage.StorageDecision
 import com.ichi2.anki.common.utils.android.SdCard
+import com.ichi2.anki.common.utils.android.isRobolectric
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.compat.CompatHelper
@@ -56,6 +58,7 @@ import com.ichi2.anki.logging.RobolectricDebugTree
 import com.ichi2.anki.logging.logActivityCreation
 import com.ichi2.anki.model.FieldFilters.NoSuggestFilter
 import com.ichi2.anki.multimedia.MultimediaArgsStorage
+import com.ichi2.anki.multiprofile.ProfileContextWrapper
 import com.ichi2.anki.multiprofile.ProfileManager
 import com.ichi2.anki.multiprofile.isPhoenixProcess
 import com.ichi2.anki.navigation.initializeNavigator
@@ -137,7 +140,7 @@ open class AnkiDroidApp :
     @set:VisibleForTesting
     var profileManager: ProfileManager? = null
 
-    private val profileContext: Context?
+    private val profileContext: ProfileContextWrapper?
         get() = profileManager?.activeProfileContext
 
     /**
@@ -206,7 +209,7 @@ open class AnkiDroidApp :
             LogType.PRODUCTION -> Timber.plant(ProductionCrashReportingTree())
         }
         Timber.plant(ReminderLogTree(this))
-        if (BuildConfig.ENABLE_LEAK_CANARY) {
+        if (BuildConfig.ENABLE_LEAK_CANARY && !isRobolectric) {
             LeakCanaryConfiguration.setInitialConfigFor(this)
         } else {
             LeakCanaryConfiguration.disable()
@@ -280,17 +283,31 @@ open class AnkiDroidApp :
         super.onTerminate()
     }
 
-    /** Schedules cache maintenance and logs its duration without delaying startup. */
-    private fun launchCacheCleanup() =
+    /** Schedules temporary-file maintenance and logs its duration without delaying startup. */
+    @VisibleForTesting
+    internal fun launchCacheCleanup() =
         applicationScope.launch(Dispatchers.IO) {
-            runCatching {
-                measureTime("cacheCleanup") {
+            measureTime("cacheCleanup") {
+                runCacheCleanup("multimediaArgsCleanup") {
                     MultimediaArgsStorage.create(this@AnkiDroidApp).removeExpiredFiles()
+                }
+                runCacheCleanup("voiceRecordingsCleanup") {
                     VoiceRecorder.removeExpiredRecordings(VoiceRecorder.recordingsDirectory(this@AnkiDroidApp))
                 }
-            }.onFailure { Timber.w(it, "Unable to clean up expired cache files") }
+                runCacheCleanup("idsFileCleanup") {
+                    IdsFile.deleteStaleFiles(this@AnkiDroidApp)
+                }
+            }
         }
 
+    private inline fun runCacheCleanup(
+        name: String,
+        block: () -> Unit,
+    ) {
+        runCatching { measureTime(name, block) }
+            .onFailure { Timber.w(it, "Unable to run %s", name) }
+    }
+
     /**
      * @param debugTraceSqlCalls Log all SQL statements executed by the backend.
      * **Warning** The log may be delayed by 100ms, so you should not assume than a given SQL

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -653,7 +653,7 @@ open class CardBrowser :
         viewModelStore,
         CardBrowserViewModel.factory(
             lastDeckIdRepository = AnkiDroidApp.instance.sharedPrefsLastDeckIdRepository,
-            idsFileDirectory = IdsFile.getDirectory(this),
+            idsFileDirectory = IdsFile.getDirectory(),
             options = launchOptions,
             isFragmented = fragmented,
             initialDeckId = intent?.getLongExtra(CardBrowserViewModel.EXTRA_DECK_ID),

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt b/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
@@ -234,7 +234,7 @@ private fun ensureBrowserViewModel() {
         deckPicker.viewModelStore,
         CardBrowserViewModel.factory(
             lastDeckIdRepository = AnkiDroidApp.instance.sharedPrefsLastDeckIdRepository,
-            idsFileDirectory = IdsFile.getDirectory(deckPicker),
+            idsFileDirectory = IdsFile.getDirectory(),
             options = null,
             isFragmented = false,
             initialDeckId = null,

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
@@ -20,6 +20,7 @@ import android.widget.ScrollView
 import android.widget.TextView
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
 import androidx.constraintlayout.widget.Group
 import androidx.core.text.HtmlCompat
@@ -48,6 +49,7 @@ import com.ichi2.anki.filtered.FilteredDeckOptionsFragment
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.Decks
 import com.ichi2.anki.observability.ChangeManager
+import com.ichi2.anki.progress.observeProgress
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.utils.doOnApplyWindowInsets
@@ -114,6 +116,7 @@ class StudyOptionsFragment :
         displayedDeckId = savedInstanceState?.getLong(STATE_DISPLAYED_DECK_ID)?.takeIf { it != 0L }
         // Subscribe once per fragment: returning from another panel can recreate its view.
         ChangeManager.subscribe(this)
+        observeProgress(viewModel) { progress -> getString(progress.messageRes) }
     }
 
     override fun onCreateView(
@@ -289,20 +292,12 @@ class StudyOptionsFragment :
             }
             R.id.action_rebuild -> {
                 Timber.i("StudyOptionsFragment:: rebuild cram deck button pressed")
-                launchCatchingTask {
-                    withProgress(CommonString.rebuild_filtered_deck) {
-                        viewModel.rebuildCram()
-                    }
-                }
+                launchCatchingTask { viewModel.rebuildCram() }
                 return true
             }
             R.id.action_empty -> {
                 Timber.i("StudyOptionsFragment:: empty cram deck button pressed")
-                launchCatchingTask {
-                    withProgress(CommonString.empty_filtered_deck) {
-                        viewModel.emptyCram()
-                    }
-                }
+                launchCatchingTask { viewModel.emptyCram() }
                 return true
             }
             else -> return false
@@ -571,3 +566,11 @@ class StudyOptionsFragment :
         }
     }
 }
+
+@get:StringRes
+private val StudyOptionsProgress.messageRes: Int
+    get() =
+        when (this) {
+            StudyOptionsProgress.REBUILDING_FILTERED_DECK -> CommonString.rebuild_filtered_deck
+            StudyOptionsProgress.EMPTYING_FILTERED_DECK -> CommonString.empty_filtered_deck
+        }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
@@ -10,6 +10,8 @@ import com.ichi2.anki.CollectionManager.withOpenColOrNull
 import com.ichi2.anki.libanki.Collection
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.observability.undoableOp
+import com.ichi2.anki.progress.HasProgress
+import com.ichi2.anki.progress.ProgressManager
 import com.ichi2.anki.study.DeckKind
 import com.ichi2.anki.study.StudyAvailability
 import com.ichi2.anki.study.currentDeckStudyState
@@ -20,7 +22,11 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.File
 
-class StudyOptionsViewModel : ViewModel() {
+class StudyOptionsViewModel :
+    ViewModel(),
+    HasProgress<StudyOptionsProgress> {
+    override val progressManager = ProgressManager<StudyOptionsProgress>()
+
     val flowOfState: StateFlow<StudyOptionsState>
         field = MutableStateFlow<StudyOptionsState>(StudyOptionsState.Loading)
     val state: StudyOptionsState get() = flowOfState.value
@@ -52,14 +58,18 @@ class StudyOptionsViewModel : ViewModel() {
 
     suspend fun rebuildCram() {
         Timber.d("doInBackground - RebuildCram")
-        undoableOp { sched.rebuildFilteredDeck(decks.selected()) }
-        withCol { updateStateFromCollection() }
+        progressManager.withProgress(message = StudyOptionsProgress.REBUILDING_FILTERED_DECK) {
+            undoableOp { sched.rebuildFilteredDeck(decks.selected()) }
+            withCol { updateStateFromCollection() }
+        }
     }
 
     suspend fun emptyCram() {
         Timber.d("doInBackgroundEmptyCram")
-        undoableOp { sched.emptyFilteredDeck(decks.selected()) }
-        withCol { updateStateFromCollection() }
+        progressManager.withProgress(message = StudyOptionsProgress.EMPTYING_FILTERED_DECK) {
+            undoableOp { sched.emptyFilteredDeck(decks.selected()) }
+            withCol { updateStateFromCollection() }
+        }
     }
 
     fun unbury(): Job =
@@ -138,6 +148,11 @@ class StudyOptionsViewModel : ViewModel() {
     }
 }
 
+enum class StudyOptionsProgress {
+    REBUILDING_FILTERED_DECK,
+    EMPTYING_FILTERED_DECK,
+}
+
 class DeckStudyData(
     val newCardsToday: Int,
     val lrnCardsToday: Int,

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionAdapter.kt
@@ -125,7 +125,7 @@ class BrowserColumnSelectionAdapter(
             binding.buttonToggleColumn.apply {
                 // NICE_TO_HAVE: animate between + and -
                 val isExclude = absoluteAdapterPosition < positionOfAvailableHeading
-                setImageResource(if (isExclude) R.drawable.ic_remove else CommonR.drawable.ic_add)
+                setImageResource(if (isExclude) CommonR.drawable.ic_remove else CommonR.drawable.ic_add)
 
                 val label = context.getString(if (isExclude) CommonString.exclude_column else CommonString.include_column)
                 contentDescription = label

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
@@ -1702,7 +1702,7 @@ class CardBrowserFragment :
         val (type, selectedIds) = activityViewModel.querySelectionExportData() ?: return
         ExportDialogFragment
             .newInstance(
-                IdsFile.getDirectory(requireContext()),
+                IdsFile.getDirectory(),
                 type,
                 selectedIds,
             ).show(parentFragmentManager, "exportDialog")

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -556,13 +556,12 @@ class CardBrowserViewModel(
         multiselectStateFile = idsFile
         pendingSelectionRestore =
             try {
-                idsFile?.getIds()?.map { CardOrNoteId(it) }
+                idsFile?.getIdsOrNull()?.map { CardOrNoteId(it) }
             } catch (e: Exception) {
-                // #19572: I suspect we have a startup bug here, so continue reporting the exception
                 Timber.w(e, "failed to read STATE_MULTISELECT_VALUES")
                 CrashReportService.sendExceptionReport(
                     e = e,
-                    origin = "19572: STATE_MULTISELECT_VALUES",
+                    origin = "CardBrowserViewModel",
                     onlyIfSilent = true,
                 )
                 // fallback to no selections, but still in multiselect mode

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
@@ -99,9 +99,8 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
             (dialog as? AlertDialog)?.positiveButton?.isEnabled = false
             binding.contentViewsGroup.isVisible = false
             binding.loadingViewsGroup.isVisible = true
-            val fetchNoteIdsResult = runCatching { idsFile.getIds() }
-            val noteIds = fetchNoteIdsResult.getOrNull()
-            if (fetchNoteIdsResult.isFailure || noteIds == null) {
+            val noteIds = runCatching { idsFile.getIdsOrNull() }.getOrNull()
+            if (noteIds == null) {
                 requireActivity().showSnackbar(CommonString.something_wrong)
                 dismiss()
                 return@launch
@@ -190,7 +189,7 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
             context: Context,
             noteIds: List<NoteId>,
         ): FindAndReplaceDialogFragment {
-            val file = IdsFile(IdsFile.getDirectory(context), noteIds, IdsFile.Purpose.FIND_AND_REPLACE)
+            val file = IdsFile(IdsFile.getDirectory(), noteIds, IdsFile.Purpose.FIND_AND_REPLACE)
             return FindAndReplaceDialogFragment().apply {
                 arguments =
                     Bundle().apply {