Skip to content

Commit bd46cab

Browse files
SkyD666SkyD666
committed
[feature|fix|build] Support swiping to open the article link; fix a player bug; update dependencies
1 parent b02808e commit bd46cab

40 files changed

+573
-128
lines changed

‎app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
minSdk = 24
2323
targetSdk = 35
2424
versionCode = 26
25-
versionName = "3.1-beta08"
25+
versionName = "3.1-beta09"
2626

2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828

‎app/src/main/java/com/skyd/anivu/ext/IOExt.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.provider.DocumentsContract
1313
import android.provider.OpenableColumns
1414
import android.webkit.URLUtil
1515
import android.widget.Toast
16+
import androidx.core.net.toUri
1617
import androidx.documentfile.provider.DocumentFile
1718
import com.skyd.anivu.R
1819
import com.skyd.anivu.appContext
@@ -55,7 +56,7 @@ val Uri.type: String?
5556
get() = appContext.contentResolver.getType(this)
5657

5758
fun String.openBrowser(context: Context) {
58-
Uri.parse(this).openBrowser(context)
59+
toUri().openBrowser(context)
5960
}
6061

6162
fun Uri.openBrowser(context: Context) {

‎app/src/main/java/com/skyd/anivu/ext/PreferenceExt.kt

+6
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@ import com.skyd.anivu.model.preference.behavior.playlist.PlaylistMediaSortByPref
4444
import com.skyd.anivu.model.preference.behavior.playlist.PlaylistSortAscPreference
4545
import com.skyd.anivu.model.preference.behavior.playlist.PlaylistSortByPreference
4646
import com.skyd.anivu.model.preference.data.OpmlExportDirPreference
47+
import com.skyd.anivu.model.preference.data.delete.KeepFavoriteArticlesPreference
4748
import com.skyd.anivu.model.preference.data.delete.KeepPlaylistArticlesPreference
49+
import com.skyd.anivu.model.preference.data.delete.KeepUnreadArticlesPreference
4850
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleBeforePreference
4951
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleFrequencyPreference
5052
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepFavoritePreference
53+
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepPlaylistPreference
5154
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepUnreadPreference
5255
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleMaxCountPreference
5356
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleUseBeforePreference
@@ -156,9 +159,12 @@ fun Preferences.toSettings(): Settings {
156159
autoDeleteArticleBefore = AutoDeleteArticleBeforePreference.fromPreferences(this),
157160
autoDeleteArticleKeepUnread = AutoDeleteArticleKeepUnreadPreference.fromPreferences(this),
158161
autoDeleteArticleKeepFavorite = AutoDeleteArticleKeepFavoritePreference.fromPreferences(this),
162+
autoDeleteArticleKeepPlaylist = AutoDeleteArticleKeepPlaylistPreference.fromPreferences(this),
159163
autoDeleteArticleUseMaxCount = AutoDeleteArticleUseMaxCountPreference.fromPreferences(this),
160164
autoDeleteArticleMaxCount = AutoDeleteArticleMaxCountPreference.fromPreferences(this),
161165
keepPlaylistArticles = KeepPlaylistArticlesPreference.fromPreferences(this),
166+
keepUnreadArticles = KeepUnreadArticlesPreference.fromPreferences(this),
167+
keepFavoriteArticles = KeepFavoriteArticlesPreference.fromPreferences(this),
162168
opmlExportDir = OpmlExportDirPreference.fromPreferences(this),
163169
mediaLibLocation = MediaLibLocationPreference.fromPreferences(this),
164170

‎app/src/main/java/com/skyd/anivu/model/db/dao/ArticleDao.kt

+26-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,15 @@ interface ArticleDao {
127127
@Query(
128128
"DELETE FROM $ARTICLE_TABLE_NAME WHERE ${ArticleBean.FEED_URL_COLUMN} LIKE :feedUrl AND " +
129129
"NOT (:keepPlaylistArticles AND EXISTS(SELECT 1 FROM $PLAYLIST_MEDIA_TABLE_NAME pl " +
130-
" WHERE pl.${PlaylistMediaBean.ARTICLE_ID_COLUMN} = $ARTICLE_TABLE_NAME.${ArticleBean.ARTICLE_ID_COLUMN}))"
130+
" WHERE pl.${PlaylistMediaBean.ARTICLE_ID_COLUMN} = $ARTICLE_TABLE_NAME.${ArticleBean.ARTICLE_ID_COLUMN})) AND " +
131+
"(:keepUnread = 0 OR ${ArticleBean.IS_READ_COLUMN} = 1) AND " +
132+
"(:keepFavorite = 0 OR ${ArticleBean.IS_FAVORITE_COLUMN} = 0)"
131133
)
132134
suspend fun deleteArticleInFeed(
133135
feedUrl: String,
134136
keepPlaylistArticles: Boolean,
137+
keepUnread: Boolean,
138+
keepFavorite: Boolean,
135139
): Int
136140

137141
@Transaction
@@ -142,11 +146,15 @@ interface ArticleDao {
142146
" WHERE ${FeedBean.GROUP_ID_COLUMN} IS NULL AND :groupId IS NULL OR " +
143147
" ${FeedBean.GROUP_ID_COLUMN} = :groupId) AND " +
144148
"NOT (:keepPlaylistArticles AND EXISTS(SELECT 1 FROM $PLAYLIST_MEDIA_TABLE_NAME pl " +
145-
" WHERE pl.${PlaylistMediaBean.ARTICLE_ID_COLUMN} = $ARTICLE_TABLE_NAME.${ArticleBean.ARTICLE_ID_COLUMN}))"
149+
" WHERE pl.${PlaylistMediaBean.ARTICLE_ID_COLUMN} = $ARTICLE_TABLE_NAME.${ArticleBean.ARTICLE_ID_COLUMN})) AND " +
150+
"(:keepUnread = 0 OR ${ArticleBean.IS_READ_COLUMN} = 1) AND " +
151+
"(:keepFavorite = 0 OR ${ArticleBean.IS_FAVORITE_COLUMN} = 0)"
146152
)
147153
suspend fun deleteArticlesInGroup(
148154
groupId: String?,
149155
keepPlaylistArticles: Boolean,
156+
keepUnread: Boolean,
157+
keepFavorite: Boolean,
150158
): Int
151159

152160
@Transaction
@@ -190,6 +198,22 @@ interface ArticleDao {
190198
keepFavorite: Boolean,
191199
): Int
192200

201+
@Transaction
202+
@Query(
203+
"DELETE FROM $ARTICLE_TABLE_NAME WHERE " +
204+
"${ArticleBean.ARTICLE_ID_COLUMN} = :articleId AND " +
205+
"NOT (:keepPlaylistArticles AND EXISTS(SELECT 1 FROM $PLAYLIST_MEDIA_TABLE_NAME pl " +
206+
" WHERE pl.${PlaylistMediaBean.ARTICLE_ID_COLUMN} = $ARTICLE_TABLE_NAME.${ArticleBean.ARTICLE_ID_COLUMN})) AND " +
207+
"(:keepUnread = 0 OR ${ArticleBean.IS_READ_COLUMN} = 1) AND " +
208+
"(:keepFavorite = 0 OR ${ArticleBean.IS_FAVORITE_COLUMN} = 0)"
209+
)
210+
suspend fun deleteArticle(
211+
articleId: String,
212+
keepPlaylistArticles: Boolean,
213+
keepUnread: Boolean,
214+
keepFavorite: Boolean,
215+
): Int
216+
193217
@Transaction
194218
@RawQuery(observedEntities = [FeedBean::class, ArticleBean::class, EnclosureBean::class])
195219
fun getArticlePagingSource(sql: SupportSQLiteQuery): PagingSource<Int, ArticleWithFeed>

‎app/src/main/java/com/skyd/anivu/model/preference/Settings.kt

+12
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,13 @@ import com.skyd.anivu.model.preference.behavior.playlist.PlaylistMediaSortByPref
4949
import com.skyd.anivu.model.preference.behavior.playlist.PlaylistSortAscPreference
5050
import com.skyd.anivu.model.preference.behavior.playlist.PlaylistSortByPreference
5151
import com.skyd.anivu.model.preference.data.OpmlExportDirPreference
52+
import com.skyd.anivu.model.preference.data.delete.KeepFavoriteArticlesPreference
5253
import com.skyd.anivu.model.preference.data.delete.KeepPlaylistArticlesPreference
54+
import com.skyd.anivu.model.preference.data.delete.KeepUnreadArticlesPreference
5355
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleBeforePreference
5456
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleFrequencyPreference
5557
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepFavoritePreference
58+
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepPlaylistPreference
5659
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepUnreadPreference
5760
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleMaxCountPreference
5861
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleUseBeforePreference
@@ -95,6 +98,7 @@ import com.skyd.anivu.ui.local.LocalArticleTopBarTonalElevation
9598
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleBefore
9699
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleFrequency
97100
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleKeepFavorite
101+
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleKeepPlaylist
98102
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleKeepUnread
99103
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleMaxCount
100104
import com.skyd.anivu.ui.local.LocalAutoDeleteArticleUseBefore
@@ -111,7 +115,9 @@ import com.skyd.anivu.ui.local.LocalHardwareDecode
111115
import com.skyd.anivu.ui.local.LocalHideEmptyDefault
112116
import com.skyd.anivu.ui.local.LocalHideMutedFeed
113117
import com.skyd.anivu.ui.local.LocalIgnoreUpdateVersion
118+
import com.skyd.anivu.ui.local.LocalKeepFavoriteArticles
114119
import com.skyd.anivu.ui.local.LocalKeepPlaylistArticles
120+
import com.skyd.anivu.ui.local.LocalKeepUnreadArticles
115121
import com.skyd.anivu.ui.local.LocalMediaFileFilter
116122
import com.skyd.anivu.ui.local.LocalMediaLibLocation
117123
import com.skyd.anivu.ui.local.LocalMediaListSortAsc
@@ -233,9 +239,12 @@ data class Settings(
233239
val autoDeleteArticleBefore: Long = AutoDeleteArticleBeforePreference.default,
234240
val autoDeleteArticleKeepUnread: Boolean = AutoDeleteArticleKeepUnreadPreference.default,
235241
val autoDeleteArticleKeepFavorite: Boolean = AutoDeleteArticleKeepFavoritePreference.default,
242+
val autoDeleteArticleKeepPlaylist: Boolean = AutoDeleteArticleKeepPlaylistPreference.default,
236243
val autoDeleteArticleUseMaxCount: Boolean = AutoDeleteArticleUseMaxCountPreference.default,
237244
val autoDeleteArticleMaxCount: Int = AutoDeleteArticleMaxCountPreference.default,
238245
val keepPlaylistArticles: Boolean = KeepPlaylistArticlesPreference.default,
246+
val keepUnreadArticles: Boolean = KeepUnreadArticlesPreference.default,
247+
val keepFavoriteArticles: Boolean = KeepFavoriteArticlesPreference.default,
239248
val opmlExportDir: String = OpmlExportDirPreference.default,
240249
val mediaLibLocation: String = MediaLibLocationPreference.default,
241250
// Transmission
@@ -328,9 +337,12 @@ fun SettingsProvider(
328337
LocalAutoDeleteArticleBefore provides settings.autoDeleteArticleBefore,
329338
LocalAutoDeleteArticleKeepUnread provides settings.autoDeleteArticleKeepUnread,
330339
LocalAutoDeleteArticleKeepFavorite provides settings.autoDeleteArticleKeepFavorite,
340+
LocalAutoDeleteArticleKeepPlaylist provides settings.autoDeleteArticleKeepPlaylist,
331341
LocalAutoDeleteArticleUseMaxCount provides settings.autoDeleteArticleUseMaxCount,
332342
LocalAutoDeleteArticleMaxCount provides settings.autoDeleteArticleMaxCount,
333343
LocalKeepPlaylistArticles provides settings.keepPlaylistArticles,
344+
LocalKeepUnreadArticles provides settings.keepUnreadArticles,
345+
LocalKeepFavoriteArticles provides settings.keepFavoriteArticles,
334346
LocalOpmlExportDir provides settings.opmlExportDir,
335347
LocalMediaLibLocation provides settings.mediaLibLocation,
336348
// Transmission

‎app/src/main/java/com/skyd/anivu/model/preference/behavior/article/ArticleSwipeActionPreference.kt

+10-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ abstract class ArticleSwipeActionPreference : BasePreference<String> {
1111
const val NONE = "None"
1212
const val READ = "Read"
1313
const val SHOW_ENCLOSURES = "ShowEnclosures"
14+
const val OPEN_LINK_IN_BROWSER = "OpenLinkInBrowser"
1415
const val SWITCH_READ_STATE = "SwitchReadState"
1516
const val SWITCH_FAVORITE_STATE = "SwitchFavoriteState"
1617

@@ -21,13 +22,21 @@ abstract class ArticleSwipeActionPreference : BasePreference<String> {
2122
NONE -> context.getString(R.string.none)
2223
READ -> context.getString(R.string.article_action_read)
2324
SHOW_ENCLOSURES -> context.getString(R.string.article_action_show_enclosures)
25+
OPEN_LINK_IN_BROWSER -> context.getString(R.string.open_link_in_browser)
2426
SWITCH_READ_STATE -> context.getString(R.string.article_action_switch_read_state)
2527
SWITCH_FAVORITE_STATE -> context.getString(R.string.article_action_switch_favorite_state)
2628
else -> context.getString(R.string.unknown)
2729
}
2830
}
2931

30-
val values = arrayOf(NONE, READ, SHOW_ENCLOSURES, SWITCH_READ_STATE, SWITCH_FAVORITE_STATE)
32+
val values = arrayOf(
33+
NONE,
34+
READ,
35+
SHOW_ENCLOSURES,
36+
OPEN_LINK_IN_BROWSER,
37+
SWITCH_READ_STATE,
38+
SWITCH_FAVORITE_STATE,
39+
)
3140

3241
abstract override val key: Preferences.Key<String>
3342
}

‎app/src/main/java/com/skyd/anivu/model/preference/data/delete/KeepFavoriteArticlesPreference.kt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.skyd.anivu.model.preference.data.delete
2+
3+
import androidx.datastore.preferences.core.booleanPreferencesKey
4+
import com.skyd.anivu.base.BasePreference
5+
6+
object KeepFavoriteArticlesPreference : BasePreference<Boolean> {
7+
private const val KEEP_FAVORITE_ARTICLES = "keepFavoriteArticles"
8+
9+
override val default = true
10+
override val key = booleanPreferencesKey(KEEP_FAVORITE_ARTICLES)
11+
}

‎app/src/main/java/com/skyd/anivu/model/preference/data/delete/KeepUnreadArticlesPreference.kt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.skyd.anivu.model.preference.data.delete
2+
3+
import androidx.datastore.preferences.core.booleanPreferencesKey
4+
import com.skyd.anivu.base.BasePreference
5+
6+
object KeepUnreadArticlesPreference : BasePreference<Boolean> {
7+
private const val KEEP_UNREAD_ARTICLES = "keepUnreadArticles"
8+
9+
override val default = true
10+
override val key = booleanPreferencesKey(KEEP_UNREAD_ARTICLES)
11+
}

‎app/src/main/java/com/skyd/anivu/model/preference/data/delete/autodelete/AutoDeleteArticleKeepPlaylistPreference.kt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.skyd.anivu.model.preference.data.delete.autodelete
2+
3+
import androidx.datastore.preferences.core.booleanPreferencesKey
4+
import com.skyd.anivu.base.BasePreference
5+
6+
object AutoDeleteArticleKeepPlaylistPreference : BasePreference<Boolean> {
7+
private const val AUTO_DELETE_ARTICLE_KEEP_PLAYLIST = "autoDeleteArticleKeepPlaylist"
8+
9+
override val default = true
10+
override val key = booleanPreferencesKey(AUTO_DELETE_ARTICLE_KEEP_PLAYLIST)
11+
}

‎app/src/main/java/com/skyd/anivu/model/repository/ArticleRepository.kt

+18
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@ import androidx.sqlite.db.SimpleSQLiteQuery
1010
import com.skyd.anivu.R
1111
import com.skyd.anivu.appContext
1212
import com.skyd.anivu.base.BaseRepository
13+
import com.skyd.anivu.ext.dataStore
14+
import com.skyd.anivu.ext.getOrDefault
1315
import com.skyd.anivu.model.bean.article.ARTICLE_TABLE_NAME
1416
import com.skyd.anivu.model.bean.article.ArticleBean
1517
import com.skyd.anivu.model.bean.article.ArticleWithFeed
1618
import com.skyd.anivu.model.bean.group.GroupVo
1719
import com.skyd.anivu.model.db.dao.ArticleDao
1820
import com.skyd.anivu.model.db.dao.FeedDao
21+
import com.skyd.anivu.model.preference.data.delete.KeepFavoriteArticlesPreference
22+
import com.skyd.anivu.model.preference.data.delete.KeepPlaylistArticlesPreference
23+
import com.skyd.anivu.model.preference.data.delete.KeepUnreadArticlesPreference
1924
import com.skyd.anivu.ui.component.showToast
2025
import kotlinx.coroutines.Deferred
2126
import kotlinx.coroutines.Dispatchers
@@ -174,6 +179,19 @@ class ArticleRepository @Inject constructor(
174179
emit(articleDao.readArticle(articleId, read))
175180
}.flowOn(Dispatchers.IO)
176181

182+
fun deleteArticle(articleId: String): Flow<Int> = flow {
183+
with(appContext.dataStore) {
184+
emit(
185+
articleDao.deleteArticle(
186+
articleId,
187+
keepPlaylistArticles = getOrDefault(KeepPlaylistArticlesPreference),
188+
keepUnread = getOrDefault(KeepUnreadArticlesPreference),
189+
keepFavorite = getOrDefault(KeepFavoriteArticlesPreference),
190+
)
191+
)
192+
}
193+
}.flowOn(Dispatchers.IO)
194+
177195
companion object {
178196
fun genSql(
179197
feedUrls: List<String>,

‎app/src/main/java/com/skyd/anivu/model/repository/DataRepository.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import com.skyd.anivu.ext.getOrDefault
99
import com.skyd.anivu.model.db.dao.ArticleDao
1010
import com.skyd.anivu.model.db.dao.FeedDao
1111
import com.skyd.anivu.model.db.dao.MediaPlayHistoryDao
12+
import com.skyd.anivu.model.preference.data.delete.KeepFavoriteArticlesPreference
1213
import com.skyd.anivu.model.preference.data.delete.KeepPlaylistArticlesPreference
13-
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepFavoritePreference
14-
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepUnreadPreference
14+
import com.skyd.anivu.model.preference.data.delete.KeepUnreadArticlesPreference
1515
import kotlinx.coroutines.Dispatchers
1616
import kotlinx.coroutines.flow.Flow
1717
import kotlinx.coroutines.flow.flow
@@ -53,8 +53,8 @@ class DataRepository @Inject constructor(
5353
articleDao.deleteArticleBefore(
5454
timestamp = timestamp,
5555
keepPlaylistArticles = getOrDefault(KeepPlaylistArticlesPreference),
56-
keepUnread = getOrDefault(AutoDeleteArticleKeepUnreadPreference),
57-
keepFavorite = getOrDefault(AutoDeleteArticleKeepFavoritePreference),
56+
keepUnread = getOrDefault(KeepUnreadArticlesPreference),
57+
keepFavorite = getOrDefault(KeepFavoriteArticlesPreference),
5858
)
5959
}
6060
emit(count)

‎app/src/main/java/com/skyd/anivu/model/repository/feed/FeedRepository.kt

+6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import com.skyd.anivu.model.db.dao.GroupDao
2626
import com.skyd.anivu.model.preference.appearance.feed.FeedDefaultGroupExpandPreference
2727
import com.skyd.anivu.model.preference.behavior.feed.HideEmptyDefaultPreference
2828
import com.skyd.anivu.model.preference.behavior.feed.HideMutedFeedPreference
29+
import com.skyd.anivu.model.preference.data.delete.KeepFavoriteArticlesPreference
2930
import com.skyd.anivu.model.preference.data.delete.KeepPlaylistArticlesPreference
31+
import com.skyd.anivu.model.preference.data.delete.KeepUnreadArticlesPreference
3032
import com.skyd.anivu.model.repository.RssHelper
3133
import kotlinx.coroutines.Dispatchers
3234
import kotlinx.coroutines.flow.Flow
@@ -110,6 +112,8 @@ class FeedRepository @Inject constructor(
110112
articleDao.deleteArticlesInGroup(
111113
groupId = realGroupId,
112114
keepPlaylistArticles = getOrDefault(KeepPlaylistArticlesPreference),
115+
keepUnread = getOrDefault(KeepUnreadArticlesPreference),
116+
keepFavorite = getOrDefault(KeepFavoriteArticlesPreference),
113117
)
114118
}
115119
emit(count)
@@ -258,6 +262,8 @@ class FeedRepository @Inject constructor(
258262
articleDao.deleteArticleInFeed(
259263
feedUrl = url,
260264
keepPlaylistArticles = getOrDefault(KeepPlaylistArticlesPreference),
265+
keepUnread = getOrDefault(KeepUnreadArticlesPreference),
266+
keepFavorite = getOrDefault(KeepFavoriteArticlesPreference),
261267
)
262268
}
263269
emit(count)

‎app/src/main/java/com/skyd/anivu/model/worker/deletearticle/DeleteArticleWorker.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import androidx.work.WorkerParameters
66
import com.skyd.anivu.ext.dataStore
77
import com.skyd.anivu.ext.getOrDefault
88
import com.skyd.anivu.model.db.dao.ArticleDao
9-
import com.skyd.anivu.model.preference.data.delete.KeepPlaylistArticlesPreference
109
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleBeforePreference
1110
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepFavoritePreference
11+
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepPlaylistPreference
1212
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleKeepUnreadPreference
1313
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleMaxCountPreference
1414
import com.skyd.anivu.model.preference.data.delete.autodelete.AutoDeleteArticleUseBeforePreference
@@ -34,7 +34,8 @@ class DeleteArticleWorker(context: Context, parameters: WorkerParameters) :
3434
override suspend fun doWork(): Result {
3535
runCatching {
3636
val dataStore = applicationContext.dataStore
37-
val keepPlaylistArticles = dataStore.getOrDefault(KeepPlaylistArticlesPreference)
37+
val keepPlaylistArticles =
38+
dataStore.getOrDefault(AutoDeleteArticleKeepPlaylistPreference)
3839
val keepUnread = dataStore.getOrDefault(AutoDeleteArticleKeepUnreadPreference)
3940
val keepFavorite = dataStore.getOrDefault(AutoDeleteArticleKeepFavoritePreference)
4041
val useBefore = dataStore.getOrDefault(AutoDeleteArticleUseBeforePreference)

0 commit comments

Comments
 (0)