From a5473a56609284f9e23a72c8188524b3f5733926 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:40:20 -0600 Subject: [PATCH] Don't use requireActivity() or !! --- .../main/java/com/lagradost/cloudstream3/MainActivity.kt | 2 +- .../lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt index 22fa330d..38897472 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt @@ -1590,7 +1590,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener { } backPressedCallback?.isEnabled = true - onBackPressedDispatcher.addCallback(this, backPressedCallback!!) + onBackPressedDispatcher.addCallback(this, backPressedCallback ?: return) } private fun detachBackPressedCallback() { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt index baa9fbf2..ef3db0b4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt @@ -187,7 +187,11 @@ open class ResultTrailerPlayer : ResultFragmentPhone() { } backPressedCallback?.isEnabled = true - requireActivity().onBackPressedDispatcher.addCallback(requireActivity(), backPressedCallback!!) + + activity?.onBackPressedDispatcher?.addCallback( + activity ?: return, + backPressedCallback ?: return + ) } private fun detachBackPressedCallback() {