Fix #5404 : Migrate onBackPressed

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt

@@ -3,6 +3,7 @@ package org.oppia.android.app.administratorcontrols
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
@@ -83,6 +84,33 @@ class AdministratorControlsActivity :
       isProfileDeletionDialogVisible
     )
     title = resourceHandler.getStringInLocale(R.string.administrator_controls)
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@AdministratorControlsActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          val fragment =
+            supportFragmentManager.findFragmentById(
+              R.id.administrator_controls_fragment_multipane_placeholder
+            )
+          /*
+           * If the current fragment is ProfileListFragment then the activity should end on back press.
+           * If it's instead ProfileEditFragment then profileListFragment should be inflated via
+           * handleOnBackPressed.
+           */
+          if (fragment is ProfileEditFragment) {
+            administratorControlsActivityPresenter.handleOnBackPressed()
+          } else {
+            isEnabled = false
+            onBackPressedDispatcher.onBackPressed()
+            isEnabled = true
+          }
+        }
+      }
+    )
   }
 
   override fun routeToAppVersion() {
@@ -121,24 +149,6 @@ class AdministratorControlsActivity :
     }
   }
 
-  override fun onBackPressed() {
-    val fragment =
-      supportFragmentManager.findFragmentById(
-        R.id.administrator_controls_fragment_multipane_placeholder
-      )
-    /*
-     * If the current fragment is ProfileListFragment then the activity should end on back press.
-     * If it's instead ProfileEditFragment then profileListFragment should be inflated via
-     * handleOnBackPressed.
-     */
-    if (fragment is ProfileEditFragment) {
-      administratorControlsActivityPresenter.handleOnBackPressed()
-    } else {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      super.onBackPressed()
-    }
-  }
-
   override fun loadProfileList() {
     lastLoadedFragment = PROFILE_LIST_FRAGMENT
     administratorControlsActivityPresenter

app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.model.ScreenName.APP_VERSION_ACTIVITY
@@ -19,16 +20,29 @@ class AppVersionActivity : InjectableAutoLocalizedAppCompatActivity() {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
     appVersionActivityPresenter.handleOnCreate()
+    handleBackPress()
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      onBackPressed()
+      onBackPressedDispatcher.onBackPressed()
     }
     return super.onOptionsItemSelected(item)
   }
 
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@AppVersionActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = false
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = true
+        }
+      }
+    )
+  }
+
   companion object {
     /** Returns an [Intent] to start this activity. */
     fun createAppVersionActivityIntent(context: Context): Intent {

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.model.ScreenName.PROFILE_AND_DEVICE_ID_ACTIVITY
@@ -24,16 +25,28 @@ class ProfileAndDeviceIdActivity : InjectableAutoLocalizedAppCompatActivity() {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
     profileAndDeviceIdActivityPresenter.handleOnCreate()
+    handleBackPress()
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      onBackPressed()
+      onBackPressedDispatcher.onBackPressed()
     }
     return super.onOptionsItemSelected(item)
   }
 
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@ProfileAndDeviceIdActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = false
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = true
+        }
+      }
+    )
+  }
   companion object {
     /** Returns an [Intent] to launch [ProfileAndDeviceIdActivity]. */
     fun createIntent(context: Context): Intent {

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
@@ -37,12 +38,25 @@ class MarkChaptersCompletedActivity : InjectableAutoLocalizedAppCompatActivity()
     val showConfirmationNotice = args?.showConfirmationNotice ?: false
     markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId, showConfirmationNotice)
     title = resourceHandler.getStringInLocale(R.string.mark_chapters_completed_activity_title)
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@MarkChaptersCompletedActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = false
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = true
+        }
+      }
+    )
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      onBackPressed()
+      onBackPressedDispatcher.onBackPressed()
     }
     return super.onOptionsItemSelected(item)
   }

