Skip to content

Commit 425ac64

Browse files
committed
refactor: remove unused code
- refactor: replace media check result dialog with fragment - refactor: remove unused parameter in Media.kt
1 parent e14d616 commit 425ac64

File tree

8 files changed

+5
-476
lines changed

8 files changed

+5
-476
lines changed

AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt

Lines changed: 4 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ import com.ichi2.anki.dialogs.EmptyCardsDialogFragment
130130
import com.ichi2.anki.dialogs.ImportDialog.ImportDialogListener
131131
import com.ichi2.anki.dialogs.ImportFileSelectionFragment.ApkgImportResultLauncherProvider
132132
import com.ichi2.anki.dialogs.ImportFileSelectionFragment.CsvImportResultLauncherProvider
133-
import com.ichi2.anki.dialogs.MediaCheckDialog
134-
import com.ichi2.anki.dialogs.MediaCheckDialog.MediaCheckDialogListener
135133
import com.ichi2.anki.dialogs.SyncErrorDialog
136134
import com.ichi2.anki.dialogs.SyncErrorDialog.Companion.newInstance
137135
import com.ichi2.anki.dialogs.SyncErrorDialog.SyncErrorDialogListener
@@ -143,6 +141,7 @@ import com.ichi2.anki.export.ExportDialogsFactory
143141
import com.ichi2.anki.export.ExportDialogsFactoryProvider
144142
import com.ichi2.anki.introduction.CollectionPermissionScreenLauncher
145143
import com.ichi2.anki.introduction.hasCollectionStoragePermissions
144+
import com.ichi2.anki.mediacheck.ConfirmMediaCheckDialog
146145
import com.ichi2.anki.noteeditor.NoteEditorLauncher
147146
import com.ichi2.anki.notetype.ManageNotetypes
148147
import com.ichi2.anki.pages.AnkiPackageImporterFragment
@@ -153,7 +152,6 @@ import com.ichi2.anki.preferences.PreferencesActivity
153152
import com.ichi2.anki.preferences.sharedPrefs
154153
import com.ichi2.anki.receiver.SdCardReceiver
155154
import com.ichi2.anki.servicelayer.ScopedStorageService
156-
import com.ichi2.anki.servicelayer.checkMedia
157155
import com.ichi2.anki.settings.Prefs
158156
import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
159157
import com.ichi2.anki.snackbar.SnackbarBuilder
@@ -165,13 +163,11 @@ import com.ichi2.anki.worker.SyncMediaWorker
165163
import com.ichi2.anki.worker.SyncWorker
166164
import com.ichi2.anki.worker.UniqueWorkNames
167165
import com.ichi2.annotations.NeedsTest
168-
import com.ichi2.async.deleteMedia
169166
import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
170167
import com.ichi2.compat.CompatHelper.Companion.sdkVersion
171168
import com.ichi2.libanki.ChangeManager
172169
import com.ichi2.libanki.DeckId
173170
import com.ichi2.libanki.Decks
174-
import com.ichi2.libanki.MediaCheckResult
175171
import com.ichi2.libanki.exception.ConfirmModSchemaException
176172
import com.ichi2.libanki.sched.DeckNode
177173
import com.ichi2.libanki.utils.TimeManager
@@ -244,7 +240,6 @@ open class DeckPicker :
244240
StudyOptionsListener,
245241
SyncErrorDialogListener,
246242
ImportDialogListener,
247-
MediaCheckDialogListener,
248243
OnRequestPermissionsResultCallback,
249244
ChangeManager.Subscriber,
250245
SyncCompletionListener,
@@ -1181,7 +1176,7 @@ open class DeckPicker :
11811176
}
11821177
R.id.action_check_media -> {
11831178
Timber.i("DeckPicker:: Check media button pressed")
1184-
showMediaCheckDialog(MediaCheckDialog.Type.DIALOG_CONFIRM_MEDIA_CHECK)
1179+
ConfirmMediaCheckDialog().show(supportFragmentManager, "ConfirmMediaCheckDialog")
11851180
return true
11861181
}
11871182
R.id.action_empty_cards -> {
@@ -1495,7 +1490,7 @@ open class DeckPicker :
14951490
}
14961491
KeyEvent.KEYCODE_M -> {
14971492
Timber.i("Check media from keypress")
1498-
showMediaCheckDialog(MediaCheckDialog.Type.DIALOG_CONFIRM_MEDIA_CHECK)
1493+
ConfirmMediaCheckDialog().show(supportFragmentManager, "ConfirmMediaCheckDialog")
14991494
return true
15001495
}
15011496
KeyEvent.KEYCODE_E -> {
@@ -1812,17 +1807,6 @@ open class DeckPicker :
18121807
}
18131808
}
18141809

