From 8d4ca2504693fd22bf4fe536968f03c2e2449e5b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:08:15 -0600
Subject: [PATCH] Update

---
 .../ui/result/ResultFragmentTv.kt             | 24 ++++++++++---------
 .../main/res/layout/fragment_result_tv.xml    |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 46b7bc3c..396ec863 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -598,19 +598,21 @@ class ResultFragmentTv : Fragment() {
                 setIconResource(drawable)
                 setText(text)
                 setOnClickListener {
-                    val isSubscribed = viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
+                    viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? ->
+                        if (newStatus == null) return@toggleSubscriptionStatus
 
-                    val message = if (isSubscribed) {
-                        // Kinda icky to have this here, but it works.
-                        SubscriptionWorkManager.enqueuePeriodicWork(context)
-                        R.string.subscription_new
-                    } else {
-                        R.string.subscription_deleted
+                        val message = if (newStatus) {
+                            // Kinda icky to have this here, but it works.
+                            SubscriptionWorkManager.enqueuePeriodicWork(context)
+                            R.string.subscription_new
+                        } else {
+                            R.string.subscription_deleted
+                        }
+
+                        val name = (viewModel.page.value as? Resource.Success)?.value?.title
+                            ?: txt(R.string.no_data).asStringNull(context) ?: ""
+                        CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
                     }
-
-                    val name = (viewModel.page.value as? Resource.Success)?.value?.title
-                        ?: txt(R.string.no_data).asStringNull(context) ?: ""
-                    CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
                 }
             }
         }
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 8fd2271b..9311d549 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -348,7 +348,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                             style="@style/ResultButtonTV"
 
                             android:nextFocusRight="@id/redirect_to_episodes"
-                            android:nextFocusUp="@id/result_favorite_button"
+                            android:nextFocusUp="@id/result_subscribe_button"
                             android:nextFocusDown="@id/result_cast_items"
 
                             android:text="@string/episodes"