Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1801: Audio player running after closing #4629

Merged
merged 13 commits into from
Feb 2, 2023
Merged

Fix #1801: Audio player running after closing #4629

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f242c99
Check for pause audio pending requests from PlayerStatus observer and…
KevinGitonga Sep 28, 2022
ba93286
Merge branch 'oppia:develop' into fix-audio-playing-after-close-issue
KevinGitonga Sep 28, 2022
6a1b178
Check pendingAudioPause request directly from "pauseAudio" since it i…
KevinGitonga Sep 30, 2022
61f9965
Merge branch 'oppia:develop' into fix-audio-playing-after-close-issue
KevinGitonga Oct 11, 2022
7ab3af1
Merge branch 'develop' into fix-audio-playing-after-close-issue
KevinGitonga Jan 17, 2023
d67eca9
Fix lint check CI failure issue.
KevinGitonga Jan 17, 2023
740f2d2
Merge branch 'oppia:develop' into fix-audio-playing-after-close-issue
KevinGitonga Jan 31, 2023
c677351
Add comments on the changes as to why this fix works and link notes.
KevinGitonga Jan 31, 2023
c097b5b
Merge branch 'develop' into fix-audio-playing-after-close-issue
BenHenning Jan 31, 2023
800a21e
Update comments to line wrap at atleast 100 chars.
KevinGitonga Feb 1, 2023
a2d40c1
Update comments to line wrap at atleast 100 chars.
KevinGitonga Feb 1, 2023
362e4eb
Update comments to line wrap at atleast 100 chars.
KevinGitonga Feb 1, 2023
0968a97
Merge branch 'develop' into fix-audio-playing-after-close-issue
BenHenning Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class AudioFragmentPresenter @Inject constructor(
private val viewModel by lazy {
getAudioViewModel()
}
private var isPauseAudioRequestPending = false

/** Sets up SeekBar listener, ViewModel, and gets VoiceoverMappings or restores saved state */
fun handleCreateView(
Expand Down Expand Up @@ -101,6 +102,9 @@ class AudioFragmentPresenter @Inject constructor(
Observer {
prepared = it != UiAudioPlayStatus.LOADING && it != UiAudioPlayStatus.FAILED
binding.audioProgressSeekBar.isEnabled = prepared
if (prepared && isPauseAudioRequestPending) {
pauseAudio()
}
BenHenning marked this conversation as resolved.
Show resolved Hide resolved
}
)

Expand Down Expand Up @@ -198,8 +202,10 @@ class AudioFragmentPresenter @Inject constructor(
viewModel.loadFeedbackAudio(contentId, allowAutoPlay)

fun pauseAudio() {
if (prepared)
if (prepared && isPauseAudioRequestPending) {
viewModel.pauseAudio()
isPauseAudioRequestPending = false
}
}

fun handleEnableAudio(saveUserChoice: Boolean) {
Expand Down Expand Up @@ -266,6 +272,7 @@ class AudioFragmentPresenter @Inject constructor(
}

private fun hideAudioFragment() {
isPauseAudioRequestPending = true
BenHenning marked this conversation as resolved.
Show resolved Hide resolved
(activity as AudioButtonListener).showAudioStreamingOff()
(fragment as AudioUiManager).pauseAudio()
val animation = AnimationUtils.loadAnimation(context, R.anim.slide_up_audio)
Expand Down