refactor: replace 'bundleOf' with Bundle()

david-allison · criticalAY · commit 5c3d8fb752c9 · 2026-06-10T06:58:51.000Z
Deprecated in androidx:core 1.18.0 https://developer.android.com/jetpack/androidx/releases/core#core_and_core-ktx_version_118_2 Assisted-by: Claude Fable 5 - all
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
@@ -19,7 +19,6 @@ package com.ichi2.anki.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDialogFragment
-import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.ichi2.anki.CollectionManager.TR
@@ -140,10 +139,10 @@ class BrowserOptionsDialog : AppCompatDialogFragment(R.layout.dialog_browser_opt
             Timber.i("BrowserOptionsDialog::newInstance")
             return BrowserOptionsDialog().apply {
                 arguments =
-                    bundleOf(
-                        CARDS_OR_NOTES_KEY to (cardsOrNotes == CardsOrNotes.CARDS),
-                        IS_TRUNCATED_KEY to isTruncated,
-                    )
+                    Bundle().apply {
+                        putBoolean(CARDS_OR_NOTES_KEY, cardsOrNotes == CardsOrNotes.CARDS)
+                        putBoolean(IS_TRUNCATED_KEY, isTruncated)
+                    }
             }
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt
@@ -34,7 +34,6 @@ import android.widget.Spinner
 import androidx.annotation.CheckResult
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -146,7 +145,7 @@ class ChangeNoteTypeDialog : AnalyticsDialogFragment(R.layout.dialog_change_note
         launchCatchingTask {
             viewModel.closeDialogFlow.filterNotNull().collect {
                 Timber.i("Dismissing dialog")
-                parentFragmentManager.setFragmentResult(REQUEST_KEY_NOTE_TYPE_CHANGED, bundleOf())
+                parentFragmentManager.setFragmentResult(REQUEST_KEY_NOTE_TYPE_CHANGED, Bundle())
                 dismiss()
             }
         }
@@ -315,9 +314,9 @@ class ChangeNoteTypeDialog : AnalyticsDialogFragment(R.layout.dialog_change_note
             ChangeNoteTypeDialog().apply {
                 val ids = noteIds.distinct()
                 arguments =
-                    bundleOf(
-                        ARG_NOTE_IDS to ids.toLongArray(),
-                    )
+                    Bundle().apply {
+                        putLongArray(ARG_NOTE_IDS, ids.toLongArray())
+                    }
                 Timber.i("Showing 'change note type' dialog for %d notes", ids.size)
             }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
@@ -21,7 +21,6 @@ import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.Companion.PRIVATE
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.core.widget.doAfterTextChanged
@@ -456,7 +455,7 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
                 STUDY_FORGOT, STUDY_AHEAD, STUDY_PREVIEW, STUDY_TAGS -> CustomStudyAction.CUSTOM_STUDY_SESSION
             }
 
-        setFragmentResult(CustomStudyAction.REQUEST_KEY, bundleOf(CustomStudyAction.BUNDLE_KEY to action.ordinal))
+        setFragmentResult(CustomStudyAction.REQUEST_KEY, Bundle().apply { putInt(CustomStudyAction.BUNDLE_KEY, action.ordinal) })
 
         // save the default values (not in upstream)
         when (contextMenuOption) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
@@ -19,7 +19,6 @@ import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
@@ -115,10 +114,10 @@ class TagLimitFragment : DialogFragment() {
                 // send the selection to the custom study dialog to setup the session
                 setFragmentResult(
                     REQUEST_CUSTOM_STUDY_TAGS,
-                    bundleOf(
-                        KEY_INCLUDED_TAGS to ArrayList(tagsToInclude),
-                        KEY_EXCLUDED_TAGS to ArrayList(tagsToExclude),
-                    ),
+                    Bundle().apply {
+                        putStringArrayList(KEY_INCLUDED_TAGS, ArrayList(tagsToInclude))
+                        putStringArrayList(KEY_EXCLUDED_TAGS, ArrayList(tagsToExclude))
+                    },
                 )
                 dismiss()
             }
@@ -157,7 +156,7 @@ class TagLimitFragment : DialogFragment() {
 
         fun newInstance(deckId: DeckId) =
             TagLimitFragment().apply {
-                arguments = bundleOf(ARG_DECK_ID to deckId)
+                arguments = Bundle().apply { putLong(ARG_DECK_ID, deckId) }
             }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
@@ -22,7 +22,6 @@ import androidx.activity.addCallback
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
@@ -111,7 +110,7 @@ class HelpDialog : DialogFragment() {
     private fun newHelpPage(items: Array<HelpItem>) {
         val menuPage =
             HelpPageFragment().apply {
-                arguments = bundleOf(ARG_MENU_ITEMS to items)
+                arguments = Bundle().apply { putParcelableArray(ARG_MENU_ITEMS, items) }
             }
         childFragmentManager.commit {
             replace(R.id.fragment_container, menuPage, PAGE_TAG).addToBackStack(null)
@@ -127,10 +126,10 @@ class HelpDialog : DialogFragment() {
             UsageAnalytics.sendAnalyticsEvent(Category.LINK_CLICKED, Actions.OPENED_HELP_DIALOG)
             return HelpDialog().apply {
                 arguments =
-                    bundleOf(
-                        ARG_MENU_TITLE to R.string.help,
-                        ARG_MENU_ITEMS to mainHelpMenuItems,
-                    )
+                    Bundle().apply {
+                        putInt(ARG_MENU_TITLE, R.string.help)
+                        putParcelableArray(ARG_MENU_ITEMS, mainHelpMenuItems)
+                    }
             }
         }
 
@@ -140,10 +139,10 @@ class HelpDialog : DialogFragment() {
             val privacyItems = childHelpMenuItems.filter { it.parentId == privacyId }
             return HelpDialog().apply {
                 arguments =
-                    bundleOf(
-                        ARG_MENU_TITLE to R.string.help_title_privacy,
-                        ARG_MENU_ITEMS to privacyItems.toTypedArray(),
-                    )
+                    Bundle().apply {
+                        putInt(ARG_MENU_TITLE, R.string.help_title_privacy)
+                        putParcelableArray(ARG_MENU_ITEMS, privacyItems.toTypedArray())
+                    }
             }
         }
 
@@ -158,10 +157,10 @@ class HelpDialog : DialogFragment() {
             val actualMenuItems = supportMenuItems.filterNot { it.action is Rate && !canRateApp }
             return HelpDialog().apply {
                 arguments =
-                    bundleOf(
-                        ARG_MENU_TITLE to R.string.help_title_support_ankidroid,
-                        ARG_MENU_ITEMS to actualMenuItems.toTypedArray(),
-                    )
+                    Bundle().apply {
+                        putInt(ARG_MENU_TITLE, R.string.help_title_support_ankidroid)
+                        putParcelableArray(ARG_MENU_ITEMS, actualMenuItems.toTypedArray())
+                    }
             }
         }
     }
@@ -204,7 +203,7 @@ class HelpPageFragment : Fragment(R.layout.fragment_help_page) {
                     UsageAnalytics.sendAnalyticsEvent(Category.LINK_CLICKED, menuItem.analyticsId)
                     parentFragmentManager.setFragmentResult(
                         REQUEST_HELP_PAGE,
-                        bundleOf(ARG_SELECTED_MENU_ITEM to menuItem),
+                        Bundle().apply { putParcelable(ARG_SELECTED_MENU_ITEM, menuItem) },
                     )
                 }
                 binding.pageContent.addView(this)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
@@ -20,7 +20,6 @@ import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
@@ -146,11 +145,11 @@ class TagsDialog : AnalyticsDialogFragment {
     ): TagsDialog {
         // TODO: checkedTags is unbounded and could exceed the bundle size
         val file = IdsFile(context.cacheDir, noteIds)
-        arguments = this.arguments ?: bundleOf(
-            ARG_TAGS_FILE to file,
-            ARG_DIALOG_TYPE to type,
-            ARG_CHECKED_TAGS to checkedTags,
-        )
+        arguments = this.arguments ?: Bundle().apply {
+            putParcelable(ARG_TAGS_FILE, file)
+            putParcelable(ARG_DIALOG_TYPE, type)
+            putStringArrayList(ARG_CHECKED_TAGS, checkedTags)
+        }
         return this
     }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import android.app.Dialog`
`19`	`19`	`import android.content.Context`
`20`	`20`	`import android.os.Bundle`
`21`	`21`	`import androidx.appcompat.app.AlertDialog`
`22`		`-import androidx.core.os.bundleOf`
`23`	`22`	`import androidx.core.view.isVisible`
`24`	`23`	`import androidx.fragment.app.DialogFragment`
`25`	`24`	`import androidx.fragment.app.setFragmentResult`
`@@ -115,10 +114,10 @@ class TagLimitFragment : DialogFragment() {`
`115`	`114`	`// send the selection to the custom study dialog to setup the session`
`116`	`115`	`setFragmentResult(`
`117`	`116`	`REQUEST_CUSTOM_STUDY_TAGS,`
`118`		`- bundleOf(`
`119`		`- KEY_INCLUDED_TAGS to ArrayList(tagsToInclude),`
`120`		`- KEY_EXCLUDED_TAGS to ArrayList(tagsToExclude),`
`121`		`- ),`
	`117`	`+ Bundle().apply {`
	`118`	`+ putStringArrayList(KEY_INCLUDED_TAGS, ArrayList(tagsToInclude))`
	`119`	`+ putStringArrayList(KEY_EXCLUDED_TAGS, ArrayList(tagsToExclude))`
	`120`	`+ },`
`122`	`121`	`)`
`123`	`122`	`dismiss()`
`124`	`123`	`}`
`@@ -157,7 +156,7 @@ class TagLimitFragment : DialogFragment() {`
`157`	`156`
`158`	`157`	`fun newInstance(deckId: DeckId) =`
`159`	`158`	`TagLimitFragment().apply {`
`160`		`- arguments = bundleOf(ARG_DECK_ID to deckId)`
	`159`	`+ arguments = Bundle().apply { putLong(ARG_DECK_ID, deckId) }`
`161`	`160`	`}`
`162`	`161`	`}`
`163`	`162`	`}`