From 789dd1c16015a9f58892b09e1eb761c24b0f016c Mon Sep 17 00:00:00 2001
From: Sneha Datta <snehadatta431@gmail.com>
Date: Thu, 5 Sep 2024 17:30:16 +0530
Subject: [PATCH] Migrate from QuestionPlayerActivityPresenter

---
 .../questionplayer/QuestionPlayerActivity.kt      | 15 +++++++++++----
 .../QuestionPlayerActivityPresenter.kt            |  3 +--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
index 70239733952..3af90c5f651 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
@@ -3,6 +3,7 @@ package org.oppia.android.app.topic.questionplayer
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener
@@ -56,11 +57,17 @@ class QuestionPlayerActivity :
     val profileId =
       intent.extractCurrentUserProfileId()
     questionPlayerActivityPresenter.handleOnCreate(profileId)
-  }
 
-  override fun onBackPressed() {
-    showStopExplorationDialogFragment()
-    questionPlayerActivityPresenter.setReadingTextSizeNormal()
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(/* enabled = */ true) {
+        override fun handleOnBackPressed() {
+          showStopExplorationDialogFragment()
+          questionPlayerActivityPresenter.setReadingTextSizeNormal()
+          finish()
+        }
+      }
+    )
   }
 
   override fun restartSession() = questionPlayerActivityPresenter.restartSession()
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
index 523ebf2cc4d..345941e95e1 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
@@ -61,8 +61,7 @@ class QuestionPlayerActivityPresenter @Inject constructor(
     activity.setSupportActionBar(binding.questionPlayerToolbar)
 
     binding.questionPlayerToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      activity.onBackPressed()
+      activity.onBackPressedDispatcher.onBackPressed()
     }
 
     retrieveReadingTextSize().observe(