mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-23 19:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sync-part-final

Browse Source
This commit is contained in:
KaiserBh
2023-12-15 07:01:37 +11:00
committed by GitHub
parent 2ed1579151 0f9895eec8
commit 3532074a70
121 changed files with 900 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
domain/src/main/java/tachiyomi/domain/storage/service/StoragePreferences.kt
View File

@@ -1,5 +1,6 @@
package tachiyomi.domain.storage.service
import tachiyomi.core.preference.Preference
import tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.storage.FolderProvider
@@ -8,5 +9,5 @@ class StoragePreferences(
private val preferenceStore: PreferenceStore,
) {
fun baseStorageDirectory() = preferenceStore.getString("storage_dir", folderProvider.path())
fun baseStorageDirectory() = preferenceStore.getString(Preference.appStateKey("storage_dir"), folderProvider.path())
}

6
domain/src/main/java/tachiyomi/domain/updates/interactor/GetUpdates.kt
View File

@@ -3,7 +3,7 @@ package tachiyomi.domain.updates.interactor
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.updates.model.UpdatesWithRelations
import tachiyomi.domain.updates.repository.UpdatesRepository
import java.util.Calendar
import java.time.Instant
class GetUpdates(
private val repository: UpdatesRepository,
@@ -13,8 +13,8 @@ class GetUpdates(
return repository.awaitWithRead(read, after, limit = 500)
}
fun subscribe(calendar: Calendar): Flow<List<UpdatesWithRelations>> {
return repository.subscribeAll(calendar.time.time, limit = 500)
fun subscribe(instant: Instant): Flow<List<UpdatesWithRelations>> {
return repository.subscribeAll(instant.toEpochMilli(), limit = 500)
}
fun subscribe(read: Boolean, after: Long): Flow<List<UpdatesWithRelations>> {