Merge branch 'temp-integration-pt3' of github.com:oppia/oppia-android…

… into temp-integration-pt3
oppia · Dec 5, 2019 · 2116427 · 2116427
2 parents 5fb1395 + 331fda3
commit 2116427
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
@@ -306,6 +306,9 @@ class StateFragmentPresenter @Inject constructor(
           feedbackId = null
         }
       } else if (it == AudioViewModel.UiAudioPlayStatus.PREPARED) {
+        if(isAudioShowing() && !isFeedbackPlaying){
+          autoPlayAudio = true
+        }
         if (autoPlayAudio) {
           autoPlayAudio = false
           audioFragmentInterface.playAudio()
@@ -333,6 +336,8 @@ class StateFragmentPresenter @Inject constructor(
     val scrollToTop = ::currentStateName.isInitialized && currentStateName != ephemeralState.state.name
     currentStateName = ephemeralState.state.name
 
+    isFeedbackPlaying = false
+
     showOrHideAudioByState(ephemeralState.state)
     if (isAudioShowing()) {
       (getAudioFragment() as AudioFragmentInterface).setVoiceoverMappings(explorationId, currentStateName, feedbackId)