diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt index 43155100e..78866756d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt @@ -20,7 +20,6 @@ import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.runBlocking import logcat.LogPriority -import mihon.domain.extensionrepo.interactor.CreateExtensionRepo.Companion.KOMIKKU_SIGNATURE import mihon.domain.extensionrepo.interactor.GetExtensionRepo import mihon.domain.extensionrepo.model.ExtensionRepo import tachiyomi.core.common.util.system.logcat @@ -289,11 +288,10 @@ internal object ExtensionLoader { libVersion, signatures.last(), // KMK --> - repoName = when { - isOfficiallySigned(signatures) -> "Komikku" - else -> repos.firstOrNull { repo -> - signatures.all { it == repo.signingKeyFingerprint } - }?.name + repoName = repos.firstOrNull { repo -> + signatures.all { it == repo.signingKeyFingerprint } + }?.let { repo -> + repo.shortName.takeIf { !it.isNullOrBlank() } ?: repo.name }, // KMK <-- ) @@ -360,11 +358,10 @@ internal object ExtensionLoader { isShared = extensionInfo.isShared, // KMK --> signatureHash = signatures.last(), - repoName = when { - isOfficiallySigned(signatures) -> "Komikku" - else -> repos.firstOrNull { repo -> - signatures.all { it == repo.signingKeyFingerprint } - }?.name + repoName = repos.firstOrNull { repo -> + signatures.all { it == repo.signingKeyFingerprint } + }?.let { repo -> + repo.shortName.takeIf { !it.isNullOrBlank() } ?: repo.name }, // KMK <-- ) @@ -424,10 +421,6 @@ internal object ExtensionLoader { ?.toList() } - private fun isOfficiallySigned(signatures: List): Boolean { - return signatures.all { it == KOMIKKU_SIGNATURE } - } - /** * On Android 13+ the ApplicationInfo generated by getPackageArchiveInfo doesn't * have sourceDir which breaks assets loading (used for getting icon here). diff --git a/app/src/main/res/mipmap/komikku.png b/app/src/main/res/mipmap/komikku.png index d4a071ff6..c133139f5 100644 Binary files a/app/src/main/res/mipmap/komikku.png and b/app/src/main/res/mipmap/komikku.png differ