Skip to content

Commit 31fd401

Browse files
committed
lint(CardMediaPlayer):
* remove unused variable * remove `suspend`
1 parent ee2aebe commit 31fd401

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/CardMediaPlayer.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,14 @@ class CardMediaPlayer : Closeable {
171171
}
172172
}
173173

174-
suspend fun autoplayAllForSide(cardSide: CardSide): Job? {
174+
fun autoplayAllForSide(cardSide: CardSide): Job? {
175175
if (config.autoplay) {
176176
return playAllForSide(cardSide)
177177
}
178178
return null
179179
}
180180

181-
suspend fun playAllForSide(cardSide: CardSide): Job? {
181+
fun playAllForSide(cardSide: CardSide): Job? {
182182
if (!isEnabled) return null
183183
playAvTagsJob {
184184
Timber.i("playing sounds for %s", cardSide)
@@ -335,7 +335,7 @@ class CardMediaPlayer : Closeable {
335335
/**
336336
* Plays all sounds for the current side, calling [onMediaGroupCompleted] when completed
337337
*/
338-
suspend fun playAll(side: SingleCardSide) =
338+
fun playAll(side: SingleCardSide) =
339339
when (side) {
340340
SingleCardSide.FRONT -> playAllForSide(CardSide.QUESTION)
341341
SingleCardSide.BACK -> playAllForSide(CardSide.ANSWER)
@@ -344,7 +344,7 @@ class CardMediaPlayer : Closeable {
344344
/**
345345
* Replays all sounds for [side], calling [onMediaGroupCompleted] when completed
346346
*/
347-
suspend fun replayAll(side: SingleCardSide) =
347+
fun replayAll(side: SingleCardSide) =
348348
when (side) {
349349
SingleCardSide.BACK -> if (config.replayQuestion) playAllForSide(CardSide.BOTH) else playAllForSide(CardSide.ANSWER)
350350
SingleCardSide.FRONT -> playAllForSide(CardSide.QUESTION)
@@ -364,8 +364,7 @@ class CardMediaPlayer : Closeable {
364364
}
365365

366366
/** Ensures that only one [playAvTagsJob] is running at once */
367-
// TODO: make non-suspend
368-
private suspend fun playAvTagsJob(block: suspend CoroutineScope.() -> Unit) {
367+
private fun playAvTagsJob(block: suspend CoroutineScope.() -> Unit) {
369368
val oldJob = playAvTagsJob
370369
this.playAvTagsJob =
371370
scope.launch {
@@ -447,8 +446,6 @@ enum class MediaErrorBehavior {
447446
fun AbstractFlashcardViewer.createMediaErrorListener(): MediaErrorListener {
448447
val activity = this
449448
return object : MediaErrorListener {
450-
private var handledError: HashSet<String> = hashSetOf()
451-
452449
override fun onMediaPlayerError(
453450
mp: MediaPlayer?,
454451
which: Int,

0 commit comments

Comments
 (0)