Skip to content

Commit 069a156

Browse files
XilinJiaXilinJia
committed
6.0.7 commit
1 parent 0575d8f commit 069a156

File tree

73 files changed

+617
-541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+617
-541
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ While podcast subscriptions' OPML files (from AntennaPod or any other sources) c
7878
* in episode list view, if episode has no media, TTS button is shown for fetching transcript (if not exist) and then generating audio file from the transcript. TTS audio files are playable in the same way as local media (with speed setting, pause and rewind/forward)
7979
* Long-press filter button in FeedEpisode view enables/disables filters without changing filter settings
8080
* Subscriptions view has various explicit measures for sorting
81+
* subscriptions sorting is now bi-directional
8182
* in Subscriptions view, click on cover image of a feed opens the FeedInfo view (not FeedEpisodes view)
8283
* History view shows time of last play, and allows filters and sorts
8384
* 5 queues are provided by default: Default queue, and Queues 1-4

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ android {
125125
buildConfig true
126126
}
127127
defaultConfig {
128-
versionCode 3020206
129-
versionName "6.0.6"
128+
versionCode 3020207
129+
versionName "6.0.7"
130130

131131
applicationId "ac.mdiq.podcini.R"
132132
def commit = ""

‎app/src/androidTest/kotlin/ac/test/podcini/playback/PlaybackTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ac.mdiq.podcini.storage.database.Episodes.getEpisodes
1212
import ac.mdiq.podcini.storage.database.Queues.clearQueue
1313
import ac.mdiq.podcini.storage.database.Queues.getInQueueEpisodeIds
1414
import ac.mdiq.podcini.storage.model.EpisodeFilter.Companion.unfiltered
15-
import ac.mdiq.podcini.storage.model.SortOrder
15+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
1616
import ac.mdiq.podcini.ui.activity.MainActivity
1717
import android.content.Context
1818
import android.content.Intent
@@ -221,7 +221,7 @@ class PlaybackTest {
221221
EspressoTestUtils.openNavDrawer()
222222
EspressoTestUtils.onDrawerItem(ViewMatchers.withText(R.string.episodes_label)).perform(ViewActions.click())
223223

224-
val episodes = getEpisodes(0, 10, unfiltered(), SortOrder.DATE_NEW_OLD)
224+
val episodes = getEpisodes(0, 10, unfiltered(), EpisodeSortOrder.DATE_NEW_OLD)
225225
val allEpisodesMatcher = Matchers.allOf(ViewMatchers.withId(R.id.recyclerView),
226226
ViewMatchers.isDisplayed(),
227227
ViewMatchers.hasMinimumChildCount(2))
@@ -262,7 +262,7 @@ class PlaybackTest {
262262
uiTestUtils!!.addLocalFeedData(true)
263263
runBlocking { clearQueue().join() }
264264
activityTestRule.launchActivity(Intent())
265-
val episodes = getEpisodes(0, 10, unfiltered(), SortOrder.DATE_NEW_OLD)
265+
val episodes = getEpisodes(0, 10, unfiltered(), EpisodeSortOrder.DATE_NEW_OLD)
266266

267267
startLocalPlayback()
268268
val media = episodes[0].media

‎app/src/main/kotlin/ac/mdiq/podcini/net/sync/SyncService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import ac.mdiq.podcini.storage.model.Episode
3030
import ac.mdiq.podcini.storage.model.Feed
3131
import ac.mdiq.podcini.storage.model.EpisodeFilter
3232
import ac.mdiq.podcini.storage.utils.EpisodeUtil.hasAlmostEnded
33-
import ac.mdiq.podcini.storage.model.SortOrder
33+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
3434
import ac.mdiq.podcini.ui.utils.NotificationUtils
3535
import ac.mdiq.podcini.util.Logd
3636
import ac.mdiq.podcini.util.event.*
@@ -210,7 +210,7 @@ open class SyncService(context: Context, params: WorkerParameters) : Worker(cont
210210
val queuedEpisodeActions: MutableList<EpisodeAction> = synchronizationQueueStorage.queuedEpisodeActions
211211
if (lastSync == 0L) {
212212
EventFlow.postStickyEvent(FlowEvent.SyncServiceEvent(R.string.sync_status_upload_played))
213-
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PLAYED), SortOrder.DATE_NEW_OLD)
213+
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PLAYED), EpisodeSortOrder.DATE_NEW_OLD)
214214
Logd(TAG, "First sync. Upload state for all " + readItems.size + " played episodes")
215215
for (item in readItems) {
216216
val media = item.media ?: continue

‎app/src/main/kotlin/ac/mdiq/podcini/net/sync/wifi/WifiSyncService.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import ac.mdiq.podcini.storage.database.Episodes.persistEpisode
1313
import ac.mdiq.podcini.storage.model.Episode
1414
import ac.mdiq.podcini.storage.model.EpisodeFilter
1515
import ac.mdiq.podcini.storage.utils.EpisodeUtil.hasAlmostEnded
16-
import ac.mdiq.podcini.storage.model.SortOrder
16+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
1717
import ac.mdiq.podcini.util.Logd
1818
import ac.mdiq.podcini.util.event.EventFlow
1919
import ac.mdiq.podcini.util.event.FlowEvent
@@ -244,9 +244,9 @@ import kotlin.math.min
244244
if (lastSync == 0L) {
245245
EventFlow.postStickyEvent(FlowEvent.SyncServiceEvent(R.string.sync_status_upload_played))
246246
// only push downloaded items
247-
val pausedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PAUSED), SortOrder.DATE_NEW_OLD)
248-
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PLAYED), SortOrder.DATE_NEW_OLD)
249-
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.IS_FAVORITE), SortOrder.DATE_NEW_OLD)
247+
val pausedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PAUSED), EpisodeSortOrder.DATE_NEW_OLD)
248+
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PLAYED), EpisodeSortOrder.DATE_NEW_OLD)
249+
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.IS_FAVORITE), EpisodeSortOrder.DATE_NEW_OLD)
250250
val comItems = mutableSetOf<Episode>()
251251
comItems.addAll(pausedItems)
252252
comItems.addAll(readItems)

