Skip to content

Commit 4b74f3c

Browse files
authored
Merge pull request libre-tube#7149 from Bnyro/master
chore: remove unnecessary authApi uses for playlist nextpages
2 parents 9f2dadc + 0aa8ebb commit 4b74f3c

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

app/src/main/java/com/github/libretube/helpers/ImportHelper.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ import androidx.core.net.toUri
88
import com.github.libretube.R
99
import com.github.libretube.api.JsonHelper
1010
import com.github.libretube.api.PlaylistsHelper
11-
import com.github.libretube.api.RetrofitInstance
1211
import com.github.libretube.api.SubscriptionHelper
1312
import com.github.libretube.db.DatabaseHelper
14-
import com.github.libretube.db.DatabaseHolder.Database
1513
import com.github.libretube.db.obj.WatchHistoryItem
1614
import com.github.libretube.enums.ImportFormat
1715
import com.github.libretube.extensions.TAG
@@ -108,12 +106,7 @@ object ImportHelper {
108106
@OptIn(ExperimentalSerializationApi::class)
109107
suspend fun exportSubscriptions(activity: Activity, uri: Uri, importFormat: ImportFormat) {
110108
val token = PreferenceHelper.getToken()
111-
val subs = if (token.isNotEmpty()) {
112-
RetrofitInstance.authApi.subscriptions(token)
113-
} else {
114-
val subscriptions = Database.localSubscriptionDao().getAll().map { it.channelId }
115-
RetrofitInstance.authApi.unauthenticatedSubscriptions(subscriptions)
116-
}
109+
val subs = SubscriptionHelper.getSubscriptions()
117110

118111
when (importFormat) {
119112
ImportFormat.NEWPIPE -> {

app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,7 @@ class PlaylistFragment : DynamicLayoutManagerFragment(R.layout.fragment_playlist
382382
val response = try {
383383
withContext(Dispatchers.IO) {
384384
// load locally stored playlists with the auth api
385-
if (playlistType == PlaylistType.PRIVATE) {
386-
RetrofitInstance.authApi.getPlaylistNextPage(playlistId, nextPage!!)
387-
} else {
388-
RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage!!)
389-
}
385+
RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage!!)
390386
}
391387
} catch (e: Exception) {
392388
context?.toastFromMainDispatcher(e.localizedMessage.orEmpty())

app/src/main/java/com/github/libretube/util/PlayingQueue.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ object PlayingQueue {
158158
) {
159159
var playlistNextPage = nextPage
160160
while (playlistNextPage != null) {
161-
RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage).run {
161+
RetrofitInstance.api.getPlaylistNextPage(playlistId, playlistNextPage).run {
162162
addToQueueAsync(relatedStreams, isMainList = isMainList)
163163
playlistNextPage = this.nextpage
164164
}

0 commit comments

Comments
 (0)