kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #7149 from Bnyro/master

Browse Source 
chore: remove unnecessary authApi uses for playlist nextpages
This commit is contained in:
Bnyro 2025-03-01 17:11:52 +01:00 committed by GitHub
commit 4b74f3cd75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,8 @@ import androidx.core.net.toUri
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.api.JsonHelper import com.github.libretube.api.JsonHelper
import com.github.libretube.api.PlaylistsHelper import com.github.libretube.api.PlaylistsHelper
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.SubscriptionHelper import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.db.DatabaseHelper import com.github.libretube.db.DatabaseHelper
import com.github.libretube.db.DatabaseHolder.Database
import com.github.libretube.db.obj.WatchHistoryItem import com.github.libretube.db.obj.WatchHistoryItem
import com.github.libretube.enums.ImportFormat import com.github.libretube.enums.ImportFormat
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
@ -108,12 +106,7 @@ object ImportHelper {
@OptIn(ExperimentalSerializationApi::class) @OptIn(ExperimentalSerializationApi::class)
suspend fun exportSubscriptions(activity: Activity, uri: Uri, importFormat: ImportFormat) { suspend fun exportSubscriptions(activity: Activity, uri: Uri, importFormat: ImportFormat) {
val token = PreferenceHelper.getToken() val token = PreferenceHelper.getToken()
val subs = if (token.isNotEmpty()) { val subs = SubscriptionHelper.getSubscriptions()
RetrofitInstance.authApi.subscriptions(token)
} else {
val subscriptions = Database.localSubscriptionDao().getAll().map { it.channelId }
RetrofitInstance.authApi.unauthenticatedSubscriptions(subscriptions)
}
when (importFormat) { when (importFormat) {
ImportFormat.NEWPIPE -> { ImportFormat.NEWPIPE -> {

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

@ -382,12 +382,8 @@ class PlaylistFragment : DynamicLayoutManagerFragment(R.layout.fragment_playlist
val response = try { val response = try {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
// load locally stored playlists with the auth api // 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) { } catch (e: Exception) {
context?.toastFromMainDispatcher(e.localizedMessage.orEmpty()) context?.toastFromMainDispatcher(e.localizedMessage.orEmpty())
Log.e(TAG(), e.toString()) Log.e(TAG(), e.toString())

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

@ -158,7 +158,7 @@ object PlayingQueue {
) { ) {
var playlistNextPage = nextPage var playlistNextPage = nextPage
while (playlistNextPage != null) { while (playlistNextPage != null) {
RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage).run { RetrofitInstance.api.getPlaylistNextPage(playlistId, playlistNextPage).run {
addToQueueAsync(relatedStreams, isMainList = isMainList) addToQueueAsync(relatedStreams, isMainList = isMainList)
playlistNextPage = this.nextpage playlistNextPage = this.nextpage
} }