Merge branch 'main' into update-calendar

* Rewrite Migrations

* Fix Detekt errors

* Do migrations synchronous

* Filter and sort migrations

* Review changes

* Review changes 2

* Fix Detekt errors

app/build.gradle.kts

@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId = "app.mihon"
 
-        versionCode = 6
+        versionCode = 7
         versionName = "0.16.4"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
@@ -161,7 +161,6 @@ dependencies {
     debugImplementation(compose.ui.tooling)
     implementation(compose.ui.tooling.preview)
     implementation(compose.ui.util)
-    implementation(compose.accompanist.webview)
     implementation(compose.accompanist.systemuicontroller)
 
     implementation(androidx.paging.runtime)
@@ -237,6 +236,8 @@ dependencies {
     implementation(libs.bundles.voyager)
     implementation(libs.compose.materialmotion)
     implementation(libs.swipe)
+    implementation(libs.compose.webview)
+
 
     // Logging
     implementation(libs.logcat)

app/src/main/java/eu/kanade/domain/DomainModule.kt

@@ -4,10 +4,7 @@ import eu.kanade.domain.chapter.interactor.GetAvailableScanlators
 import eu.kanade.domain.chapter.interactor.SetReadStatus
 import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource
 import eu.kanade.domain.download.interactor.DeleteDownload
-import eu.kanade.domain.extension.interactor.CreateExtensionRepo
-import eu.kanade.domain.extension.interactor.DeleteExtensionRepo
 import eu.kanade.domain.extension.interactor.GetExtensionLanguages
-import eu.kanade.domain.extension.interactor.GetExtensionRepos
 import eu.kanade.domain.extension.interactor.GetExtensionSources
 import eu.kanade.domain.extension.interactor.GetExtensionsByType
 import eu.kanade.domain.extension.interactor.TrustExtension
@@ -26,6 +23,16 @@ import eu.kanade.domain.track.interactor.AddTracks
 import eu.kanade.domain.track.interactor.RefreshTracks
 import eu.kanade.domain.track.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.track.interactor.TrackChapter
+import mihon.data.repository.ExtensionRepoRepositoryImpl
+import mihon.domain.extensionrepo.interactor.CreateExtensionRepo
+import mihon.domain.extensionrepo.interactor.DeleteExtensionRepo
+import mihon.domain.extensionrepo.interactor.GetExtensionRepo
+import mihon.domain.extensionrepo.interactor.GetExtensionRepoCount
+import mihon.domain.extensionrepo.interactor.ReplaceExtensionRepo
+import mihon.domain.extensionrepo.interactor.UpdateExtensionRepo
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+import mihon.domain.extensionrepo.service.ExtensionRepoService
+import mihon.domain.manga.interactor.GetUpcomingManga
 import tachiyomi.data.category.CategoryRepositoryImpl
 import tachiyomi.data.chapter.ChapterRepositoryImpl
 import tachiyomi.data.history.HistoryRepositoryImpl
@@ -66,7 +73,6 @@ import tachiyomi.domain.manga.interactor.GetLibraryManga
 import tachiyomi.domain.manga.interactor.GetManga
 import tachiyomi.domain.manga.interactor.GetMangaByUrlAndSourceId
 import tachiyomi.domain.manga.interactor.GetMangaWithChapters
-import tachiyomi.domain.manga.interactor.GetUpcomingManga
 import tachiyomi.domain.manga.interactor.NetworkToLocalManga
 import tachiyomi.domain.manga.interactor.ResetViewerFlags
 import tachiyomi.domain.manga.interactor.SetMangaChapterFlags
@@ -175,8 +181,13 @@ class DomainModule : InjektModule {
         addFactory { ToggleSourcePin(get()) }
         addFactory { TrustExtension(get()) }
 
-        addFactory { CreateExtensionRepo(get()) }
+        addSingletonFactory<ExtensionRepoRepository> { ExtensionRepoRepositoryImpl(get()) }
+        addFactory { ExtensionRepoService(get(), get()) }
+        addFactory { GetExtensionRepo(get()) }
+        addFactory { GetExtensionRepoCount(get()) }
+        addFactory { CreateExtensionRepo(get(), get()) }
         addFactory { DeleteExtensionRepo(get()) }
-        addFactory { GetExtensionRepos(get()) }
+        addFactory { ReplaceExtensionRepo(get()) }
+        addFactory { UpdateExtensionRepo(get(), get()) }
     }
 }

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

@@ -1,25 +0,0 @@
-package eu.kanade.domain.extension.interactor
-
-import eu.kanade.domain.source.service.SourcePreferences
-import tachiyomi.core.common.preference.plusAssign
-
-class CreateExtensionRepo(private val preferences: SourcePreferences) {
-
-    fun await(name: String): Result {
-        // Do not allow invalid formats
-        if (!name.matches(repoRegex)) {
-            return Result.InvalidUrl
-        }
-
-        preferences.extensionRepos() += name.removeSuffix("/index.min.json")
-
-        return Result.Success
-    }
-
-    sealed interface Result {
-        data object InvalidUrl : Result
-        data object Success : Result
-    }
-}
-
-private val repoRegex = """^https://.*/index\.min\.json$""".toRegex()

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

@@ -1,11 +0,0 @@
-package eu.kanade.domain.extension.interactor
-
-import eu.kanade.domain.source.service.SourcePreferences
-import tachiyomi.core.common.preference.minusAssign
-
-class DeleteExtensionRepo(private val preferences: SourcePreferences) {
-
-    fun await(repo: String) {
-        preferences.extensionRepos() -= repo
-    }
-}

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

@@ -1,11 +0,0 @@
-package eu.kanade.domain.extension.interactor
-
-import eu.kanade.domain.source.service.SourcePreferences
-import kotlinx.coroutines.flow.Flow
-
-class GetExtensionRepos(private val preferences: SourcePreferences) {
-
-    fun subscribe(): Flow<Set<String>> {
-        return preferences.extensionRepos().changes()
-    }
-}

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt

@@ -2,6 +2,7 @@ package eu.kanade.presentation.more.settings.screen
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
@@ -13,11 +14,11 @@ import eu.kanade.presentation.more.settings.Preference
 import eu.kanade.presentation.more.settings.screen.browse.ExtensionReposScreen
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
 import kotlinx.collections.immutable.persistentListOf
+import mihon.domain.extensionrepo.interactor.GetExtensionRepoCount
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.i18n.MR
 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
 
@@ -33,7 +34,9 @@ object SettingsBrowseScreen : SearchableSettings {
         val navigator = LocalNavigator.currentOrThrow
 
         val sourcePreferences = remember { Injekt.get<SourcePreferences>() }
-        val reposCount by sourcePreferences.extensionRepos().collectAsState()
+        val getExtensionRepoCount = remember { Injekt.get<GetExtensionRepoCount>() }
+
+        val reposCount by getExtensionRepoCount.subscribe().collectAsState(0)
 
         return listOf(
             Preference.PreferenceGroup(
@@ -45,7 +48,7 @@ object SettingsBrowseScreen : SearchableSettings {
                     ),
                     Preference.PreferenceItem.TextPreference(
                         title = stringResource(MR.strings.label_extension_repos),
-                        subtitle = pluralStringResource(MR.plurals.num_repos, reposCount.size, reposCount.size),
+                        subtitle = pluralStringResource(MR.plurals.num_repos, reposCount, reposCount),
                         onClick = {
                             navigator.push(ExtensionReposScreen())
                         },

app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/ExtensionReposScreen.kt

@@ -8,11 +8,14 @@ import androidx.compose.ui.platform.LocalContext
 import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
+import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionRepoConflictDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionRepoCreateDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionRepoDeleteDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionReposScreen
 import eu.kanade.presentation.util.Screen
+import eu.kanade.tachiyomi.util.system.openInBrowser
 import eu.kanade.tachiyomi.util.system.toast
+import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.flow.collectLatest
 import tachiyomi.presentation.core.screens.LoadingScreen
 
@@ -42,17 +45,19 @@ class ExtensionReposScreen(
         ExtensionReposScreen(
             state = successState,
             onClickCreate = { screenModel.showDialog(RepoDialog.Create) },
+            onOpenWebsite = { context.openInBrowser(it.website) },
             onClickDelete = { screenModel.showDialog(RepoDialog.Delete(it)) },
+            onClickRefresh = { screenModel.refreshRepos() },
             navigateUp = navigator::pop,
         )
 
         when (val dialog = successState.dialog) {
             null -> {}
-            RepoDialog.Create -> {
+            is RepoDialog.Create -> {
                 ExtensionRepoCreateDialog(
                     onDismissRequest = screenModel::dismissDialog,
                     onCreate = { screenModel.createRepo(it) },
-                    repos = successState.repos,
+                    repoUrls = successState.repos.map { it.baseUrl }.toImmutableSet(),
                 )
             }
             is RepoDialog.Delete -> {
@@ -62,6 +67,15 @@ class ExtensionReposScreen(
                     repo = dialog.repo,
                 )
             }
+
+            is RepoDialog.Conflict -> {
+                ExtensionRepoConflictDialog(
+                    onDismissRequest = screenModel::dismissDialog,
+                    onMigrate = { screenModel.replaceRepo(dialog.newRepo) },
+                    oldRepo = dialog.oldRepo,
+                    newRepo = dialog.newRepo,
+                )
+            }
         }
 
         LaunchedEffect(Unit) {

app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/ExtensionReposScreenModel.kt

@@ -4,24 +4,29 @@ import androidx.compose.runtime.Immutable
 import cafe.adriel.voyager.core.model.StateScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import dev.icerock.moko.resources.StringResource
-import eu.kanade.domain.extension.interactor.CreateExtensionRepo
-import eu.kanade.domain.extension.interactor.DeleteExtensionRepo
-import eu.kanade.domain.extension.interactor.GetExtensionRepos
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
+import mihon.domain.extensionrepo.interactor.CreateExtensionRepo
+import mihon.domain.extensionrepo.interactor.DeleteExtensionRepo
+import mihon.domain.extensionrepo.interactor.GetExtensionRepo
+import mihon.domain.extensionrepo.interactor.ReplaceExtensionRepo
+import mihon.domain.extensionrepo.interactor.UpdateExtensionRepo
+import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 class ExtensionReposScreenModel(
-    private val getExtensionRepos: GetExtensionRepos = Injekt.get(),
+    private val getExtensionRepo: GetExtensionRepo = Injekt.get(),
     private val createExtensionRepo: CreateExtensionRepo = Injekt.get(),
     private val deleteExtensionRepo: DeleteExtensionRepo = Injekt.get(),
+    private val replaceExtensionRepo: ReplaceExtensionRepo = Injekt.get(),
+    private val updateExtensionRepo: UpdateExtensionRepo = Injekt.get(),
 ) : StateScreenModel<RepoScreenState>(RepoScreenState.Loading) {
 
     private val _events: Channel<RepoEvent> = Channel(Int.MAX_VALUE)
@@ -29,7 +34,7 @@ class ExtensionReposScreenModel(
 
     init {
         screenModelScope.launchIO {
-            getExtensionRepos.subscribe()
+            getExtensionRepo.subscribeAll()
                 .collectLatest { repos ->
                     mutableState.update {
                         RepoScreenState.Success(
@@ -43,25 +48,51 @@ class ExtensionReposScreenModel(
     /**
      * Creates and adds a new repo to the database.
      *
-     * @param name The name of the repo to create.
+     * @param baseUrl The baseUrl of the repo to create.
      */
-    fun createRepo(name: String) {
+    fun createRepo(baseUrl: String) {
         screenModelScope.launchIO {
-            when (createExtensionRepo.await(name)) {
-                is CreateExtensionRepo.Result.InvalidUrl -> _events.send(RepoEvent.InvalidUrl)
+            when (val result = createExtensionRepo.await(baseUrl)) {
+                CreateExtensionRepo.Result.InvalidUrl -> _events.send(RepoEvent.InvalidUrl)
+                CreateExtensionRepo.Result.RepoAlreadyExists -> _events.send(RepoEvent.RepoAlreadyExists)
+                is CreateExtensionRepo.Result.DuplicateFingerprint -> {
+                    showDialog(RepoDialog.Conflict(result.oldRepo, result.newRepo))
+                }
                 else -> {}
             }
         }
     }
 
     /**
-     * Deletes the given repo from the database.
+     * Inserts a repo to the database, replace a matching repo with the same signing key fingerprint if found.
      *
-     * @param repo The repo to delete.
+     * @param newRepo The repo to insert
      */
-    fun deleteRepo(repo: String) {
+    fun replaceRepo(newRepo: ExtensionRepo) {
         screenModelScope.launchIO {
-            deleteExtensionRepo.await(repo)
+            replaceExtensionRepo.await(newRepo)
+        }
+    }
+
+    /**
+     * Refreshes information for each repository.
+     */
+    fun refreshRepos() {
+        val status = state.value
+
+        if (status is RepoScreenState.Success) {
+            screenModelScope.launchIO {
+                updateExtensionRepo.awaitAll()
+            }
+        }
+    }
+
+    /**
+     * Deletes the given repo from the database
+     */
+    fun deleteRepo(baseUrl: String) {
+        screenModelScope.launchIO {
+            deleteExtensionRepo.await(baseUrl)
         }
     }
 
@@ -87,11 +118,13 @@ class ExtensionReposScreenModel(
 sealed class RepoEvent {
     sealed class LocalizedMessage(val stringRes: StringResource) : RepoEvent()
     data object InvalidUrl : LocalizedMessage(MR.strings.invalid_repo_name)
+    data object RepoAlreadyExists : LocalizedMessage(MR.strings.error_repo_exists)
 }
 
 sealed class RepoDialog {
     data object Create : RepoDialog()
     data class Delete(val repo: String) : RepoDialog()
+    data class Conflict(val oldRepo: ExtensionRepo, val newRepo: ExtensionRepo) : RepoDialog()
 }
 
 sealed class RepoScreenState {
@@ -101,7 +134,8 @@ sealed class RepoScreenState {
 
     @Immutable
     data class Success(
-        val repos: ImmutableSet<String>,
+        val repos: ImmutableSet<ExtensionRepo>,
+        val oldRepos: ImmutableSet<String>? = null,
         val dialog: RepoDialog? = null,
     ) : RepoScreenState() {
 

app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionReposContent.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.Label
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
 import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.ElevatedCard
@@ -22,15 +23,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import kotlinx.collections.immutable.ImmutableSet
+import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
 
 @Composable
 fun ExtensionReposContent(
-    repos: ImmutableSet<String>,
+    repos: ImmutableSet<ExtensionRepo>,
     lazyListState: LazyListState,
     paddingValues: PaddingValues,
+    onOpenWebsite: (ExtensionRepo) -> Unit,
     onClickDelete: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -45,7 +48,8 @@ fun ExtensionReposContent(
                 ExtensionRepoListItem(
                     modifier = Modifier.animateItemPlacement(),
                     repo = it,
-                    onDelete = { onClickDelete(it) },
+                    onOpenWebsite = { onOpenWebsite(it) },
+                    onDelete = { onClickDelete(it.baseUrl) },
                 )
             }
         }
@@ -54,7 +58,8 @@ fun ExtensionReposContent(
 
 @Composable
 private fun ExtensionRepoListItem(
-    repo: String,
+    repo: ExtensionRepo,
+    onOpenWebsite: () -> Unit,
     onDelete: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -74,16 +79,27 @@ private fun ExtensionRepoListItem(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(imageVector = Icons.AutoMirrored.Outlined.Label, contentDescription = null)
-            Text(text = repo, modifier = Modifier.padding(start = MaterialTheme.padding.medium))
+            Text(
+                text = repo.name,
+                modifier = Modifier.padding(start = MaterialTheme.padding.medium),
+                style = MaterialTheme.typography.titleMedium,
+            )
         }
 
         Row(
             modifier = Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.End,
         ) {
+            IconButton(onClick = onOpenWebsite) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Outlined.OpenInNew,
+                    contentDescription = stringResource(MR.strings.action_open_in_browser),
+                )
+            }
+
             IconButton(
                 onClick = {
-                    val url = "$repo/index.min.json"
+                    val url = "${repo.baseUrl}/index.min.json"
                     context.copyToClipboard(url, url)
                 },
             ) {

app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionReposDialogs.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.coroutines.delay
+import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import kotlin.time.Duration.Companion.seconds
@@ -24,12 +25,12 @@ import kotlin.time.Duration.Companion.seconds
 fun ExtensionRepoCreateDialog(
     onDismissRequest: () -> Unit,
     onCreate: (String) -> Unit,
-    repos: ImmutableSet<String>,
+    repoUrls: ImmutableSet<String>,
 ) {
     var name by remember { mutableStateOf("") }
 
     val focusRequester = remember { FocusRequester() }
-    val nameAlreadyExists = remember(name) { repos.contains(name) }
+    val nameAlreadyExists = remember(name) { repoUrls.contains(name) }
 
     AlertDialog(
         onDismissRequest = onDismissRequest,
@@ -115,3 +116,36 @@ fun ExtensionRepoDeleteDialog(
         },
     )
 }
+
+@Composable
+fun ExtensionRepoConflictDialog(
+    oldRepo: ExtensionRepo,
+    newRepo: ExtensionRepo,
+    onDismissRequest: () -> Unit,
+    onMigrate: () -> Unit,
+) {
+    AlertDialog(
+        onDismissRequest = onDismissRequest,
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onMigrate()
+                    onDismissRequest()
+                },
+            ) {
+                Text(text = stringResource(MR.strings.action_replace_repo))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismissRequest) {
+                Text(text = stringResource(MR.strings.action_cancel))
+            }
+        },
+        title = {
+            Text(text = stringResource(MR.strings.action_replace_repo_title))
+        },
+        text = {
+            Text(text = stringResource(MR.strings.action_replace_repo_message, newRepo.name, oldRepo.name))
+        },
+    )
+}

app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionReposScreen.kt

@@ -5,12 +5,17 @@ package eu.kanade.presentation.more.settings.screen.browse.components
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import eu.kanade.presentation.category.components.CategoryFloatingActionButton
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.more.settings.screen.browse.RepoScreenState
+import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.components.material.padding
@@ -23,7 +28,9 @@ import tachiyomi.presentation.core.util.plus
 fun ExtensionReposScreen(
     state: RepoScreenState.Success,
     onClickCreate: () -> Unit,
+    onOpenWebsite: (ExtensionRepo) -> Unit,
     onClickDelete: (String) -> Unit,
+    onClickRefresh: () -> Unit,
     navigateUp: () -> Unit,
 ) {
     val lazyListState = rememberLazyListState()
@@ -33,6 +40,14 @@ fun ExtensionReposScreen(
                 navigateUp = navigateUp,
                 title = stringResource(MR.strings.label_extension_repos),
                 scrollBehavior = scrollBehavior,
+                actions = {
+                    IconButton(onClick = onClickRefresh) {
+                        Icon(
+                            imageVector = Icons.Outlined.Refresh,
+                            contentDescription = stringResource(resource = MR.strings.action_webview_refresh),
+                        )
+                    }
+                },
             )
         },
         floatingActionButton = {
@@ -55,6 +70,7 @@ fun ExtensionReposScreen(
             lazyListState = lazyListState,
             paddingValues = paddingValues + topSmallPaddingValues +
                 PaddingValues(horizontal = MaterialTheme.padding.medium),
+            onOpenWebsite = onOpenWebsite,
             onClickDelete = onClickDelete,
         )
     }

app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt

@@ -28,11 +28,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.web.AccompanistWebViewClient
-import com.google.accompanist.web.LoadingState
-import com.google.accompanist.web.WebView
-import com.google.accompanist.web.rememberWebViewNavigator
-import com.google.accompanist.web.rememberWebViewState
+import com.kevinnzou.web.AccompanistWebViewClient
+import com.kevinnzou.web.LoadingState
+import com.kevinnzou.web.WebView
+import com.kevinnzou.web.rememberWebViewNavigator
+import com.kevinnzou.web.rememberWebViewState
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.components.WarningBanner

app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -1,38 +0,0 @@
-package eu.kanade.tachiyomi
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.backup.create.BackupCreateJob
-import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
-import tachiyomi.core.common.preference.Preference
-import tachiyomi.core.common.preference.PreferenceStore
-
-object Migrations {
-
-    /**
-     * Performs a migration when the application is updated.
-     *
-     * @return true if a migration is performed, false otherwise.
-     */
-    @Suppress("SameReturnValue")
-    fun upgrade(
-        context: Context,
-        preferenceStore: PreferenceStore,
-    ): Boolean {
-        val lastVersionCode = preferenceStore.getInt(Preference.appStateKey("last_version_code"), 0)
-        val oldVersion = lastVersionCode.get()
-        if (oldVersion < BuildConfig.VERSION_CODE) {
-            lastVersionCode.set(BuildConfig.VERSION_CODE)
-
-            // Always set up background tasks to ensure they're running
-            LibraryUpdateJob.setupTask(context)
-            BackupCreateJob.setupTask(context)
-
-            // Fresh install
-            if (oldVersion == 0) {
-                return false
-            }
-        }
-
-        return false
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt

@@ -1,7 +1,6 @@
 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
@@ -10,9 +9,14 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.network.parseAs
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import logcat.LogPriority
+import mihon.domain.extensionrepo.interactor.GetExtensionRepo
+import mihon.domain.extensionrepo.interactor.UpdateExtensionRepo
+import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.core.common.preference.Preference
 import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.core.common.util.lang.withIOContext
@@ -25,7 +29,8 @@ internal class ExtensionApi {
 
     private val networkService: NetworkHelper by injectLazy()
     private val preferenceStore: PreferenceStore by injectLazy()
-    private val sourcePreferences: SourcePreferences by injectLazy()
+    private val getExtensionRepo: GetExtensionRepo by injectLazy()
+    private val updateExtensionRepo: UpdateExtensionRepo by injectLazy()
     private val extensionManager: ExtensionManager by injectLazy()
     private val json: Json by injectLazy()
 
@@ -35,11 +40,15 @@ internal class ExtensionApi {
 
     suspend fun findExtensions(): List<Extension.Available> {
         return withIOContext {
-            sourcePreferences.extensionRepos().get().flatMap { getExtensions(it) }
+            getExtensionRepo.getAll()
+                .map { async { getExtensions(it) } }
+                .awaitAll()
+                .flatten()
         }
     }
 
-    private suspend fun getExtensions(repoBaseUrl: String): List<Extension.Available> {
+    private suspend fun getExtensions(extRepo: ExtensionRepo): List<Extension.Available> {
+        val repoBaseUrl = extRepo.baseUrl
         return try {
             val response = networkService.client
                 .newCall(GET("$repoBaseUrl/index.min.json"))
@@ -67,6 +76,9 @@ internal class ExtensionApi {
             return null
         }
 
+        // Update extension repo details
+        updateExtensionRepo.awaitAll()
+
         val extensions = if (fromAvailableExtensionList) {
             extensionManager.availableExtensionsFlow.value
         } else {

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -50,8 +50,6 @@ import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import eu.kanade.domain.base.BasePreferences
-import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.AppStateBanners
 import eu.kanade.presentation.components.DownloadedOnlyBannerBackgroundColor
 import eu.kanade.presentation.components.IncognitoModeBannerBackgroundColor
@@ -61,7 +59,6 @@ import eu.kanade.presentation.more.settings.screen.data.RestoreBackupScreen
 import eu.kanade.presentation.util.AssistContentScreen
 import eu.kanade.presentation.util.DefaultNavigatorScreenTransition
 import eu.kanade.tachiyomi.BuildConfig
-import eu.kanade.tachiyomi.Migrations
 import eu.kanade.tachiyomi.data.cache.ChapterCache
 import eu.kanade.tachiyomi.data.download.DownloadCache
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
@@ -89,7 +86,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import logcat.LogPriority
+import mihon.core.migration.Migrator
+import mihon.core.migration.migrations.migrations
 import tachiyomi.core.common.Constants
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.library.service.LibraryPreferences
@@ -105,9 +106,7 @@ import androidx.compose.ui.graphics.Color.Companion as ComposeColor
 
 class MainActivity : BaseActivity() {
 
-    private val sourcePreferences: SourcePreferences by injectLazy()
     private val libraryPreferences: LibraryPreferences by injectLazy()
-    private val uiPreferences: UiPreferences by injectLazy()
     private val preferences: BasePreferences by injectLazy()
 
     private val downloadCache: DownloadCache by injectLazy()
@@ -130,14 +129,7 @@ class MainActivity : BaseActivity() {
 
         super.onCreate(savedInstanceState)
 
-        val didMigration = if (isLaunch) {
-            Migrations.upgrade(
-                context = applicationContext,
-                preferenceStore = Injekt.get(),
-            )
-        } else {
-            false
-        }
+        val didMigration = migrate()
 
         // Do not let the launcher create a new activity http://stackoverflow.com/questions/16283079
         if (!isTaskRoot) {
@@ -348,6 +340,21 @@ class MainActivity : BaseActivity() {
         }
     }
 
+    private fun migrate(): Boolean {
+        val preferenceStore = Injekt.get<PreferenceStore>()
+        val preference = preferenceStore.getInt(Preference.appStateKey("last_version_code"), 0)
+        logcat { "Migration from ${preference.get()} to ${BuildConfig.VERSION_CODE}" }
+        return Migrator.migrate(
+            old = preference.get(),
+            new = BuildConfig.VERSION_CODE,
+            migrations = migrations,
+            onMigrationComplete = {
+                logcat { "Updating last version to ${BuildConfig.VERSION_CODE}" }
+                preference.set(BuildConfig.VERSION_CODE)
+            },
+        )
+    }
+
     /**
      * Sets custom splash screen exit animation on devices prior to Android 12.
      *

app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt

@@ -26,6 +26,7 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.ui.updates.UpdatesScreenModel.Event
 import kotlinx.coroutines.flow.collectLatest
+import mihon.feature.upcoming.UpcomingScreen
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
@@ -72,9 +73,7 @@ object UpdatesTab : Tab {
                 val intent = ReaderActivity.newIntent(context, it.update.mangaId, it.update.chapterId)
                 context.startActivity(intent)
             },
-            onCalendarClicked = {
-                navigator.push(UpdateUpcomingScreen())
-            },
+            onCalendarClicked = { navigator.push(UpcomingScreen()) },
         )
 
         val onDismissDialog = { screenModel.setDialog(null) }

app/src/main/java/mihon/core/migration/Migration.kt

@@ -0,0 +1,19 @@
+package mihon.core.migration
+
+interface Migration {
+    val version: Float
+
+    suspend operator fun invoke(migrationContext: MigrationContext): Boolean
+
+    companion object {
+        const val ALWAYS = -1f
+
+        fun of(version: Float, action: suspend (MigrationContext) -> Boolean): Migration = object : Migration {
+            override val version: Float = version
+
+            override suspend operator fun invoke(migrationContext: MigrationContext): Boolean {
+                return action(migrationContext)
+            }
+        }
+    }
+}

app/src/main/java/mihon/core/migration/MigrationContext.kt

@@ -0,0 +1,10 @@
+package mihon.core.migration
+
+import uy.kohesive.injekt.Injekt
+
+class MigrationContext {
+
+    inline fun <reified T> get(): T? {
+        return Injekt.getInstanceOrNull(T::class.java)
+    }
+}

app/src/main/java/mihon/core/migration/Migrator.kt

@@ -0,0 +1,53 @@
+package mihon.core.migration
+
+import kotlinx.coroutines.runBlocking
+import tachiyomi.core.common.util.system.logcat
+
+object Migrator {
+
+    @SuppressWarnings("ReturnCount")
+    fun migrate(
+        old: Int,
+        new: Int,
+        migrations: List<Migration>,
+        dryrun: Boolean = false,
+        onMigrationComplete: () -> Unit
+    ): Boolean {
+        val migrationContext = MigrationContext()
+
+        if (old == 0) {
+            return migrationContext.migrate(
+                migrations = migrations.filter { it.isAlways() },
+                dryrun = dryrun
+            )
+                .also { onMigrationComplete() }
+        }
+
+        if (old >= new) {
+            return false
+        }
+
+        return migrationContext.migrate(
+            migrations = migrations.filter { it.isAlways() || it.version.toInt() in (old + 1)..new },
+            dryrun = dryrun
+        )
+            .also { onMigrationComplete() }
+    }
+
+    private fun Migration.isAlways() = version == Migration.ALWAYS
+
+    @SuppressWarnings("MaxLineLength")
+    private fun MigrationContext.migrate(migrations: List<Migration>, dryrun: Boolean): Boolean {
+        return migrations.sortedBy { it.version }
+            .map { migration ->
+                if (!dryrun) {
+                    logcat { "Running migration: { name = ${migration::class.simpleName}, version = ${migration.version} }" }
+                    runBlocking { migration(this@migrate) }
+                } else {
+                    logcat { "(Dry-run) Running migration: { name = ${migration::class.simpleName}, version = ${migration.version} }" }
+                    true
+                }
+            }
+            .reduce { acc, b -> acc || b }
+    }
+}

app/src/main/java/mihon/core/migration/migrations/Migrations.kt

@@ -0,0 +1,10 @@
+package mihon.core.migration.migrations
+
+import mihon.core.migration.Migration
+
+val migrations: List<Migration>
+    get() = listOf(
+        SetupBackupCreateMigration(),
+        SetupLibraryUpdateMigration(),
+        TrustExtensionRepositoryMigration(),
+    )

app/src/main/java/mihon/core/migration/migrations/SetupBackupCreateMigration.kt

@@ -0,0 +1,16 @@
+package mihon.core.migration.migrations
+
+import eu.kanade.tachiyomi.App
+import eu.kanade.tachiyomi.data.backup.create.BackupCreateJob
+import mihon.core.migration.Migration
+import mihon.core.migration.MigrationContext
+
+class SetupBackupCreateMigration : Migration {
+    override val version: Float = Migration.ALWAYS
+
+    override suspend fun invoke(migrationContext: MigrationContext): Boolean {
+        val context = migrationContext.get<App>() ?: return false
+        BackupCreateJob.setupTask(context)
+        return true
+    }
+}

app/src/main/java/mihon/core/migration/migrations/SetupLibraryUpdateMigration.kt

@@ -0,0 +1,16 @@
+package mihon.core.migration.migrations
+
+import eu.kanade.tachiyomi.App
+import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
+import mihon.core.migration.Migration
+import mihon.core.migration.MigrationContext
+
+class SetupLibraryUpdateMigration : Migration {
+    override val version: Float = Migration.ALWAYS
+
+    override suspend fun invoke(migrationContext: MigrationContext): Boolean {
+        val context = migrationContext.get<App>() ?: return false
+        LibraryUpdateJob.setupTask(context)
+        return true
+    }
+}

app/src/main/java/mihon/core/migration/migrations/TrustExtensionRepositoryMigration.kt

@@ -0,0 +1,35 @@
+package mihon.core.migration.migrations
+
+import eu.kanade.domain.source.service.SourcePreferences
+import logcat.LogPriority
+import mihon.core.migration.Migration
+import mihon.core.migration.MigrationContext
+import mihon.domain.extensionrepo.exception.SaveExtensionRepoException
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+import tachiyomi.core.common.util.lang.withIOContext
+import tachiyomi.core.common.util.system.logcat
+
+class TrustExtensionRepositoryMigration : Migration {
+    override val version: Float = 7f
+
+    override suspend fun invoke(migrationContext: MigrationContext): Boolean = withIOContext {
+        val sourcePreferences = migrationContext.get<SourcePreferences>() ?: return@withIOContext false
+        val extensionRepositoryRepository =
+            migrationContext.get<ExtensionRepoRepository>() ?: return@withIOContext false
+        for ((index, source) in sourcePreferences.extensionRepos().get().withIndex()) {
+            try {
+                extensionRepositoryRepository.upsertRepo(
+                    source,
+                    "Repo #${index + 1}",
+                    null,
+                    source,
+                    "NOFINGERPRINT-${index + 1}",
+                )
+            } catch (e: SaveExtensionRepoException) {
+                logcat(LogPriority.ERROR, e) { "Error Migrating Extension Repo with baseUrl: $source" }
+            }
+        }
+        sourcePreferences.extensionRepos().delete()
+        return@withIOContext true
+    }
+}

app/src/main/java/mihon/feature/upcoming/UpcomingScreen.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.updates
+package mihon.feature.upcoming
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -6,20 +6,19 @@ import androidx.compose.runtime.getValue
 import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
-import eu.kanade.presentation.updates.UpdateUpcomingScreen
 import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.ui.manga.MangaScreen
 
-class UpdateUpcomingScreen : Screen() {
+class UpcomingScreen : Screen() {
 
     @Composable
     override fun Content() {
         val navigator = LocalNavigator.currentOrThrow
 
-        val screenModel = rememberScreenModel { UpdateUpcomingScreenModel() }
+        val screenModel = rememberScreenModel { UpcomingScreenModel() }
         val state by screenModel.state.collectAsState()
 
-        UpdateUpcomingScreen(
+        UpcomingScreenContent(
             state = state,
             onClickUpcoming = { navigator.push(MangaScreen(it.id)) },
         )

app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt

@@ -1,4 +1,4 @@
-package eu.kanade.presentation.updates
+package mihon.feature.upcoming
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -25,13 +25,13 @@ import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.presentation.components.UpIcon
 import eu.kanade.presentation.components.relativeDateText
-import eu.kanade.presentation.updates.components.calendar.Calendar
 import eu.kanade.presentation.util.isTabletUi
-import eu.kanade.tachiyomi.ui.updates.UpdateUpcomingScreenModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.launch
+import mihon.feature.upcoming.components.UpcomingItem
+import mihon.feature.upcoming.components.calendar.Calendar
 import tachiyomi.core.common.Constants
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.i18n.MR
@@ -43,23 +43,23 @@ import tachiyomi.presentation.core.i18n.stringResource
 import java.time.LocalDate
 
 @Composable
-fun UpdateUpcomingScreen(
+fun UpcomingScreenContent(
     onClickUpcoming: (manga: Manga) -> Unit,
-    state: UpdateUpcomingScreenModel.State,
+    state: UpcomingScreenModel.State,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
-        topBar = { UpdateUpcomingToolbar() },
+        topBar = { UpcomingToolbar() },
         modifier = modifier,
     ) { paddingValues ->
         if (isTabletUi()) {
-            UpdateUpcomingScreenLargeImpl(
+            UpcomingScreenLargeImpl(
                 onClickUpcoming = onClickUpcoming,
                 paddingValues = paddingValues,
                 state = state,
             )
         } else {
-            UpdateUpcomingScreenSmallImpl(
+            UpcomingScreenSmallImpl(
                 onClickUpcoming = onClickUpcoming,
                 paddingValues = paddingValues,
                 state = state,
@@ -69,21 +69,7 @@ fun UpdateUpcomingScreen(
 }
 
 @Composable
-internal fun UpdateUpcomingScreenSmallImpl(
-    onClickUpcoming: (manga: Manga) -> Unit,
-    state: UpdateUpcomingScreenModel.State,
-    paddingValues: PaddingValues,
-) {
-    UpdateUpcomingSmallContent(
-        upcoming = state.items,
-        events = state.events,
-        contentPadding = paddingValues,
-        onClickUpcoming = onClickUpcoming,
-    )
-}
-
-@Composable
-internal fun UpdateUpcomingToolbar(
+internal fun UpcomingToolbar(
     modifier: Modifier = Modifier,
 ) {
     val navigator = LocalNavigator.currentOrThrow
@@ -111,7 +97,21 @@ internal fun UpdateUpcomingToolbar(
 }
 
 @Composable
-internal fun UpdateUpcomingSmallContent(
+internal fun UpcomingScreenSmallImpl(
+    onClickUpcoming: (manga: Manga) -> Unit,
+    state: UpcomingScreenModel.State,
+    paddingValues: PaddingValues,
+) {
+    UpcomingSmallContent(
+        upcoming = state.items,
+        events = state.events,
+        contentPadding = paddingValues,
+        onClickUpcoming = onClickUpcoming,
+    )
+}
+
+@Composable
+internal fun UpcomingSmallContent(
     contentPadding: PaddingValues,
     onClickUpcoming: (manga: Manga) -> Unit,
     upcoming: ImmutableList<UpcomingUIModel>,
@@ -176,10 +176,10 @@ internal fun UpdateUpcomingSmallContent(
 }
 
 @Composable
-internal fun UpdateUpcomingScreenLargeImpl(
+internal fun UpcomingScreenLargeImpl(
     onClickUpcoming: (manga: Manga) -> Unit,
     paddingValues: PaddingValues,
-    state: UpdateUpcomingScreenModel.State,
+    state: UpcomingScreenModel.State,
 ) {
     val layoutDirection = LocalLayoutDirection.current
     val listState = rememberLazyListState()
@@ -190,7 +190,7 @@ internal fun UpdateUpcomingScreenLargeImpl(
             end = paddingValues.calculateEndPadding(layoutDirection),
         ),
         startContent = {
-            UpdateUpcomingLargeCalendar(
+            UpcomingLargeCalendar(
                 upcoming = state.items,
                 listState = listState,
                 events = state.events,
@@ -198,7 +198,7 @@ internal fun UpdateUpcomingScreenLargeImpl(
             )
         },
         endContent = {
-            UpdateUpcomingLargeContent(
+            UpcomingLargeContent(
                 upcoming = state.items,
                 listState = listState,
                 contentPadding = paddingValues,
@@ -209,7 +209,7 @@ internal fun UpdateUpcomingScreenLargeImpl(
 }
 
 @Composable
-internal fun UpdateUpcomingLargeCalendar(
+internal fun UpcomingLargeCalendar(
     upcoming: ImmutableList<UpcomingUIModel>,
     listState: LazyListState,
     modifier: Modifier = Modifier,
@@ -237,7 +237,7 @@ internal fun UpdateUpcomingLargeCalendar(
 }
 
 @Composable
-internal fun UpdateUpcomingLargeContent(
+internal fun UpcomingLargeContent(
     upcoming: ImmutableList<UpcomingUIModel>,
     listState: LazyListState,
     contentPadding: PaddingValues,

app/src/main/java/mihon/feature/upcoming/UpcomingScreenModel.kt

@@ -1,9 +1,8 @@
-package eu.kanade.tachiyomi.ui.updates
+package mihon.feature.upcoming
 
 import cafe.adriel.voyager.core.model.StateScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import eu.kanade.core.util.insertSeparators
-import eu.kanade.presentation.updates.UpcomingUIModel
 import eu.kanade.tachiyomi.util.lang.toLocalDate
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
@@ -14,15 +13,15 @@ import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import tachiyomi.domain.manga.interactor.GetUpcomingManga
+import mihon.domain.manga.interactor.GetUpcomingManga
 import tachiyomi.domain.manga.model.Manga
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.time.LocalDate
 
-class UpdateUpcomingScreenModel(
+class UpcomingScreenModel(
     private val getUpcomingManga: GetUpcomingManga = Injekt.get(),
-) : StateScreenModel<UpdateUpcomingScreenModel.State>(State()) {
+) : StateScreenModel<UpcomingScreenModel.State>(State()) {
 
     init {
         screenModelScope.launch {

app/src/main/java/mihon/feature/upcoming/components/UpcomingItem.kt

@@ -1,4 +1,4 @@
-package eu.kanade.presentation.updates
+package mihon.feature.upcoming.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row

app/src/main/java/mihon/feature/upcoming/components/calendar/Calendar.kt

@@ -1,4 +1,4 @@
-package eu.kanade.presentation.updates.components.calendar
+package mihon.feature.upcoming.components.calendar
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row

app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarDay.kt

@@ -1,4 +1,4 @@
-package eu.kanade.presentation.updates.components.calendar
+package mihon.feature.upcoming.components.calendar
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background

app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarHeader.kt

@@ -1,4 +1,4 @@
-package eu.kanade.presentation.updates.components.calendar
+package mihon.feature.upcoming.components.calendar
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope

app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarIndicator.kt

@@ -1,4 +1,4 @@
-package eu.kanade.presentation.updates.components.calendar
+package mihon.feature.upcoming.components.calendar
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

app/src/test/java/mihon/core/migration/MigratorTest.kt

@@ -0,0 +1,96 @@
+package mihon.core.migration
+
+import io.mockk.Called
+import io.mockk.spyk
+import io.mockk.verify
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class MigratorTest {
+
+    @Test
+    fun initialVersion() {
+        val onMigrationComplete: () -> Unit = {}
+        val onMigrationCompleteSpy = spyk(onMigrationComplete)
+        val didMigration = Migrator.migrate(
+            old = 0,
+            new = 1,
+            migrations = listOf(Migration.of(Migration.ALWAYS) { true }, Migration.of(2f) { false }),
+            onMigrationComplete = onMigrationCompleteSpy
+        )
+        verify { onMigrationCompleteSpy() }
+        Assertions.assertTrue(didMigration)
+    }
+
+    @Test
+    fun sameVersion() {
+        val onMigrationComplete: () -> Unit = {}
+        val onMigrationCompleteSpy = spyk(onMigrationComplete)
+        val didMigration = Migrator.migrate(
+            old = 1,
+            new = 1,
+            migrations = listOf(Migration.of(Migration.ALWAYS) { true }, Migration.of(2f) { true }),
+            onMigrationComplete = onMigrationCompleteSpy
+        )
+        verify { onMigrationCompleteSpy wasNot Called }
+        Assertions.assertFalse(didMigration)
+    }
+
+    @Test
+    fun smallMigration() {
+        val onMigrationComplete: () -> Unit = {}
+        val onMigrationCompleteSpy = spyk(onMigrationComplete)
+        val didMigration = Migrator.migrate(
+            old = 1,
+            new = 2,
+            migrations = listOf(Migration.of(Migration.ALWAYS) { true }, Migration.of(2f) { true }),
+            onMigrationComplete = onMigrationCompleteSpy
+        )
+        verify { onMigrationCompleteSpy() }
+        Assertions.assertTrue(didMigration)
+    }
+
+    @Test
+    fun largeMigration() {
+        val onMigrationComplete: () -> Unit = {}
+        val onMigrationCompleteSpy = spyk(onMigrationComplete)
+        val input = listOf(
+            Migration.of(Migration.ALWAYS) { true },
+            Migration.of(2f) { true },
+            Migration.of(3f) { true },
+            Migration.of(4f) { true },
+            Migration.of(5f) { true },
+            Migration.of(6f) { true },
+            Migration.of(7f) { true },
+            Migration.of(8f) { true },
+            Migration.of(9f) { true },
+            Migration.of(10f) { true },
+        )
+        val didMigration = Migrator.migrate(
+            old = 1,
+            new = 10,
+            migrations = input,
+            onMigrationComplete = onMigrationCompleteSpy
+        )
+        verify { onMigrationCompleteSpy() }
+        Assertions.assertTrue(didMigration)
+    }
+
+    @Test
+    fun withinRangeMigration() {
+        val onMigrationComplete: () -> Unit = {}
+        val onMigrationCompleteSpy = spyk(onMigrationComplete)
+        val didMigration = Migrator.migrate(
+            old = 1,
+            new = 2,
+            migrations = listOf(
+                Migration.of(Migration.ALWAYS) { true },
+                Migration.of(2f) { true },
+                Migration.of(3f) { false }
+            ),
+            onMigrationComplete = onMigrationCompleteSpy
+        )
+        verify { onMigrationCompleteSpy() }
+        Assertions.assertTrue(didMigration)
+    }
+}

data/src/main/java/mihon/data/repository/ExtensionRepoRepositoryImpl.kt

@@ -0,0 +1,93 @@
+package mihon.data.repository
+
+import android.database.sqlite.SQLiteException
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import mihon.domain.extensionrepo.exception.SaveExtensionRepoException
+import mihon.domain.extensionrepo.model.ExtensionRepo
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+import tachiyomi.data.DatabaseHandler
+
+class ExtensionRepoRepositoryImpl(
+    private val handler: DatabaseHandler,
+) : ExtensionRepoRepository {
+    override fun subscribeAll(): Flow<List<ExtensionRepo>> {
+        return handler.subscribeToList { extension_reposQueries.findAll(::mapExtensionRepo) }
+    }
+
+    override suspend fun getAll(): List<ExtensionRepo> {
+        return handler.awaitList { extension_reposQueries.findAll(::mapExtensionRepo) }
+    }
+
+    override suspend fun getRepo(baseUrl: String): ExtensionRepo? {
+        return handler.awaitOneOrNull { extension_reposQueries.findOne(baseUrl, ::mapExtensionRepo) }
+    }
+
+    override suspend fun getRepoBySigningKeyFingerprint(fingerprint: String): ExtensionRepo? {
+        return handler.awaitOneOrNull {
+            extension_reposQueries.findOneBySigningKeyFingerprint(fingerprint, ::mapExtensionRepo)
+        }
+    }
+
+    override fun getCount(): Flow<Int> {
+        return handler.subscribeToOne { extension_reposQueries.count() }.map { it.toInt() }
+    }
+
+    override suspend fun insertRepo(
+        baseUrl: String,
+        name: String,
+        shortName: String?,
+        website: String,
+        signingKeyFingerprint: String,
+    ) {
+        try {
+            handler.await { extension_reposQueries.insert(baseUrl, name, shortName, website, signingKeyFingerprint) }
+        } catch (ex: SQLiteException) {
+            throw SaveExtensionRepoException(ex)
+        }
+    }
+
+    override suspend fun upsertRepo(
+        baseUrl: String,
+        name: String,
+        shortName: String?,
+        website: String,
+        signingKeyFingerprint: String,
+    ) {
+        try {
+            handler.await { extension_reposQueries.upsert(baseUrl, name, shortName, website, signingKeyFingerprint) }
+        } catch (ex: SQLiteException) {
+            throw SaveExtensionRepoException(ex)
+        }
+    }
+
+    override suspend fun replaceRepo(newRepo: ExtensionRepo) {
+        handler.await {
+            extension_reposQueries.replace(
+                newRepo.baseUrl,
+                newRepo.name,
+                newRepo.shortName,
+                newRepo.website,
+                newRepo.signingKeyFingerprint,
+            )
+        }
+    }
+
+    override suspend fun deleteRepo(baseUrl: String) {
+        return handler.await { extension_reposQueries.delete(baseUrl) }
+    }
+
+    private fun mapExtensionRepo(
+        baseUrl: String,
+        name: String,
+        shortName: String?,
+        website: String,
+        signingKeyFingerprint: String,
+    ): ExtensionRepo = ExtensionRepo(
+        baseUrl = baseUrl,
+        name = name,
+        shortName = shortName,
+        website = website,
+        signingKeyFingerprint = signingKeyFingerprint,
+    )
+}

data/src/main/sqldelight/tachiyomi/data/extension_repos.sq

@@ -0,0 +1,57 @@
+CREATE TABLE extension_repos (
+    base_url TEXT NOT NULL PRIMARY KEY,
+    name TEXT NOT NULL,
+    short_name TEXT,
+    website TEXT NOT NULL,
+    signing_key_fingerprint TEXT UNIQUE NOT NULL
+);
+
+findOne:
+SELECT *
+FROM extension_repos
+WHERE base_url = :base_url;
+
+findOneBySigningKeyFingerprint:
+SELECT *
+FROM extension_repos
+WHERE signing_key_fingerprint = :fingerprint;
+
+findAll:
+SELECT *
+FROM extension_repos;
+
+count:
+SELECT COUNT(*)
+FROM extension_repos;
+
+insert:
+INSERT INTO extension_repos(base_url, name, short_name, website, signing_key_fingerprint)
+VALUES (:base_url, :name, :short_name, :website, :fingerprint);
+
+upsert:
+INSERT INTO extension_repos(base_url, name, short_name, website, signing_key_fingerprint)
+VALUES (:base_url, :name, :short_name, :website, :fingerprint)
+ON CONFLICT(base_url)
+DO UPDATE
+SET
+    name = :name,
+    short_name = :short_name,
+    website =: website,
+    signing_key_fingerprint = :fingerprint
+WHERE base_url = base_url;
+
+replace:
+INSERT INTO extension_repos(base_url, name, short_name, website, signing_key_fingerprint)
+VALUES (:base_url, :name, :short_name, :website, :fingerprint)
+ON CONFLICT(signing_key_fingerprint)
+DO UPDATE
+SET
+    base_url = :base_url,
+    name = :name,
+    short_name = :short_name,
+    website =: website
+WHERE signing_key_fingerprint = signing_key_fingerprint;
+
+delete:
+DELETE FROM extension_repos
+WHERE base_url = :base_url;

data/src/main/sqldelight/tachiyomi/migrations/3.sqm

@@ -0,0 +1,8 @@
+-- Create ExtensionRepo table --
+CREATE TABLE extension_repos (
+    base_url TEXT NOT NULL PRIMARY KEY,
+    name TEXT NOT NULL,
+    short_name TEXT,
+    website TEXT NOT NULL,
+    signing_key_fingerprint TEXT UNIQUE NOT NULL
+);

domain/build.gradle.kts

@@ -33,6 +33,7 @@ tasks {
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions.freeCompilerArgs += listOf(
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xcontext-receivers",
         )
     }
 }

domain/src/main/java/mihon/domain/extensionrepo/exception/SaveExtensionRepoException.kt

@@ -0,0 +1,10 @@
+package mihon.domain.extensionrepo.exception
+
+import java.io.IOException
+
+/**
+ * Exception to abstract over SQLiteException and SQLiteConstraintException for multiplatform.
+ *
+ * @param throwable the source throwable to include for tracing.
+ */
+class SaveExtensionRepoException(throwable: Throwable) : IOException("Error Saving Repository to Database", throwable)

domain/src/main/java/mihon/domain/extensionrepo/interactor/CreateExtensionRepo.kt

@@ -0,0 +1,71 @@
+package mihon.domain.extensionrepo.interactor
+
+import logcat.LogPriority
+import mihon.domain.extensionrepo.exception.SaveExtensionRepoException
+import mihon.domain.extensionrepo.model.ExtensionRepo
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+import mihon.domain.extensionrepo.service.ExtensionRepoService
+import tachiyomi.core.common.util.system.logcat
+
+class CreateExtensionRepo(
+    private val repository: ExtensionRepoRepository,
+    private val service: ExtensionRepoService,
+) {
+    private val repoRegex = """^https://.*/index\.min\.json$""".toRegex()
+
+    suspend fun await(repoUrl: String): Result {
+        if (!repoUrl.matches(repoRegex)) {
+            return Result.InvalidUrl
+        }
+
+        val baseUrl = repoUrl.removeSuffix("/index.min.json")
+        return service.fetchRepoDetails(baseUrl)?.let { insert(it) } ?: Result.InvalidUrl
+    }
+
+    private suspend fun insert(repo: ExtensionRepo): Result {
+        return try {
+            repository.insertRepo(
+                repo.baseUrl,
+                repo.name,
+                repo.shortName,
+                repo.website,
+                repo.signingKeyFingerprint,
+            )
+            Result.Success
+        } catch (e: SaveExtensionRepoException) {
+            logcat(LogPriority.WARN, e) { "SQL Conflict attempting to add new repository ${repo.baseUrl}" }
+            return handleInsertionError(repo)
+        }
+    }
+
+    /**
+     * Error Handler for insert when there are trying to create new repositories
+     *
+     * SaveExtensionRepoException doesn't provide constraint info in exceptions.
+     * First check if the conflict was on primary key. if so return RepoAlreadyExists
+     * Then check if the conflict was on fingerprint. if so Return DuplicateFingerprint
+     * If neither are found, there was some other Error, and return Result.Error
+     *
+     * @param repo Extension Repo holder for passing to DB/Error Dialog
+     */
+    @Suppress("ReturnCount")
+    private suspend fun handleInsertionError(repo: ExtensionRepo): Result {
+        val repoExists = repository.getRepo(repo.baseUrl)
+        if (repoExists != null) {
+            return Result.RepoAlreadyExists
+        }
+        val matchingFingerprintRepo = repository.getRepoBySigningKeyFingerprint(repo.signingKeyFingerprint)
+        if (matchingFingerprintRepo != null) {
+            return Result.DuplicateFingerprint(matchingFingerprintRepo, repo)
+        }
+        return Result.Error
+    }
+
+    sealed interface Result {
+        data class DuplicateFingerprint(val oldRepo: ExtensionRepo, val newRepo: ExtensionRepo) : Result
+        data object InvalidUrl : Result
+        data object RepoAlreadyExists : Result
+        data object Success : Result
+        data object Error : Result
+    }
+}

domain/src/main/java/mihon/domain/extensionrepo/interactor/DeleteExtensionRepo.kt

@@ -0,0 +1,11 @@
+package mihon.domain.extensionrepo.interactor
+
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+
+class DeleteExtensionRepo(
+    private val repository: ExtensionRepoRepository,
+) {
+    suspend fun await(baseUrl: String) {
+        repository.deleteRepo(baseUrl)
+    }
+}

domain/src/main/java/mihon/domain/extensionrepo/interactor/GetExtensionRepo.kt

@@ -0,0 +1,13 @@
+package mihon.domain.extensionrepo.interactor
+
+import kotlinx.coroutines.flow.Flow
+import mihon.domain.extensionrepo.model.ExtensionRepo
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+
+class GetExtensionRepo(
+    private val repository: ExtensionRepoRepository,
+) {
+    fun subscribeAll(): Flow<List<ExtensionRepo>> = repository.subscribeAll()
+
+    suspend fun getAll(): List<ExtensionRepo> = repository.getAll()
+}

domain/src/main/java/mihon/domain/extensionrepo/interactor/GetExtensionRepoCount.kt

@@ -0,0 +1,9 @@
+package mihon.domain.extensionrepo.interactor
+
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+
+class GetExtensionRepoCount(
+    private val repository: ExtensionRepoRepository,
+) {
+    fun subscribe() = repository.getCount()
+}

domain/src/main/java/mihon/domain/extensionrepo/interactor/ReplaceExtensionRepo.kt

@@ -0,0 +1,12 @@
+package mihon.domain.extensionrepo.interactor
+
+import mihon.domain.extensionrepo.model.ExtensionRepo
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+
+class ReplaceExtensionRepo(
+    private val repository: ExtensionRepoRepository,
+) {
+    suspend fun await(repo: ExtensionRepo) {
+        repository.replaceRepo(repo)
+    }
+}

domain/src/main/java/mihon/domain/extensionrepo/interactor/UpdateExtensionRepo.kt

@@ -0,0 +1,30 @@
+package mihon.domain.extensionrepo.interactor
+
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import mihon.domain.extensionrepo.model.ExtensionRepo
+import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
+import mihon.domain.extensionrepo.service.ExtensionRepoService
+
+class UpdateExtensionRepo(
+    private val repository: ExtensionRepoRepository,
+    private val service: ExtensionRepoService,
+) {
+
+    suspend fun awaitAll() = coroutineScope {
+        repository.getAll()
+            .map { async { await(it) } }
+            .awaitAll()
+    }
+
+    suspend fun await(repo: ExtensionRepo) {
+        val newRepo = service.fetchRepoDetails(repo.baseUrl) ?: return
+        if (
+            repo.signingKeyFingerprint.startsWith("NOFINGERPRINT") ||
+            repo.signingKeyFingerprint == newRepo.signingKeyFingerprint
+        ) {
+            repository.upsertRepo(newRepo)
+        }
+    }
+}

domain/src/main/java/mihon/domain/extensionrepo/model/ExtensionRepo.kt

@@ -0,0 +1,9 @@
+package mihon.domain.extensionrepo.model
+
+data class ExtensionRepo(
+    val baseUrl: String,
+    val name: String,
+    val shortName: String?,
+    val website: String,
+    val signingKeyFingerprint: String,
+)

domain/src/main/java/mihon/domain/extensionrepo/repository/ExtensionRepoRepository.kt

@@ -0,0 +1,47 @@
+package mihon.domain.extensionrepo.repository
+
+import kotlinx.coroutines.flow.Flow
+import mihon.domain.extensionrepo.model.ExtensionRepo
+
+interface ExtensionRepoRepository {
+
+    fun subscribeAll(): Flow<List<ExtensionRepo>>
+
+    suspend fun getAll(): List<ExtensionRepo>
+
+    suspend fun getRepo(baseUrl: String): ExtensionRepo?
+
+    suspend fun getRepoBySigningKeyFingerprint(fingerprint: String): ExtensionRepo?
+
+    fun getCount(): Flow<Int>
+
+    suspend fun insertRepo(
+        baseUrl: String,
+        name: String,
+        shortName: String?,
+        website: String,
+        signingKeyFingerprint: String,
+    )
+
+    suspend fun upsertRepo(
+        baseUrl: String,
+        name: String,
+        shortName: String?,
+        website: String,
+        signingKeyFingerprint: String,
+    )
+
+    suspend fun upsertRepo(repo: ExtensionRepo) {
+        upsertRepo(
+            baseUrl = repo.baseUrl,
+            name = repo.name,
+            shortName = repo.shortName,
+            website = repo.website,
+            signingKeyFingerprint = repo.signingKeyFingerprint,
+        )
+    }
+
+    suspend fun replaceRepo(newRepo: ExtensionRepo)
+
+    suspend fun deleteRepo(baseUrl: String)
+}

domain/src/main/java/mihon/domain/extensionrepo/service/ExtensionRepoDto.kt

@@ -0,0 +1,27 @@
+package mihon.domain.extensionrepo.service
+
+import kotlinx.serialization.Serializable
+import mihon.domain.extensionrepo.model.ExtensionRepo
+
+@Serializable
+data class ExtensionRepoMetaDto(
+    val meta: ExtensionRepoDto,
+)
+
+@Serializable
+data class ExtensionRepoDto(
+    val name: String,
+    val shortName: String?,
+    val website: String,
+    val signingKeyFingerprint: String,
+)
+
+fun ExtensionRepoMetaDto.toExtensionRepo(baseUrl: String): ExtensionRepo {
+    return ExtensionRepo(
+        baseUrl = baseUrl,
+        name = meta.name,
+        shortName = meta.shortName,
+        website = meta.website,
+        signingKeyFingerprint = meta.signingKeyFingerprint,
+    )
+}

domain/src/main/java/mihon/domain/extensionrepo/service/ExtensionRepoService.kt

@@ -0,0 +1,40 @@
+package mihon.domain.extensionrepo.service
+
+import androidx.core.net.toUri
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.network.parseAs
+import kotlinx.serialization.json.Json
+import logcat.LogPriority
+import mihon.domain.extensionrepo.model.ExtensionRepo
+import tachiyomi.core.common.util.lang.withIOContext
+import tachiyomi.core.common.util.system.logcat
+
+class ExtensionRepoService(
+    networkHelper: NetworkHelper,
+    private val json: Json,
+) {
+    val client = networkHelper.client
+
+    @Suppress("TooGenericExceptionCaught")
+    suspend fun fetchRepoDetails(
+        repo: String,
+    ): ExtensionRepo? {
+        return withIOContext {
+            val url = "$repo/repo.json".toUri()
+
+            try {
+                with(json) {
+                    client.newCall(GET(url.toString()))
+                        .awaitSuccess()
+                        .parseAs<ExtensionRepoMetaDto>()
+                        .toExtensionRepo(baseUrl = repo)
+                }
+            } catch (e: Exception) {
+                logcat(LogPriority.ERROR, e) { "Failed to fetch repo details" }
+                null
+            }
+        }
+    }
+}

domain/src/main/java/mihon/domain/manga/interactor/GetUpcomingManga.kt

@@ -1,4 +1,4 @@
-package tachiyomi.domain.manga.interactor
+package mihon.domain.manga.interactor
 
 import eu.kanade.tachiyomi.source.model.SManga
 import kotlinx.coroutines.flow.Flow

gradle/compose.versions.toml

@@ -23,5 +23,4 @@ material-core = { module = "androidx.compose.material:material" }
 
 glance = "androidx.glance:glance-appwidget:1.0.0"
 
-accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" }
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }

gradle/libs.versions.toml

@@ -63,6 +63,7 @@ photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0"
 insetter = "dev.chrisbanes.insetter:insetter:0.6.1"
 compose-materialmotion = "io.github.fornewid:material-motion-compose-core:1.2.0"
+compose-webview = "io.github.kevinnzou:compose-webview:0.33.4"
 
 swipe = "me.saket.swipe:swipe:1.3.0"
 

i18n/src/commonMain/resources/MR/base/strings.xml

@@ -348,6 +348,9 @@
     <string name="invalid_repo_name">Invalid repo URL</string>
     <string name="delete_repo_confirmation">Do you wish to delete the repo \"%s\"?</string>
     <string name="action_open_repo">Open source repo</string>
+    <string name="action_replace_repo">Replace</string>
+    <string name="action_replace_repo_title">Signing Key Fingerprint Already Exists</string>
+    <string name="action_replace_repo_message">Repository %1$s has the same Signing Key Fingerprint as %2$s.\nIf this is expected, %2$s will be replaced, otherwise contact your repo maintainer.</string>
 
       <!-- Reader section -->
     <string name="pref_fullscreen">Fullscreen</string>