diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt index f5bc96eb0..a27810c1a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt @@ -25,6 +25,7 @@ import tachiyomi.i18n.MR import tachiyomi.i18n.sy.SYMR import tachiyomi.presentation.core.i18n.pluralStringResource import tachiyomi.presentation.core.i18n.stringResource +import tachiyomi.presentation.core.util.collectAsState import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt index c6473d16a..8b2027699 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt @@ -1,6 +1,7 @@ package eu.kanade.tachiyomi.extension.api import android.content.Context +import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.extension.model.LoadResult @@ -33,6 +34,9 @@ internal class ExtensionApi { private val getExtensionRepo: GetExtensionRepo by injectLazy() private val updateExtensionRepo: UpdateExtensionRepo by injectLazy() private val extensionManager: ExtensionManager by injectLazy() + // SY --> + private val sourcePreferences: SourcePreferences by injectLazy() + // SY <-- private val json: Json by injectLazy() private val lastExtCheck: Preference by lazy { diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index ef6b7b04c..5e5b87cfb 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -693,7 +693,7 @@ object EXHMigrations { runBlocking { for ((index, source) in sourcePreferences.extensionRepos().get().withIndex()) { try { - extensionRepoRepository.upsertRepository( + extensionRepoRepository.upsertRepo( source, "Repo #${index + 1}", null, diff --git a/app/src/main/java/exh/debug/DebugFunctions.kt b/app/src/main/java/exh/debug/DebugFunctions.kt index b7b50fe87..6d7be9655 100644 --- a/app/src/main/java/exh/debug/DebugFunctions.kt +++ b/app/src/main/java/exh/debug/DebugFunctions.kt @@ -27,6 +27,7 @@ import exh.source.nHentaiSourceIds import exh.util.jobScheduler import kotlinx.coroutines.runBlocking import kotlinx.serialization.protobuf.schema.ProtoBufSchemaGenerator +import mihon.domain.extensionrepo.repository.ExtensionRepoRepository import tachiyomi.core.common.preference.PreferenceStore import tachiyomi.data.DatabaseHandler import tachiyomi.domain.backup.service.BackupPreferences @@ -66,6 +67,7 @@ object DebugFunctions { private val getSearchMetadata: GetSearchMetadata by injectLazy() private val getAllManga: GetAllManga by injectLazy() private val pagePreviewCache: PagePreviewCache by injectLazy() + private val extensionRepoRepository: ExtensionRepoRepository by injectLazy() fun forceUpgradeMigration() { val lastVersionCode = prefsStore.getInt("eh_last_version_code", 0) @@ -83,6 +85,7 @@ object DebugFunctions { backupPreferences = backupPrefs, trackerManager = trackerManager, pagePreviewCache = pagePreviewCache, + extensionRepoRepository = extensionRepoRepository, ) } @@ -102,6 +105,7 @@ object DebugFunctions { backupPreferences = backupPrefs, trackerManager = trackerManager, pagePreviewCache = pagePreviewCache, + extensionRepoRepository = extensionRepoRepository, ) }