From 5ddeba154cadb8fe080f5270cc86be51b08ec09a Mon Sep 17 00:00:00 2001 From: mcarare Date: Wed, 16 Nov 2022 13:29:36 +0200 Subject: [PATCH] For #25808: Suppress onBackPressed deprecation. --- .../fenix/library/bookmarks/BookmarkSearchDialogFragment.kt | 1 + .../fenix/library/history/HistorySearchDialogFragment.kt | 1 + .../main/java/org/mozilla/fenix/search/SearchDialogFragment.kt | 1 + app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayDialog.kt | 1 + .../trackingprotection/TrackingProtectionPanelDialogFragment.kt | 2 ++ 5 files changed, 6 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt index 7e1237aaa..71acc1384 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt @@ -70,6 +70,7 @@ class BookmarkSearchDialogFragment : AppCompatDialogFragment(), UserInteractionH override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return object : Dialog(requireContext(), this.theme) { + @Deprecated("Deprecated in Java") override fun onBackPressed() { this@BookmarkSearchDialogFragment.onBackPressed() } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt index 84b81fb06..f9785c6aa 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt @@ -70,6 +70,7 @@ class HistorySearchDialogFragment : AppCompatDialogFragment(), UserInteractionHa override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return object : Dialog(requireContext(), this.theme) { + @Deprecated("Deprecated in Java") override fun onBackPressed() { this@HistorySearchDialogFragment.onBackPressed() } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index 9e452be31..4738aaaa8 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -154,6 +154,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return object : Dialog(requireContext(), this.theme) { + @Deprecated("Deprecated in Java") override fun onBackPressed() { this@SearchDialogFragment.onBackPressed() } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayDialog.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayDialog.kt index 7167c3b8a..a0be0c7be 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayDialog.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayDialog.kt @@ -16,6 +16,7 @@ class TabsTrayDialog( theme: Int, private val interactor: () -> BrowserTrayInteractor, ) : Dialog(context, theme) { + @Deprecated("Deprecated in Java") override fun onBackPressed() { if (interactor.invoke().onBackPressed()) { return diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt index 480c8f2d9..b1c0bf0b8 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt @@ -163,6 +163,7 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return if (args.gravity == Gravity.BOTTOM) { object : BottomSheetDialog(requireContext(), this.theme) { + @Deprecated("Deprecated in Java") override fun onBackPressed() { this@TrackingProtectionPanelDialogFragment.onBackPressed() } @@ -176,6 +177,7 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt } } else { object : Dialog(requireContext()) { + @Deprecated("Deprecated in Java") override fun onBackPressed() { this@TrackingProtectionPanelDialogFragment.onBackPressed() }