‎app/src/main/kotlin/ac/mdiq/podcini/preferences/UserPreferences.kt

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ac.mdiq.podcini.preferences
22

33
import ac.mdiq.podcini.storage.model.Feed
44
import ac.mdiq.podcini.storage.model.ProxyConfig
5-
import ac.mdiq.podcini.storage.model.SortOrder
5+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
66
import ac.mdiq.podcini.storage.model.MediaType
77
import ac.mdiq.podcini.util.Logd
88
import android.content.Context
@@ -38,6 +38,7 @@ object UserPreferences {
3838
const val PREF_TINTED_COLORS: String = "prefTintedColors"
3939
const val PREF_HIDDEN_DRAWER_ITEMS: String = "prefHiddenDrawerItems"
4040
const val PREF_DRAWER_FEED_ORDER: String = "prefDrawerFeedOrder"
41+
const val PREF_DRAWER_FEED_ORDER_DIRECTION: String = "prefDrawerFeedOrderDir"
4142
const val PREF_FEED_GRID_LAYOUT: String = "prefFeedGridLayout"
4243
const val PREF_DRAWER_FEED_COUNTER: String = "prefDrawerFeedIndicator"
4344
const val PREF_EXPANDED_NOTIFICATION: String = "prefExpandNotify"
@@ -194,12 +195,18 @@ object UserPreferences {
194195
get() = appPrefs.getBoolean(PREF_OPML_BACKUP, true)
195196

196197

197-
val feedOrder: Int
198+
val feedOrderBy: Int
198199
get() {
199200
val value = appPrefs.getString(PREF_DRAWER_FEED_ORDER, "" + FEED_ORDER_UNPLAYED)
200201
return value!!.toInt()
201202
}
202203

204+
val feedOrderDir: Int
205+
get() {
206+
val value = appPrefs.getInt(PREF_DRAWER_FEED_ORDER_DIRECTION, 0)
207+
return value
208+
}
209+
203210
val useGridLayout: Boolean
204211
get() = appPrefs.getBoolean(PREF_FEED_GRID_LAYOUT, false)
205212

@@ -507,15 +514,15 @@ object UserPreferences {
507514
appPrefs.edit().putBoolean(PREF_QUEUE_KEEP_SORTED, keepSorted).apply()
508515
}
509516

510-
var queueKeepSortedOrder: SortOrder?
517+
var queueKeepSortedOrder: EpisodeSortOrder?
511518
/**
512519
* Returns the sort order for the queue keep sorted mode.
513520
* Note: This value is stored independently from the keep sorted state.
514521
* @see .isQueueKeepSorted
515522
*/
516523
get() {
517524
val sortOrderStr = appPrefs.getString(PREF_QUEUE_KEEP_SORTED_ORDER, "use-default")
518-
return SortOrder.parseWithDefault(sortOrderStr, SortOrder.DATE_NEW_OLD)
525+
return EpisodeSortOrder.parseWithDefault(sortOrderStr, EpisodeSortOrder.DATE_NEW_OLD)
519526
}
520527
/**
521528
* Sets the sort order for the queue keep sorted mode.
@@ -527,17 +534,17 @@ object UserPreferences {
527534
}
528535

529536
// the sort order for the downloads.
530-
var downloadsSortedOrder: SortOrder?
537+
var downloadsSortedOrder: EpisodeSortOrder?
531538
get() {
532-
val sortOrderStr = appPrefs.getString(PREF_DOWNLOADS_SORTED_ORDER, "" + SortOrder.DATE_NEW_OLD.code)
533-
return SortOrder.fromCodeString(sortOrderStr)
539+
val sortOrderStr = appPrefs.getString(PREF_DOWNLOADS_SORTED_ORDER, "" + EpisodeSortOrder.DATE_NEW_OLD.code)
540+
return EpisodeSortOrder.fromCodeString(sortOrderStr)
534541
}
535542
set(sortOrder) {
536543
appPrefs.edit().putString(PREF_DOWNLOADS_SORTED_ORDER, "" + sortOrder!!.code).apply()
537544
}
538545

539-
var allEpisodesSortOrder: SortOrder?
540-
get() = SortOrder.fromCodeString(appPrefs.getString(PREF_SORT_ALL_EPISODES, "" + SortOrder.DATE_NEW_OLD.code))
546+
var allEpisodesSortOrder: EpisodeSortOrder?
547+
get() = EpisodeSortOrder.fromCodeString(appPrefs.getString(PREF_SORT_ALL_EPISODES, "" + EpisodeSortOrder.DATE_NEW_OLD.code))
541548
set(s) {
542549
appPrefs.edit().putString(PREF_SORT_ALL_EPISODES, "" + s!!.code).apply()
543550
}
@@ -597,10 +604,13 @@ object UserPreferences {
597604
return appPrefs.getBoolean(PREF_SHOW_TIME_LEFT, false)
598605
}
599606

600-
fun setFeedOrder(selected: String?) {
607+
fun setFeedOrder(selected: String, dir: Int) {
601608
appPrefs.edit()
602609
.putString(PREF_DRAWER_FEED_ORDER, selected)
603610
.apply()
611+
appPrefs.edit()
612+
.putInt(PREF_DRAWER_FEED_ORDER_DIRECTION, dir)
613+
.apply()
604614
}
605615

606616
fun enqueueDownloadedEpisodes(): Boolean {

‎app/src/main/kotlin/ac/mdiq/podcini/preferences/fragments/ImportExportPreferencesFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import ac.mdiq.podcini.storage.model.Feed
1919
import ac.mdiq.podcini.preferences.OpmlTransporter.*
2020
import ac.mdiq.podcini.storage.model.EpisodeFilter
2121
import ac.mdiq.podcini.storage.utils.EpisodeUtil.hasAlmostEnded
22-
import ac.mdiq.podcini.storage.model.SortOrder
22+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
2323
import ac.mdiq.podcini.ui.activity.OpmlImportActivity
2424
import ac.mdiq.podcini.ui.activity.PreferenceActivity
2525
import ac.mdiq.podcini.util.Logd
@@ -732,9 +732,9 @@ class ImportExportPreferencesFragment : PreferenceFragmentCompat() {
732732
override fun writeDocument(feeds: List<Feed?>?, writer: Writer?, context: Context) {
733733
Logd(TAG, "Starting to write document")
734734
val queuedEpisodeActions: MutableList<EpisodeAction> = mutableListOf()
735-
val pausedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PAUSED), SortOrder.DATE_NEW_OLD)
736-
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PLAYED), SortOrder.DATE_NEW_OLD)
737-
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.IS_FAVORITE), SortOrder.DATE_NEW_OLD)
735+
val pausedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PAUSED), EpisodeSortOrder.DATE_NEW_OLD)
736+
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.PLAYED), EpisodeSortOrder.DATE_NEW_OLD)
737+
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.IS_FAVORITE), EpisodeSortOrder.DATE_NEW_OLD)
738738
val comItems = mutableSetOf<Episode>()
739739
comItems.addAll(pausedItems)
740740
comItems.addAll(readItems)
@@ -793,7 +793,7 @@ class ImportExportPreferencesFragment : PreferenceFragmentCompat() {
793793
val favTemplate = IOUtils.toString(favTemplateStream, UTF_8)
794794
val feedTemplateStream = context.assets.open(FEED_TEMPLATE)
795795
val feedTemplate = IOUtils.toString(feedTemplateStream, UTF_8)
796-
val allFavorites = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.IS_FAVORITE), SortOrder.DATE_NEW_OLD)
796+
val allFavorites = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.IS_FAVORITE), EpisodeSortOrder.DATE_NEW_OLD)
797797
val favoritesByFeed = buildFeedMap(allFavorites)
798798
writer!!.append(templateParts[0])
799799
for (feedId in favoritesByFeed.keys) {

‎app/src/main/kotlin/ac/mdiq/podcini/preferences/fragments/UserInterfacePreferencesFragment.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ac.mdiq.podcini.preferences.UserPreferences.fullNotificationButtons
66
import ac.mdiq.podcini.preferences.UserPreferences.setShowRemainTimeSetting
77
import ac.mdiq.podcini.ui.activity.PreferenceActivity
88
import ac.mdiq.podcini.ui.dialog.DrawerPreferencesDialog
9-
import ac.mdiq.podcini.ui.dialog.FeedSortDialog
9+
import ac.mdiq.podcini.ui.dialog.FeedSortDialogNew
1010
import ac.mdiq.podcini.util.event.EventFlow
1111
import ac.mdiq.podcini.util.event.FlowEvent
1212
import android.content.Context
@@ -66,7 +66,8 @@ class UserInterfacePreferencesFragment : PreferenceFragmentCompat() {
6666
// })
6767

6868
findPreference<Preference>(UserPreferences.PREF_DRAWER_FEED_ORDER)?.onPreferenceClickListener = (Preference.OnPreferenceClickListener {
69-
FeedSortDialog.showDialog(requireContext())
69+
// FeedSortDialog.showDialog(requireContext())
70+
FeedSortDialogNew().show(childFragmentManager, "FeedSortDialog")
7071
true
7172
})
7273
findPreference<Preference>(PREF_SWIPE)?.setOnPreferenceClickListener {

‎app/src/main/kotlin/ac/mdiq/podcini/storage/algorithms/AutoCleanups.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ac.mdiq.podcini.storage.database.Episodes.getEpisodesCount
1010
import ac.mdiq.podcini.storage.database.Queues.getInQueueEpisodeIds
1111
import ac.mdiq.podcini.storage.model.Episode
1212
import ac.mdiq.podcini.storage.model.EpisodeFilter
13-
import ac.mdiq.podcini.storage.model.SortOrder
13+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
1414
import android.content.Context
1515
import android.util.Log
1616
import androidx.annotation.OptIn
@@ -52,7 +52,7 @@ object AutoCleanups {
5252
private val candidates: List<Episode>
5353
get() {
5454
val candidates: MutableList<Episode> = ArrayList()
55-
val downloadedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.DOWNLOADED), SortOrder.DATE_NEW_OLD)
55+
val downloadedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.DOWNLOADED), EpisodeSortOrder.DATE_NEW_OLD)
5656
for (item in downloadedItems) {
5757
if (item.media != null && item.media!!.downloaded && !item.isFavorite) candidates.add(item)
5858
}
@@ -110,7 +110,7 @@ object AutoCleanups {
110110
private val candidates: List<Episode>
111111
get() {
112112
val candidates: MutableList<Episode> = ArrayList()
113-
val downloadedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.DOWNLOADED), SortOrder.DATE_NEW_OLD)
113+
val downloadedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.DOWNLOADED), EpisodeSortOrder.DATE_NEW_OLD)
114114
val idsInQueues = getInQueueEpisodeIds()
115115
for (item in downloadedItems) {
116116
if (item.media != null && item.media!!.downloaded && !idsInQueues.contains(item.id) && !item.isFavorite)
@@ -187,7 +187,7 @@ object AutoCleanups {
187187
private val candidates: List<Episode>
188188
get() {
189189
val candidates: MutableList<Episode> = ArrayList()
190-
val downloadedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.DOWNLOADED), SortOrder.DATE_NEW_OLD)
190+
val downloadedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.DOWNLOADED), EpisodeSortOrder.DATE_NEW_OLD)
191191
val idsInQueues = getInQueueEpisodeIds()
192192
val mostRecentDateForDeletion = calcMostRecentDateForDeletion(Date())
193193
for (item in downloadedItems) {

‎app/src/main/kotlin/ac/mdiq/podcini/storage/algorithms/AutoDownloads.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ac.mdiq.podcini.storage.database.Episodes.getEpisodes
1212
import ac.mdiq.podcini.storage.database.Episodes.getEpisodesCount
1313
import ac.mdiq.podcini.storage.model.Episode
1414
import ac.mdiq.podcini.storage.model.EpisodeFilter
15-
import ac.mdiq.podcini.storage.model.SortOrder
15+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
1616
import ac.mdiq.podcini.util.Logd
1717
import android.content.Context
1818
import android.content.Intent
@@ -80,7 +80,7 @@ object AutoDownloads {
8080
Logd(TAG, "Performing auto-dl of undownloaded episodes")
8181
val candidates: MutableList<Episode>
8282
val queue = curQueue.episodes
83-
val newItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.NEW), SortOrder.DATE_NEW_OLD)
83+
val newItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.NEW), EpisodeSortOrder.DATE_NEW_OLD)
8484
Logd(TAG, "newItems: ${newItems.size}")
8585
candidates = ArrayList(queue.size + newItems.size)
8686
candidates.addAll(queue)

‎app/src/main/kotlin/ac/mdiq/podcini/storage/database/Episodes.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import ac.mdiq.podcini.storage.database.RealmDB.upsertBlk
2020
import ac.mdiq.podcini.storage.model.Episode
2121
import ac.mdiq.podcini.storage.model.EpisodeMedia
2222
import ac.mdiq.podcini.storage.model.EpisodeFilter
23-
import ac.mdiq.podcini.storage.model.SortOrder
23+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
2424
import ac.mdiq.podcini.util.IntentUtils.sendLocalBroadcast
2525
import ac.mdiq.podcini.util.Logd
2626
import ac.mdiq.podcini.util.event.EventFlow
@@ -48,7 +48,7 @@ object Episodes {
4848
* @param filter The filter describing which episodes to filter out.
4949
* TODO: filters of queued and notqueued don't work in this
5050
*/
51-
fun getEpisodes(offset: Int, limit: Int, filter: EpisodeFilter?, sortOrder: SortOrder?, copy: Boolean = true): List<Episode> {
51+
fun getEpisodes(offset: Int, limit: Int, filter: EpisodeFilter?, sortOrder: EpisodeSortOrder?, copy: Boolean = true): List<Episode> {
5252
Logd(TAG, "getEpisodes called with: offset=$offset, limit=$limit")
5353
val queryString = filter?.queryString()?:"id > 0"
5454
var episodes = realm.query(Episode::class).query(queryString).find().toMutableList()

‎app/src/main/kotlin/ac/mdiq/podcini/storage/database/Feeds.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ object Feeds {
7272
for (feed in feedsCopy) {
7373
if (feed.preferences != null) tagsSet.addAll(feed.preferences!!.tags.filter { it != TAG_ROOT })
7474
}
75-
val newTags = tagsSet.intersect(tags.toSet())
75+
val newTags = tagsSet - tags.toSet()
7676
if (newTags.isNotEmpty()) {
7777
tags.clear()
7878
tags.addAll(tagsSet)

‎app/src/main/kotlin/ac/mdiq/podcini/storage/database/Queues.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ac.mdiq.podcini.storage.model.Episode
1717
import ac.mdiq.podcini.storage.model.EpisodeMedia
1818
import ac.mdiq.podcini.storage.model.PlayQueue
1919
import ac.mdiq.podcini.storage.model.Playable
20-
import ac.mdiq.podcini.storage.model.SortOrder
20+
import ac.mdiq.podcini.storage.model.EpisodeSortOrder
2121
import ac.mdiq.podcini.util.Logd
2222
import ac.mdiq.podcini.util.event.EventFlow
2323
import ac.mdiq.podcini.util.event.FlowEvent
@@ -126,7 +126,7 @@ object Queues {
126126
// Sort queue by configured sort order
127127
val sortOrder = queueKeepSortedOrder
128128
// do not shuffle the list on every change
129-
if (sortOrder == SortOrder.RANDOM) return
129+
if (sortOrder == EpisodeSortOrder.RANDOM) return
130130

131131
if (sortOrder != null) {
132132
val permutor = getPermutor(sortOrder)

0 commit comments

Comments
 (0)