Merge pull request #966 from Bnyro/master

more fixes
libre-tube · Aug 4, 2022 · fd00deb · fd00deb
2 parents 02f0bb5 + 2c22978
commit fd00deb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -115,7 +115,6 @@ class PlayerFragment : Fragment() {
      */
     private var videoId: String? = null
     private var playlistId: String? = null
-    private var channelId: String? = null
     private var isSubscribed: Boolean? = false
     private var isLive = false
     private lateinit var streams: Streams
@@ -1558,8 +1557,9 @@ class PlayerFragment : Fragment() {
 
     private fun isSubscribed() {
         fun run() {
+            val channelId = streams.uploaderUrl.toID()
             lifecycleScope.launchWhenCreated {
-                isSubscribed = SubscriptionHelper.isSubscribed(channelId!!)
+                isSubscribed = SubscriptionHelper.isSubscribed(channelId)
 
                 if (isSubscribed == null) return@launchWhenCreated
 
@@ -1569,11 +1569,13 @@ class PlayerFragment : Fragment() {
                     }
                     binding.playerSubscribe.setOnClickListener {
                         if (isSubscribed == true) {
-                            SubscriptionHelper.unsubscribe(channelId!!)
+                            SubscriptionHelper.unsubscribe(channelId)
                             binding.playerSubscribe.text = getString(R.string.subscribe)
+                            isSubscribed = false
                         } else {
-                            SubscriptionHelper.subscribe(channelId!!)
+                            SubscriptionHelper.subscribe(channelId)
                             binding.playerSubscribe.text = getString(R.string.unsubscribe)
+                            isSubscribed = true
                         }
                     }
                 }