Merge from mihon

.github/.java-version

@@ -0,0 +1 @@
+21

.github/workflows/build.yml

@@ -38,12 +38,12 @@ jobs:
 
       - name: Dependency Review
         if: github.event_name == 'pull_request'
-        uses: actions/dependency-review-action@05fe4576374b728f0c523d6a13d64c25081e0803 # v4.8.3
+        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
 
       - name: Set up JDK
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          java-version: 17
+          java-version-file: .github/.java-version
           distribution: temurin
 
       - name: Set up Gradle

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          java-version: 17
+          java-version-file: .github/.java-version
           distribution: temurin
 
       # AM (SYNC_DRIVE) -->
@@ -110,7 +110,7 @@ jobs:
             Animiru
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
         with:
           tag_name: ${{ needs.get_tag.outputs.tag }}
           name: Animiru ${{ needs.get_tag.outputs.tag }}

app/build.gradle.kts

@@ -204,7 +204,7 @@ dependencies {
     implementation(androidx.paging.runtime)
     implementation(androidx.paging.compose)
 
-    implementation(libs.bundles.sqlite)
+    implementation(androidx.sqlite.bundled)
 
     implementation(kotlinx.reflect)
     implementation(kotlinx.immutables)

app/src/main/java/eu/kanade/domain/anime/interactor/UpdateAnime.kt

@@ -49,7 +49,7 @@ class UpdateAnime(
 
         // if the anime isn't a favorite (or 'update titles' preference is enabled), set its title from source and update in db
         val title =
-            if (remoteTitle.isNotEmpty() && (!localAnime.favorite || libraryPreferences.updateAnimeTitles().get())) {
+            if (remoteTitle.isNotEmpty() && (!localAnime.favorite || libraryPreferences.updateAnimeTitles.get())) {
                 remoteTitle
             } else {
                 null

app/src/main/java/eu/kanade/domain/anime/model/Anime.kt

@@ -12,7 +12,7 @@ import uy.kohesive.injekt.api.get
 // TODO: move these into the domain model
 val Anime.downloadedFilter: TriState
     get() {
-        if (Injekt.get<BasePreferences>().downloadedOnly().get()) return TriState.ENABLED_IS
+        if (Injekt.get<BasePreferences>().downloadedOnly.get()) return TriState.ENABLED_IS
         return when (downloadedFilterRaw) {
             Anime.EPISODE_SHOW_DOWNLOADED -> TriState.ENABLED_IS
             Anime.EPISODE_SHOW_NOT_DOWNLOADED -> TriState.ENABLED_NOT
@@ -23,7 +23,7 @@ val Anime.downloadedFilter: TriState
 // AY -->
 val Anime.seasonDownloadedFilter: TriState
     get() {
-        if (Injekt.get<BasePreferences>().downloadedOnly().get()) return TriState.ENABLED_IS
+        if (Injekt.get<BasePreferences>().downloadedOnly.get()) return TriState.ENABLED_IS
         return when (seasonDownloadedFilterRaw) {
             Anime.SEASON_SHOW_DOWNLOADED -> TriState.ENABLED_IS
             Anime.SEASON_SHOW_NOT_DOWNLOADED -> TriState.ENABLED_NOT

app/src/main/java/eu/kanade/domain/base/BasePreferences.kt

@@ -9,30 +9,35 @@ import tachiyomi.i18n.MR
 
 class BasePreferences(
     val context: Context,
-    private val preferenceStore: PreferenceStore,
+    preferenceStore: PreferenceStore,
 ) {
 
-    fun downloadedOnly() = preferenceStore.getBoolean(
+    val downloadedOnly: Preference<Boolean> = preferenceStore.getBoolean(
         Preference.appStateKey("pref_downloaded_only"),
         false,
     )
 
-    fun incognitoMode() = preferenceStore.getBoolean(Preference.appStateKey("incognito_mode"), false)
+    val incognitoMode: Preference<Boolean> = preferenceStore.getBoolean(Preference.appStateKey("incognito_mode"), false)
 
-    fun extensionInstaller() = ExtensionInstallerPreference(context, preferenceStore)
+    val extensionInstaller: ExtensionInstallerPreference = ExtensionInstallerPreference(context, preferenceStore)
 
     // AY -->
     fun deviceHasPip() = context.packageManager.hasSystemFeature(
         PackageManager.FEATURE_PICTURE_IN_PICTURE,
     )
     // <-- AY
 
-    fun shownOnboardingFlow() = preferenceStore.getBoolean(Preference.appStateKey("onboarding_complete"), false)
+    val shownOnboardingFlow: Preference<Boolean> = preferenceStore.getBoolean(
+        Preference.appStateKey("onboarding_complete"),
+        false,
+    )
 
     enum class ExtensionInstaller(val titleRes: StringResource, val requiresSystemPermission: Boolean) {
         LEGACY(MR.strings.ext_installer_legacy, true),
         PACKAGEINSTALLER(MR.strings.ext_installer_packageinstaller, true),
         SHIZUKU(MR.strings.ext_installer_shizuku, false),
         PRIVATE(MR.strings.ext_installer_private, false),
     }
+
+    val installationId: Preference<String> = preferenceStore.getString(Preference.appStateKey("installation_id"), "")
 }

app/src/main/java/eu/kanade/domain/connection/SyncPreferences.kt

@@ -11,28 +11,31 @@ class SyncPreferences(
     private val preferenceStore: PreferenceStore,
 ) {
     // AM (SYNC_YOMI) -->
-    fun clientHost() = preferenceStore.getString("connection_sync_client_host", "https://sync.animiru.net")
-    fun clientAPIKey() = preferenceStore.getString("connection_sync_client_api_key", "")
+    val clientHost: Preference<String> = preferenceStore.getString(
+        "connection_sync_client_host",
+        "https://sync.animiru.net",
+    )
+    val clientAPIKey: Preference<String> = preferenceStore.getString("connection_sync_client_api_key", "")
     // <-- AM (SYNC_YOMI)
 
-    fun lastSyncTimestamp() = preferenceStore.getLong(Preference.appStateKey("last_sync_timestamp"), 0L)
+    val lastSyncTimestamp: Preference<Long> = preferenceStore.getLong(Preference.appStateKey("last_sync_timestamp"), 0L)
 
-    fun lastSyncEtag() = preferenceStore.getString("sync_etag", "")
+    val lastSyncEtag: Preference<String> = preferenceStore.getString("sync_etag", "")
 
-    fun syncInterval() = preferenceStore.getInt("sync_interval", 0)
+    val syncInterval: Preference<Int> = preferenceStore.getInt("sync_interval", 0)
 
     // AM (SYNC_DRIVE) -->
-    fun googleDriveAccessToken() = preferenceStore.getString(
+    val googleDriveAccessToken: Preference<String> = preferenceStore.getString(
         Preference.appStateKey("connection_google_drive_access_token"),
         "",
     )
-    fun googleDriveRefreshToken() = preferenceStore.getString(
+    val googleDriveRefreshToken: Preference<String> = preferenceStore.getString(
         Preference.appStateKey("connection_google_drive_refresh_token"),
         "",
     )
     // <-- AM (SYNC_DRIVE)
 
-    fun isSyncEnabled() = googleDriveRefreshToken().get().isNotBlank() || clientAPIKey().get().isNotBlank()
+    fun isSyncEnabled() = googleDriveRefreshToken.get().isNotBlank() || clientAPIKey.get().isNotBlank()
 
     fun uniqueDeviceID(): String {
         val uniqueIDPreference = preferenceStore.getString("unique_device_id", "")

app/src/main/java/eu/kanade/domain/connection/service/ConnectionPreferences.kt

@@ -2,6 +2,7 @@
 package eu.kanade.domain.connection.service
 
 import eu.kanade.tachiyomi.data.connection.Connection
+import tachiyomi.core.common.preference.Preference
 import tachiyomi.core.common.preference.PreferenceStore
 
 class ConnectionPreferences(
@@ -25,13 +26,16 @@ class ConnectionPreferences(
     fun connectionToken(connection: Connection) = preferenceStore.getString(connectionToken(connection.id), "")
 
     // AM (DISCORD_RPC) -->
-    fun enableDiscordRPC() = preferenceStore.getBoolean("pref_enable_discord_rpc", false)
+    val enableDiscordRPC: Preference<Boolean> = preferenceStore.getBoolean("pref_enable_discord_rpc", false)
 
-    fun discordRPCStatus() = preferenceStore.getInt("pref_discord_rpc_status", 1)
+    val discordRPCStatus: Preference<Int> = preferenceStore.getInt("pref_discord_rpc_status", 1)
 
-    fun discordRPCIncognito() = preferenceStore.getBoolean("pref_discord_rpc_incognito", false)
+    val discordRPCIncognito: Preference<Boolean> = preferenceStore.getBoolean("pref_discord_rpc_incognito", false)
 
-    fun discordRPCIncognitoCategories() = preferenceStore.getStringSet("discord_rpc_incognito_categories", emptySet())
+    val discordRPCIncognitoCategories: Preference<Set<String>> = preferenceStore.getStringSet(
+        "discord_rpc_incognito_categories",
+        emptySet(),
+    )
     // <-- AM (DISCORD_RPC)
 
     companion object {

app/src/main/java/eu/kanade/domain/episode/interactor/SetSeenStatus.kt

@@ -46,7 +46,7 @@ class SetSeenStatus(
             return@withNonCancellableContext Result.InternalError(e)
         }
 
-        if (seen && downloadPreferences.removeAfterMarkedAsSeen().get()) {
+        if (seen && downloadPreferences.removeAfterMarkedAsSeen.get()) {
             episodesToUpdate
                 .groupBy { it.animeId }
                 .forEach { (animeId, episodes) ->

app/src/main/java/eu/kanade/domain/episode/interactor/SyncEpisodesWithSource.kt

@@ -190,7 +190,7 @@ class SyncEpisodesWithSource(
         val deletedEpisodeNumberDateFetchMap = removedEpisodes.sortedByDescending { it.dateFetch }
             .associate { it.episodeNumber to it.dateFetch }
 
-        val markDuplicateAsSeen = libraryPreferences.markDuplicateSeenEpisodeAsSeen().get()
+        val markDuplicateAsSeen = libraryPreferences.markDuplicateSeenEpisodeAsSeen.get()
             .contains(LibraryPreferences.MARK_DUPLICATE_EPISODE_SEEN_NEW)
 
         // Date fetch is set in such a way that the upper ones will have bigger value than the lower ones

app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionLanguages.kt

@@ -12,7 +12,7 @@ class GetExtensionLanguages(
 ) {
     fun subscribe(): Flow<List<String>> {
         return combine(
-            preferences.enabledLanguages().changes(),
+            preferences.enabledLanguages.changes(),
             extensionManager.availableExtensionsFlow,
         ) { enabledLanguage, availableExtensions ->
             availableExtensions

app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionSources.kt

@@ -15,7 +15,7 @@ class GetExtensionSources(
         val isMultiLangSingleSource =
             isMultiSource && extension.sources.map { it.name }.distinct().size == 1
 
-        return preferences.disabledSources().changes().map { disabledSources ->
+        return preferences.disabledSources.changes().map { disabledSources ->
             fun AnimeSource.isEnabled() = id.toString() !in disabledSources
 
             extension.sources

app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionsByType.kt

@@ -13,10 +13,10 @@ class GetExtensionsByType(
 ) {
 
     fun subscribe(): Flow<Extensions> {
-        val showNsfwSources = preferences.showNsfwSource().get()
+        val showNsfwSources = preferences.showNsfwSource.get()
 
         return combine(
-            preferences.enabledLanguages().changes(),
+            preferences.enabledLanguages.changes(),
             extensionManager.installedExtensionsFlow,
             extensionManager.untrustedExtensionsFlow,
             extensionManager.availableExtensionsFlow,

app/src/main/java/eu/kanade/domain/extension/interactor/TrustExtension.kt

@@ -14,11 +14,11 @@ class TrustExtension(
     suspend fun isTrusted(pkgInfo: PackageInfo, fingerprints: List<String>): Boolean {
         val trustedFingerprints = extensionRepoRepository.getAll().map { it.signingKeyFingerprint }.toHashSet()
         val key = "${pkgInfo.packageName}:${PackageInfoCompat.getLongVersionCode(pkgInfo)}:${fingerprints.last()}"
-        return trustedFingerprints.any { fingerprints.contains(it) } || key in preferences.trustedExtensions().get()
+        return trustedFingerprints.any { fingerprints.contains(it) } || key in preferences.trustedExtensions.get()
     }
 
     fun trust(pkgName: String, versionCode: Long, signatureHash: String) {
-        preferences.trustedExtensions().getAndSet { exts ->
+        preferences.trustedExtensions.getAndSet { exts ->
             // Remove previously trusted versions
             val removed = exts.filterNot { it.startsWith("$pkgName:") }.toMutableSet()
 
@@ -27,6 +27,6 @@ class TrustExtension(
     }
 
     fun revokeAll() {
-        preferences.trustedExtensions().delete()
+        preferences.trustedExtensions.delete()
     }
 }

app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt

@@ -17,10 +17,10 @@ class GetEnabledSources(
 
     fun subscribe(): Flow<List<Source>> {
         return combine(
-            preferences.pinnedSources().changes(),
-            preferences.enabledLanguages().changes(),
-            preferences.disabledSources().changes(),
-            preferences.lastUsedSource().changes(),
+            preferences.pinnedSources.changes(),
+            preferences.enabledLanguages.changes(),
+            preferences.disabledSources.changes(),
+            preferences.lastUsedSource.changes(),
             repository.getSources(),
         ) { pinnedSourceIds, enabledLanguages, disabledSources, lastUsedSource, sources ->
             sources

app/src/main/java/eu/kanade/domain/source/interactor/GetIncognitoState.kt

@@ -13,19 +13,19 @@ class GetIncognitoState(
     private val extensionManager: ExtensionManager,
 ) {
     fun await(sourceId: Long?): Boolean {
-        if (basePreferences.incognitoMode().get()) return true
+        if (basePreferences.incognitoMode.get()) return true
         if (sourceId == null) return false
         val extensionPackage = extensionManager.getExtensionPackage(sourceId) ?: return false
 
-        return extensionPackage in sourcePreferences.incognitoExtensions().get()
+        return extensionPackage in sourcePreferences.incognitoExtensions.get()
     }
 
     fun subscribe(sourceId: Long?): Flow<Boolean> {
-        if (sourceId == null) return basePreferences.incognitoMode().changes()
+        if (sourceId == null) return basePreferences.incognitoMode.changes()
 
         return combine(
-            basePreferences.incognitoMode().changes(),
-            sourcePreferences.incognitoExtensions().changes(),
+            basePreferences.incognitoMode.changes(),
+            sourcePreferences.incognitoExtensions.changes(),
             extensionManager.getExtensionPackageAsFlow(sourceId),
         ) { incognito, incognitoExtensions, extensionPackage ->
             incognito || (extensionPackage in incognitoExtensions)

app/src/main/java/eu/kanade/domain/source/interactor/GetLanguagesWithSources.kt

@@ -15,8 +15,8 @@ class GetLanguagesWithSources(
 
     fun subscribe(): Flow<SortedMap<String, List<Source>>> {
         return combine(
-            preferences.enabledLanguages().changes(),
-            preferences.disabledSources().changes(),
+            preferences.enabledLanguages.changes(),
+            preferences.disabledSources.changes(),
             repository.getOnlineSources(),
         ) { enabledLanguage, disabledSource, onlineSources ->
             val sortedSources = onlineSources.sortedWith(

app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt

@@ -16,8 +16,8 @@ class GetSourcesWithFavoriteCount(
 
     fun subscribe(): Flow<List<Pair<Source, Long>>> {
         return combine(
-            preferences.migrationSortingDirection().changes(),
-            preferences.migrationSortingMode().changes(),
+            preferences.migrationSortingDirection.changes(),
+            preferences.migrationSortingMode.changes(),
             repository.getSourcesWithFavoriteCount(),
         ) { direction, mode, list ->
             list

app/src/main/java/eu/kanade/domain/source/interactor/SetMigrateSorting.kt

@@ -7,8 +7,8 @@ class SetMigrateSorting(
 ) {
 
     fun await(mode: Mode, direction: Direction) {
-        preferences.migrationSortingMode().set(mode)
-        preferences.migrationSortingDirection().set(direction)
+        preferences.migrationSortingMode.set(mode)
+        preferences.migrationSortingDirection.set(direction)
     }
 
     enum class Mode {

app/src/main/java/eu/kanade/domain/source/interactor/ToggleIncognito.kt

@@ -7,7 +7,7 @@ class ToggleIncognito(
     private val preferences: SourcePreferences,
 ) {
     fun await(extensions: String, enable: Boolean) {
-        preferences.incognitoExtensions().getAndSet {
+        preferences.incognitoExtensions.getAndSet {
             if (enable) it.plus(extensions) else it.minus(extensions)
         }
     }

app/src/main/java/eu/kanade/domain/source/interactor/ToggleLanguage.kt

@@ -8,8 +8,8 @@ class ToggleLanguage(
 ) {
 
     fun await(language: String) {
-        val isEnabled = language in preferences.enabledLanguages().get()
-        preferences.enabledLanguages().getAndSet { enabled ->
+        val isEnabled = language in preferences.enabledLanguages.get()
+        preferences.enabledLanguages.getAndSet { enabled ->
             if (isEnabled) enabled.minus(language) else enabled.plus(language)
         }
     }

app/src/main/java/eu/kanade/domain/source/interactor/ToggleSource.kt

@@ -13,19 +13,19 @@ class ToggleSource(
     }
 
     fun await(sourceId: Long, enable: Boolean = isEnabled(sourceId)) {
-        preferences.disabledSources().getAndSet { disabled ->
+        preferences.disabledSources.getAndSet { disabled ->
             if (enable) disabled.minus("$sourceId") else disabled.plus("$sourceId")
         }
     }
 
     fun await(sourceIds: List<Long>, enable: Boolean) {
         val transformedSourceIds = sourceIds.map { it.toString() }
-        preferences.disabledSources().getAndSet { disabled ->
+        preferences.disabledSources.getAndSet { disabled ->
             if (enable) disabled.minus(transformedSourceIds) else disabled.plus(transformedSourceIds)
         }
     }
 
     private fun isEnabled(sourceId: Long): Boolean {
-        return sourceId.toString() in preferences.disabledSources().get()
+        return sourceId.toString() in preferences.disabledSources.get()
     }
 }

app/src/main/java/eu/kanade/domain/source/interactor/ToggleSourcePin.kt

@@ -9,8 +9,8 @@ class ToggleSourcePin(
 ) {
 
     fun await(source: Source) {
-        val isPinned = source.id.toString() in preferences.pinnedSources().get()
-        preferences.pinnedSources().getAndSet { pinned ->
+        val isPinned = source.id.toString() in preferences.pinnedSources.get()
+        preferences.pinnedSources.getAndSet { pinned ->
             if (isPinned) pinned.minus("${source.id}") else pinned.plus("${source.id}")
         }
     }