1815-
override fun showMediaCheckDialog(dialogType: MediaCheckDialog.Type) {
1816-
showAsyncDialogFragment(MediaCheckDialog.newInstance(dialogType))
1817-
}
1818-
1819-
override fun showMediaCheckDialog(
1820-
dialogType: MediaCheckDialog.Type,
1821-
checkList: MediaCheckResult,
1822-
) {
1823-
showAsyncDialogFragment(MediaCheckDialog.newInstance(dialogType, checkList))
1824-
}
1825-
18261810
/**
18271811
* Show a specific sync error dialog
18281812
* @param dialogType id of dialog to show
@@ -1895,43 +1879,8 @@ open class DeckPicker :
18951879
handleDatabaseCheck()
18961880
}
18971881

1898-
/**
1899-
* Schedules a background job to find missing, unused and invalid media files.
1900-
* Shows a progress dialog while operation is running.
1901-
* When check is finished a dialog box shows number of missing, unused and invalid media files.
1902-
*
1903-
* If has the storage permission, job is scheduled, otherwise storage permission is asked first.
1904-
*/
19051882
override fun mediaCheck() {
1906-
launchCatchingTask {
1907-
val mediaCheckResult = checkMedia()
1908-
showMediaCheckDialog(MediaCheckDialog.Type.DIALOG_MEDIA_CHECK_RESULTS, mediaCheckResult)
1909-
}
1910-
}
1911-
1912-
override fun deleteUnused(unused: List<String>) {
1913-
launchCatchingTask {
1914-
// Number of deleted files
1915-
val noOfDeletedFiles =
1916-
withProgress(resources.getString(R.string.delete_media_message)) {
1917-
withCol { deleteMedia(this@withCol, unused) }
1918-
}
1919-
showSimpleMessageDialog(
1920-
title = resources.getString(R.string.delete_media_result_title),
1921-
message = resources.getQuantityString(R.plurals.delete_media_result_message, noOfDeletedFiles, noOfDeletedFiles),
1922-
)
1923-
}
1924-
}
1925-
1926-
override fun tagMissing(missingMediaNotes: List<Long>?) {
1927-
if (missingMediaNotes == null) return
1928-
1929-
Timber.d("DeckPicker:: Adding missing media tag")
1930-
launchCatchingTask {
1931-
withCol {
1932-
tags.bulkAdd(missingMediaNotes, TR.mediaCheckMissingMediaTag())
1933-
}
1934-
}
1883+
ConfirmMediaCheckDialog().show(supportFragmentManager, "ConfirmMediaCheckDialog")
19351884
}
19361885

19371886
open fun handleDbError() {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ abstract class DialogHandlerMessage protected constructor(
119119
WhichDialogHandler.MSG_SHOW_COLLECTION_IMPORT_REPLACE_DIALOG -> ImportUtils.CollectionImportReplace.fromMessage(message)
120120
WhichDialogHandler.MSG_SHOW_COLLECTION_IMPORT_ADD_DIALOG -> ImportUtils.CollectionImportAdd.fromMessage(message)
121121
WhichDialogHandler.MSG_SHOW_SYNC_ERROR_DIALOG -> SyncErrorDialog.SyncErrorDialogMessageHandler.fromMessage(message)
122-
WhichDialogHandler.MSG_SHOW_MEDIA_CHECK_COMPLETE_DIALOG -> MediaCheckDialog.MediaCheckCompleteDialog.fromMessage(message)
123122
WhichDialogHandler.MSG_SHOW_DATABASE_ERROR_DIALOG -> DatabaseErrorDialog.ShowDatabaseErrorDialog.fromMessage(message)
124123
WhichDialogHandler.MSG_SHOW_ONE_WAY_SYNC_DIALOG -> OneWaySyncDialog.fromMessage(message)
125124
WhichDialogHandler.MSG_DO_SYNC -> IntentHandler.Companion.DoSync()
@@ -136,7 +135,6 @@ abstract class DialogHandlerMessage protected constructor(
136135
MSG_SHOW_COLLECTION_IMPORT_REPLACE_DIALOG(1),
137136
MSG_SHOW_COLLECTION_IMPORT_ADD_DIALOG(2),
138137
MSG_SHOW_SYNC_ERROR_DIALOG(3),
139-
MSG_SHOW_MEDIA_CHECK_COMPLETE_DIALOG(5),
140138
MSG_SHOW_DATABASE_ERROR_DIALOG(6),
141139
MSG_SHOW_ONE_WAY_SYNC_DIALOG(7),
142140
MSG_DO_SYNC(8),

0 commit comments

Comments
 (0)