Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make read all async in background #108

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/src/main/java/com/jocmp/capyreader/common/MD5.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.jocmp.capyreader.common

import java.security.MessageDigest

@OptIn(ExperimentalStdlibApi::class)
object MD5 {
fun from(value: String): String {
val md = MessageDigest.getInstance("MD5")
val digest = md.digest(value.toByteArray())
return digest.toHexString()
}
}
13 changes: 9 additions & 4 deletions app/src/main/java/com/jocmp/capyreader/sync/ReadSyncWorker.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ class ReadSyncWorker(
private val account by inject<Account>()

override suspend fun doWork(): Result {
val articleID = inputData.getString(ARTICLE_KEY) ?: return Result.failure()
val articleIDs = inputData
.getStringArray(ARTICLES_KEY)?.toList() ?: return Result.failure()
val markRead = inputData.getBoolean(MARK_READ_KEY, false)

if (articleIDs.isEmpty()) {
return Result.failure()
}

val result = if (markRead) {
account.markRead(articleID)
account.markAllRead(articleIDs)
} else {
account.markUnread(articleID)
account.markUnread(articleIDs.first())
}

return result
Expand All @@ -39,7 +44,7 @@ class ReadSyncWorker(
}

companion object {
const val ARTICLE_KEY = "article_id"
const val ARTICLES_KEY = "articles_key"
const val MARK_READ_KEY = "mark_read"
}
}
19 changes: 12 additions & 7 deletions app/src/main/java/com/jocmp/capyreader/sync/Sync.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager
import com.jocmp.capyreader.common.MD5

fun addStarAsync(articleID: String, context: Context) {
val data = Data
Expand All @@ -28,36 +29,40 @@ fun removeStarAsync(articleID: String, context: Context) {
queueStarWorker(articleID, data, context)
}

fun markReadAsync(articleID: String, context: Context) {
fun markReadAsync(articleIDs: List<String>, context: Context) {
val data = Data
.Builder()
.putString(ReadSyncWorker.ARTICLE_KEY, articleID)
.putStringArray(ReadSyncWorker.ARTICLES_KEY, articleIDs.toTypedArray())
.putBoolean(ReadSyncWorker.MARK_READ_KEY, true)
.build()

queueReadWorker(articleID, data, context)
queueReadWorker(articleIDs, data, context)
}

fun markUnreadAsync(articleID: String, context: Context) {
val articleIDs = listOf(articleID)

val data = Data
.Builder()
.putString(ReadSyncWorker.ARTICLE_KEY, articleID)
.putStringArray(ReadSyncWorker.ARTICLES_KEY, articleIDs.toTypedArray())
.putBoolean(ReadSyncWorker.MARK_READ_KEY, false)
.build()

queueReadWorker(articleID, data, context)
queueReadWorker(articleIDs, data, context)
}

private fun queueReadWorker(articleID: String, data: Data, context: Context) {
private fun queueReadWorker(articleIDs: List<String>, data: Data, context: Context) {
val workManager = WorkManager.getInstance(context)

val request = OneTimeWorkRequestBuilder<ReadSyncWorker>()
.setConstraints(networkConstraints())
.setInputData(data)
.build()

val key = MD5.from(articleIDs.joinToString(","))

workManager.enqueueUniqueWork(
"article_read:${articleID}",
"article_read:$key",
ExistingWorkPolicy.REPLACE,
request
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ class ArticleScreenViewModel(

fun markAllRead(range: MarkRead) {
viewModelScope.launch(Dispatchers.IO) {
account.markAllRead(filter = filter.value, range = range)
val articleIDs = account.unreadArticleIDs(filter = filter.value, range = range)

markReadAsync(articleIDs, context)
}
}

Expand Down Expand Up @@ -203,7 +205,7 @@ class ArticleScreenViewModel(
private suspend fun markRead(articleID: String) {
account.markRead(articleID)
.onFailure {
markReadAsync(articleID, context)
markReadAsync(listOf(articleID), context)
}
}

Expand Down
6 changes: 4 additions & 2 deletions capy/src/main/java/com/jocmp/capy/Account.kt
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@ data class Account(
return delegate.removeStar(listOf(articleID))
}

suspend fun markAllRead(filter: ArticleFilter, range: MarkRead): Result<Unit> {
val articleIDs = articleRecords.unreadArticleIDs(
fun unreadArticleIDs(filter: ArticleFilter, range: MarkRead): List<String> {
return articleRecords.unreadArticleIDs(
filter = filter,
range = range
)
}

suspend fun markAllRead(articleIDs: List<String>): Result<Unit> {
articleRecords.markAllRead(articleIDs)

return delegate.markRead(articleIDs)
Expand Down
Loading