Skip to content

Commit b9ab20d

Browse files
BrayanDSOlukstbit
authored andcommitted
refactor: make listener suspendable
removes a call of launchCatchingIO
1 parent c5907a3 commit b9ab20d

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ class CardMediaPlayer : Closeable {
127127
var playAvTagsJob: Job? = null
128128
val isPlaying get() = playAvTagsJob != null
129129

130-
private var onMediaGroupCompleted: (() -> Unit)? = null
130+
private var onMediaGroupCompleted: (suspend () -> Unit)? = null
131131

132-
fun setOnMediaGroupCompletedListener(listener: (() -> Unit)?) {
132+
fun setOnMediaGroupCompletedListener(listener: (suspend () -> Unit)?) {
133133
onMediaGroupCompleted = listener
134134
}
135135

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,12 @@ class ReviewerViewModel(
160160
updateNextTimes()
161161
}
162162
cardMediaPlayer.setOnMediaGroupCompletedListener {
163-
launchCatchingIO {
164-
if (!autoAdvance.shouldWaitForAudio()) return@launchCatchingIO
163+
if (!autoAdvance.shouldWaitForAudio()) return@setOnMediaGroupCompletedListener
165164

166-
if (showingAnswer.value) {
167-
autoAdvance.onShowAnswer()
168-
} else {
169-
autoAdvance.onShowQuestion()
170-
}
165+
if (showingAnswer.value) {
166+
autoAdvance.onShowAnswer()
167+
} else {
168+
autoAdvance.onShowQuestion()
171169
}
172170
}
173171
}

0 commit comments

Comments
 (0)