Skip to content

Commit 3ab0ea6

Browse files
committed
fix: remove unnecessary onCreate calls
super.onCreateDialog was not required, as the classes returned a custom dialog. Introduced in ae7d237 and copy-pasted. Fixes 21171 Assisted-by: Claude Opus 4.8 - investigation and fix
1 parent a677a8a commit 3ab0ea6

10 files changed

Lines changed: 4 additions & 18 deletions

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class CardBrowserOrderDialog : AnalyticsDialogFragment() {
3333
private val viewModel: CardBrowserViewModel by activityViewModels()
3434

3535
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
36-
super.onCreate(savedInstanceState)
3736
val items = resources.getStringArray(R.array.card_browser_order_labels)
3837
// Set sort order arrow
3938
for (i in items.indices) {

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,13 @@ class ConfirmationDialog : DialogFragment() {
8585
this.cancel = cancel
8686
}
8787

88-
override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog {
89-
super.onCreate(savedInstanceState)
90-
91-
return AlertDialog.Builder(requireContext()).create {
88+
override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog =
89+
AlertDialog.Builder(requireContext()).create {
9290
title(text = title)
9391
message(text = message)
9492
positiveButton(text = positiveButtonText) { confirm.run() }
9593
negativeButton(R.string.dialog_cancel) { cancel.run() }
9694
}
97-
}
9895

9996
companion object {
10097
/** The dialog message (required) */

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.ichi2.utils.title
3030

3131
class DeckPickerBackupNoSpaceLeftDialog : AnalyticsDialogFragment() {
3232
override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog {
33-
super.onCreate(savedInstanceState)
3433
val res = resources
3534
val space = BackupManager.getFreeDiscSpace(CollectionHelper.getCollectionPath(requireActivity()))
3635
return AlertDialog

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import com.ichi2.utils.title
3737

3838
class DeckPickerContextMenu : AnalyticsDialogFragment() {
3939
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
40-
super.onCreate(savedInstanceState)
4140
require(requireArguments().containsKey(ARG_DECK_ID)) { "Missing argument deck id" }
4241
require(requireArguments().containsKey(ARG_DECK_NAME)) { "Missing argument deck name" }
4342
require(requireArguments().containsKey(ARG_DECK_IS_DYN)) { "Missing argument deck is dynamic" }

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.ichi2.anki.dialogs
1818

19-
import android.app.Dialog
2019
import android.os.Bundle
2120
import androidx.appcompat.app.AlertDialog
2221
import com.ichi2.anki.R
@@ -28,16 +27,14 @@ import com.ichi2.utils.positiveButton
2827
import com.ichi2.utils.title
2928

3029
class DeckPickerNoSpaceLeftDialog : AnalyticsDialogFragment() {
31-
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
32-
super.onCreate(savedInstanceState)
33-
return AlertDialog.Builder(requireActivity()).create {
30+
override fun onCreateDialog(savedInstanceState: Bundle?) =
31+
AlertDialog.Builder(requireActivity()).create {
3432
title(R.string.storage_full_title)
3533
message(R.string.backup_deck_no_storage_left)
3634
cancelable(true)
3735
positiveButton(R.string.dialog_ok) {}
3836
setOnCancelListener {}
3937
}
40-
}
4138

4239
companion object {
4340
fun newInstance(): DeckPickerNoSpaceLeftDialog = DeckPickerNoSpaceLeftDialog()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class ImportDialog : AsyncDialogFragment() {
4343
get() = requireArguments().getString(IMPORT_DIALOG_PACKAGE_PATH_KEY)!!
4444

4545
override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog {
46-
super.onCreate(savedInstanceState)
4746
val dialog = AlertDialog.Builder(requireActivity())
4847
dialog.setCancelable(true)
4948
val displayFileName = filenameFromPath(convertToDisplayName(packagePath))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import timber.log.Timber
2121
class NoteTypeFieldEditorContextMenu : AnalyticsDialogFragment() {
2222
@SuppressLint("CheckResult")
2323
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
24-
super.onCreate(savedInstanceState)
2524
val availableItems = NoteTypeFieldEditorContextMenuAction.entries.sortedBy { it.order }
2625

2726
return AlertDialog.Builder(requireActivity()).create {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import timber.log.Timber
4949
// dialog(or maybe even add an option to remove all entries directly)
5050
class SavedBrowserSearchesDialogFragment : AnalyticsDialogFragment() {
5151
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
52-
super.onCreate(savedInstanceState)
5352
val savedFilters: HashMap<String, String>? =
5453
requireArguments().getSerializableCompat(ARG_SAVED_FILTERS)
5554
val data =

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class SyncErrorDialog : AsyncDialogFragment() {
6767
get() = Type.fromCode(requireArguments().getInt(SYNC_ERROR_DIALOG_TYPE_KEY))
6868

6969
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
70-
super.onCreate(savedInstanceState)
7170
val dialog =
7271
AlertDialog
7372
.Builder(requireContext())

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
179179
}
180180

181181
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
182-
super.onCreate(savedInstanceState)
183182
val option = selectedSubDialog
184183
return if (option == null || !defaultsAreInitialized()) {
185184
Timber.i("Showing Custom Study main menu")

0 commit comments

Comments
 (0)