From 0aa8ebb413de00eb73b1eb7170d56793dff9565d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 1 Mar 2025 17:11:28 +0100
Subject: [PATCH] chore: remove unnecessary authApi uses for playlist nextpages

---
 .../java/com/github/libretube/helpers/ImportHelper.kt    | 9 +--------
 .../github/libretube/ui/fragments/PlaylistFragment.kt    | 6 +-----
 .../main/java/com/github/libretube/util/PlayingQueue.kt  | 2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
index c9b192941..3ae6da4ed 100644
--- a/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
@@ -8,10 +8,8 @@ import androidx.core.net.toUri
 import com.github.libretube.R
 import com.github.libretube.api.JsonHelper
 import com.github.libretube.api.PlaylistsHelper
-import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
 import com.github.libretube.db.DatabaseHelper
-import com.github.libretube.db.DatabaseHolder.Database
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.enums.ImportFormat
 import com.github.libretube.extensions.TAG
@@ -108,12 +106,7 @@ object ImportHelper {
     @OptIn(ExperimentalSerializationApi::class)
     suspend fun exportSubscriptions(activity: Activity, uri: Uri, importFormat: ImportFormat) {
         val token = PreferenceHelper.getToken()
-        val subs = if (token.isNotEmpty()) {
-            RetrofitInstance.authApi.subscriptions(token)
-        } else {
-            val subscriptions = Database.localSubscriptionDao().getAll().map { it.channelId }
-            RetrofitInstance.authApi.unauthenticatedSubscriptions(subscriptions)
-        }
+        val subs = SubscriptionHelper.getSubscriptions()
 
         when (importFormat) {
             ImportFormat.NEWPIPE -> {
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
index 3608fb77a..de8324bbb 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
@@ -382,11 +382,7 @@ class PlaylistFragment : DynamicLayoutManagerFragment(R.layout.fragment_playlist
             val response = try {
                 withContext(Dispatchers.IO) {
                     // load locally stored playlists with the auth api
-                    if (playlistType == PlaylistType.PRIVATE) {
-                        RetrofitInstance.authApi.getPlaylistNextPage(playlistId, nextPage!!)
-                    } else {
-                        RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage!!)
-                    }
+                    RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage!!)
                 }
             } catch (e: Exception) {
                 context?.toastFromMainDispatcher(e.localizedMessage.orEmpty())
diff --git a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
index 57748de1d..d82c5f60f 100644
--- a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
+++ b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
@@ -158,7 +158,7 @@ object PlayingQueue {
     ) {
         var playlistNextPage = nextPage
         while (playlistNextPage != null) {
-            RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage).run {
+            RetrofitInstance.api.getPlaylistNextPage(playlistId, playlistNextPage).run {
                 addToQueueAsync(relatedStreams, isMainList = isMainList)
                 playlistNextPage = this.nextpage
             }