Skip to content

Commit

Permalink
NF: introduce requireDeckPicker
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arthur-Milchior @mikehardy
Arthur-Milchior authored and mikehardy committed Dec 8, 2024
1 parent 5d0d443 commit da82fb1
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ import java.io.IOException
class DatabaseErrorDialog : AsyncDialogFragment() {
private lateinit var backups: Array<File>

private fun requireDeckPicker() = activity as DeckPicker

@SuppressLint("CheckResult")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
super.onCreateDialog(savedInstanceState)
Expand Down Expand Up @@ -131,15 +133,15 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
?.showDatabaseErrorDialog(DIALOG_ERROR_HANDLING, exceptionData)
}
negativeButton(R.string.answering_error_report) {
(activity as DeckPicker).sendErrorReport()
requireDeckPicker().sendErrorReport()
activity?.dismissAllDialogFragments()
}
neutralButton(R.string.close) {
closeCollectionAndFinish()
}
}.apply {
show()
getButton(Dialog.BUTTON_NEGATIVE).isEnabled = (activity as DeckPicker).hasErrorFiles()
getButton(Dialog.BUTTON_NEGATIVE).isEnabled = requireDeckPicker().hasErrorFiles()
}
}
DIALOG_ERROR_HANDLING -> {
Expand Down Expand Up @@ -179,23 +181,23 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
listItems(items = options) { _, index ->
when (values[index]) {
ErrorHandlingEntries.RETRY -> {
ActivityCompat.recreate(activity as DeckPicker)
ActivityCompat.recreate(requireDeckPicker())
return@listItems
}
ErrorHandlingEntries.REPAIR -> {
(activity as DeckPicker).showDatabaseErrorDialog(DIALOG_REPAIR_COLLECTION, exceptionData)
requireDeckPicker().showDatabaseErrorDialog(DIALOG_REPAIR_COLLECTION, exceptionData)
return@listItems
}
ErrorHandlingEntries.RESTORE -> {
(activity as DeckPicker).showDatabaseErrorDialog(DIALOG_RESTORE_BACKUP, exceptionData)
requireDeckPicker().showDatabaseErrorDialog(DIALOG_RESTORE_BACKUP, exceptionData)
return@listItems
}
ErrorHandlingEntries.ONE_WAY -> {
(activity as DeckPicker).showDatabaseErrorDialog(DIALOG_ONE_WAY_SYNC_FROM_SERVER, exceptionData)
requireDeckPicker().showDatabaseErrorDialog(DIALOG_ONE_WAY_SYNC_FROM_SERVER, exceptionData)
return@listItems
}
ErrorHandlingEntries.NEW -> {
(activity as DeckPicker).showDatabaseErrorDialog(DIALOG_NEW_COLLECTION, exceptionData)
requireDeckPicker().showDatabaseErrorDialog(DIALOG_NEW_COLLECTION, exceptionData)
return@listItems
}

Expand All @@ -219,7 +221,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
message(text = message)
setIcon(R.drawable.ic_warning)
positiveButton(R.string.dialog_positive_repair) {
(activity as DeckPicker).repairCollection()
requireDeckPicker().repairCollection()
activity?.dismissAllDialogFragments()
}
negativeButton(R.string.dialog_cancel)
Expand Down Expand Up @@ -290,9 +292,9 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
CollectionManager.closeCollectionBlocking()
val path1 = CollectionHelper.getCollectionPath(requireActivity())
if (BackupManager.moveDatabaseToBrokenDirectory(path1, false, time)) {
ActivityCompat.recreate(activity as DeckPicker)
ActivityCompat.recreate(requireDeckPicker())
} else {
(activity as DeckPicker).showDatabaseErrorDialog(DIALOG_LOAD_FAILED, exceptionData)
requireDeckPicker().showDatabaseErrorDialog(DIALOG_LOAD_FAILED, exceptionData)
}
}
negativeButton(R.string.dialog_cancel)
Expand All @@ -304,7 +306,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
title(R.string.check_db_title)
message(text = message)
positiveButton(R.string.dialog_ok) {
(activity as DeckPicker).integrityCheck()
requireDeckPicker().integrityCheck()
activity?.dismissAllDialogFragments()
}
negativeButton(R.string.dialog_cancel)
Expand All @@ -328,7 +330,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
title(R.string.backup_one_way_sync_from_server)
message(text = message)
positiveButton(R.string.dialog_positive_overwrite) {
(activity as DeckPicker).sync(ConflictResolution.FULL_DOWNLOAD)
requireDeckPicker().sync(ConflictResolution.FULL_DOWNLOAD)
activity?.dismissAllDialogFragments()
}
negativeButton(R.string.dialog_cancel)
Expand Down Expand Up @@ -363,11 +365,11 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
}
listItemsAndMessage(message = message, items = options) { _, index: Int ->
when (values[index]) {
IncompatibleDbVersionEntries.RESTORE -> (activity as DeckPicker).showDatabaseErrorDialog(
IncompatibleDbVersionEntries.RESTORE -> requireDeckPicker().showDatabaseErrorDialog(
DIALOG_RESTORE_BACKUP,
exceptionData
)
IncompatibleDbVersionEntries.ONE_WAY -> (activity as DeckPicker).showDatabaseErrorDialog(
IncompatibleDbVersionEntries.ONE_WAY -> requireDeckPicker().showDatabaseErrorDialog(
DIALOG_ONE_WAY_SYNC_FROM_SERVER,
exceptionData
)
Expand All @@ -390,7 +392,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
title(R.string.directory_inaccessible_after_uninstall)
listItemsAndMessage(message = message, items = listItems.map { getString(it.stringRes) }) { _, index: Int ->
val listItem = listItems[index]
listItem.onClick(activity as DeckPicker)
listItem.onClick(requireDeckPicker())
if (listItem.dismissesDialog) {
dismiss()
}
Expand Down

0 comments on commit da82fb1

Please sign in to comment.