app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
@@ -34,12 +35,25 @@ class MarkStoriesCompletedActivity : InjectableAutoLocalizedAppCompatActivity()
     internalProfileId = profileId?.internalId ?: -1
     markStoriesCompletedActivityPresenter.handleOnCreate(internalProfileId)
     title = resourceHandler.getStringInLocale(R.string.mark_stories_completed_activity_title)
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@MarkStoriesCompletedActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = false
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = true
+        }
+      }
+    )
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      onBackPressed()
+      onBackPressedDispatcher.onBackPressed()
     }
     return super.onOptionsItemSelected(item)
   }

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
@@ -34,12 +35,25 @@ class MarkTopicsCompletedActivity : InjectableAutoLocalizedAppCompatActivity() {
     internalProfileId = profileId?.internalId ?: -1
     markTopicsCompletedActivityPresenter.handleOnCreate(internalProfileId)
     title = resourceHandler.getStringInLocale(R.string.mark_topics_completed_activity_title)
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@MarkTopicsCompletedActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = false
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = true
+        }
+      }
+    )
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      onBackPressed()
+      onBackPressedDispatcher.onBackPressed()
     }
     return super.onOptionsItemSelected(item)
   }

app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt

@@ -3,6 +3,7 @@ package org.oppia.android.app.options
 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.model.ReadingTextSize
@@ -34,6 +35,18 @@ class ReadingTextSizeActivity : InjectableAutoLocalizedAppCompatActivity() {
       savedInstanceState?.retrieveStateBundle()?.selectedReadingTextSize
         ?: retrieveActivityParams().readingTextSize
     readingTextSizeActivityPresenter.handleOnCreate(readingTextSize)
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@ReadingTextSizeActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          onBackPressedDispatcher.onBackPressed()
+        }
+      }
+    )
   }
 
   companion object {

app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt

@@ -28,8 +28,7 @@ class ReadingTextSizeActivityPresenter @Inject constructor(
   private fun setToolbar() {
     val readingTextSizeToolbar: Toolbar = activity.findViewById(R.id.reading_text_size_toolbar)
     readingTextSizeToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      activity.onBackPressed()
+      activity.onBackPressedDispatcher.onBackPressed()
     }
   }
 

app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt

@@ -3,6 +3,7 @@ package org.oppia.android.app.player.exploration
 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.HintsAndSolutionDialogFragment
@@ -66,6 +67,20 @@ class ExplorationActivity :
       params.parentScreen,
       params.isCheckpointingEnabled
     )
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@ExplorationActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = true
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = false
+        }
+      }
+    )
   }
 
   // TODO(#1655): Re-restrict access to fields in tests post-Gradle.

app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt

@@ -111,8 +111,7 @@ class ExplorationActivityPresenter @Inject constructor(
     }
 
     binding.explorationToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      activity.onBackPressed()
+      activity.onBackPressedDispatcher.onBackPressed()
     }
 
     binding.actionAudioPlayer.setOnClickListener {

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt

@@ -3,6 +3,7 @@ package org.oppia.android.app.resumelesson
 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.home.RouteToExplorationListener
@@ -37,6 +38,20 @@ class ResumeLessonActivity :
       params.parentScreen,
       params.checkpoint
     )
+    handleBackPress()
+  }
+
+  private fun handleBackPress() {
+    onBackPressedDispatcher.addCallback(
+      this@ResumeLessonActivity,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          isEnabled = false
+          onBackPressedDispatcher.onBackPressed()
+          isEnabled = true
+        }
+      }
+    )
   }
 
   // TODO(#1655): Re-restrict access to fields in tests post-Gradle.

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt

@@ -33,8 +33,7 @@ class ResumeLessonActivityPresenter @Inject constructor(
     activity.setSupportActionBar(resumeLessonToolbar)
 
     resumeLessonToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      activity.onBackPressed()
+      activity.onBackPressedDispatcher.onBackPressed()
     }
 
     if (getResumeLessonFragment() == null) {