Skip to content

Commit bdfacec

Browse files
authored
Merge pull request #7191 from Bnyro/master
fix: sort channels alphabetically on client side
2 parents d99ef50 + 87352f9 commit bdfacec

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt

+11-6
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ object SubscriptionHelper {
2424
*/
2525
const val GET_SUBSCRIPTIONS_LIMIT = 100
2626

27-
private val localFeedExtraction get() = PreferenceHelper.getBoolean(
28-
PreferenceKeys.LOCAL_FEED_EXTRACTION,
29-
false
30-
)
27+
private val localFeedExtraction
28+
get() = PreferenceHelper.getBoolean(
29+
PreferenceKeys.LOCAL_FEED_EXTRACTION,
30+
false
31+
)
3132
private val token get() = PreferenceHelper.getToken()
3233
private val subscriptionsRepository: SubscriptionsRepository
3334
get() = when {
@@ -48,11 +49,15 @@ object SubscriptionHelper {
4849
suspend fun importSubscriptions(newChannels: List<String>) =
4950
subscriptionsRepository.importSubscriptions(newChannels)
5051

51-
suspend fun getSubscriptions() = subscriptionsRepository.getSubscriptions()
52+
suspend fun getSubscriptions() =
53+
subscriptionsRepository.getSubscriptions().sortedBy { it.name.lowercase() }
54+
5255
suspend fun getSubscriptionChannelIds() = subscriptionsRepository.getSubscriptionChannelIds()
5356
suspend fun getFeed(forceRefresh: Boolean, onProgressUpdate: (FeedProgress) -> Unit = {}) =
5457
feedRepository.getFeed(forceRefresh, onProgressUpdate)
55-
suspend fun submitFeedItemChange(feedItem: SubscriptionsFeedItem) = feedRepository.submitFeedItemChange(feedItem)
58+
59+
suspend fun submitFeedItemChange(feedItem: SubscriptionsFeedItem) =
60+
feedRepository.submitFeedItemChange(feedItem)
5661

5762
fun handleUnsubscribe(
5863
context: Context,

0 commit comments

Comments
 (0)