From 70406d40eae715054a050166bd780ab1811ff2d3 Mon Sep 17 00:00:00 2001 From: Aayush Gupta <aayushgupta219@gmail.com> Date: Thu, 19 Sep 2024 11:24:16 +0530 Subject: [PATCH] Switch to onBackPressedDispatcher for navigating back onBackPressed() method has been deprecated Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com> --- .../main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt | 2 +- .../seedvault/ui/recoverycode/RecoveryCodeActivity.kt | 2 +- .../grobox/storagebackuptester/restore/DemoSnapshotFragment.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt index 29e48148..0743c4f7 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt @@ -23,7 +23,7 @@ abstract class BackupActivity : AppCompatActivity() { @CallSuper override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { android.R.id.home -> { - onBackPressed() + onBackPressedDispatcher.onBackPressed() true } else -> super.onOptionsItemSelected(item) diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt index bc05595c..57c22515 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt @@ -45,7 +45,7 @@ class RecoveryCodeActivity : BackupActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { android.R.id.home -> { - onBackPressed() + onBackPressedDispatcher.onBackPressed() true } else -> super.onOptionsItemSelected(item) diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt index 13fcf328..dd5ab72b 100644 --- a/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt +++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt @@ -31,7 +31,7 @@ class DemoSnapshotFragment : SnapshotFragment() { bottomStub.layoutResource = R.layout.footer_snapshot val footer = bottomStub.inflate() footer.findViewById<Button>(R.id.button).setOnClickListener { - requireActivity().onBackPressed() + requireActivity().onBackPressedDispatcher.onBackPressed() } return v }