fix(card-browser): memory leak

Fixes a TODO and moves the operation into the ViewModel
 - orderSingleChoiceDialogListener was in the companion object

Fixes 21148

Assisted-by: Claude Opus 4.7 - all

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt

@@ -17,7 +17,6 @@
 package com.ichi2.anki.browser
 
 import android.content.Context
-import android.content.DialogInterface
 import android.graphics.Color
 import android.os.Bundle
 import android.text.Spannable
@@ -122,7 +121,6 @@ import com.ichi2.anki.libanki.undoAvailable
 import com.ichi2.anki.libanki.undoLabel
 import com.ichi2.anki.model.CardStateFilter
 import com.ichi2.anki.model.CardsOrNotes.CARDS
-import com.ichi2.anki.model.LegacySortType
 import com.ichi2.anki.model.SelectableDeck
 import com.ichi2.anki.observability.ChangeManager
 import com.ichi2.anki.observability.undoableOp
@@ -134,15 +132,13 @@ import com.ichi2.anki.scheduling.SetDueDateDialog
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.ui.attachFastScroller
 import com.ichi2.anki.ui.internationalization.sentenceCase
-import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.undoAndShowSnackbar
 import com.ichi2.anki.utils.ext.addPrepareMenuProvider
 import com.ichi2.anki.utils.ext.getParcelableCompat
 import com.ichi2.anki.utils.ext.hasCheckedBackground
 import com.ichi2.anki.utils.ext.ifNotZero
 import com.ichi2.anki.utils.ext.launchCollectionInLifecycleScope
 import com.ichi2.anki.utils.ext.setFragmentResultListener
-import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.utils.ext.visibleItemPositions
 import com.ichi2.anki.utils.hideKeyboard
@@ -1446,13 +1442,7 @@ class CardBrowserFragment :
         }
 
     fun changeDisplayOrder() {
-        showDialogFragment(
-            // TODO: move this into the ViewModel
-            CardBrowserOrderDialog.newInstance { dialog: DialogInterface, which: Int ->
-                dialog.dismiss()
-                activityViewModel.changeCardOrder(LegacySortType.fromCardBrowserLabelIndex(which))
-            },
-        )
+        showDialogFragment(CardBrowserOrderDialog())
     }
 
     fun updateFlagForSelectedRows(flag: Flag) =

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CardBrowserOrderDialog.kt

@@ -17,7 +17,6 @@
 package com.ichi2.anki.dialogs
 
 import android.app.Dialog
-import android.content.DialogInterface
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.activityViewModels
@@ -50,19 +49,14 @@ class CardBrowserOrderDialog : AnalyticsDialogFragment() {
         return AlertDialog
             .Builder(requireContext())
             .setTitle(R.string.card_browser_change_display_order_title)
-            .setSingleChoiceItems(items, viewModel.order.cardBrowserLabelIndex, orderSingleChoiceDialogListener)
-            .create()
+            .setSingleChoiceItems(items, viewModel.order.cardBrowserLabelIndex) { dialog, which ->
+                dialog.dismiss()
+                viewModel.changeCardOrder(LegacySortType.fromCardBrowserLabelIndex(which))
+            }.create()
     }
 
     companion object {
-        private var orderSingleChoiceDialogListener: DialogInterface.OnClickListener? = null
-
         // SortType.NO_SORTING.cardBrowserLabelIndex
         private const val CARD_ORDER_NONE = 0
-
-        fun newInstance(orderSingleChoiceDialogListener: DialogInterface.OnClickListener): CardBrowserOrderDialog {
-            this.orderSingleChoiceDialogListener = orderSingleChoiceDialogListener
-            return CardBrowserOrderDialog()
-        }
     }
 }