null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Refresh repo actually refresh trust status

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-07 14:05:09 +07:00
parent fb5e581ec5
commit fe859f07c4
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/dev/yokai/domain/extension/interactor/TrustExtension.kt
View file

@ -12,10 +12,14 @@ class TrustExtension(
private val extensionRepoRepository: ExtensionRepoRepository,
private val sourcePreferences: SourcePreferences,
) {
suspend fun isTrusted(pkgInfo: PackageInfo, fingerprints: List<String>): Boolean {
suspend fun isTrustedByRepo(fingerprints: List<String>): Boolean {
val trustedFingerprints = extensionRepoRepository.getAll().map { it.signingKeyFingerprint }.toHashSet()
return trustedFingerprints.any { fingerprints.contains(it) }
}
suspend fun isTrusted(pkgInfo: PackageInfo, fingerprints: List<String>): Boolean {
val key = "${pkgInfo.packageName}:${PackageInfoCompat.getLongVersionCode(pkgInfo)}:${fingerprints.last()}"
return trustedFingerprints.any { fingerprints.contains(it) } || key in sourcePreferences.trustedExtensions().get()
return isTrustedByRepo(fingerprints) || key in sourcePreferences.trustedExtensions().get()
}
fun trust(pkgName: String, versionCode: Long, signatureHash: String) {

4
app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt
View file

@ -13,6 +13,7 @@ import dev.yokai.domain.extension.repo.interactor.ReplaceExtensionRepo
import dev.yokai.domain.extension.repo.interactor.UpdateExtensionRepo
import dev.yokai.domain.extension.repo.model.ExtensionRepo
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.util.system.launchIO
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@ -25,6 +26,8 @@ import uy.kohesive.injekt.injectLazy
class ExtensionRepoViewModel :
ViewModel() {
private val extensionManager: ExtensionManager by injectLazy()
private val getExtensionRepo: GetExtensionRepo by injectLazy()
private val createExtensionRepo: CreateExtensionRepo by injectLazy()
private val deleteExtensionRepo: DeleteExtensionRepo by injectLazy()
@ -41,6 +44,7 @@ class ExtensionRepoViewModel :
viewModelScope.launchIO {
getExtensionRepo.subscribeAll().collectLatest { repos ->
mutableRepoState.update { ExtensionRepoState.Success(repos = repos.toImmutableList()) }
extensionManager.refreshTrust()
}
}
}

12
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
View file

@ -308,6 +308,14 @@ class ExtensionManager(
installer.uninstallApk(pkgName)
}
suspend fun refreshTrust() {
val nowTrustedExtensions = untrustedExtensionsFlow.value
.filter { trustExtension.isTrustedByRepo(listOf(it.signatureHash)) }
_untrustedExtensionsFlow.value -= nowTrustedExtensions
registerNewTrusted(nowTrustedExtensions)
}
/**
* Adds the given extension to the list of trusted extensions. It also loads in background the
* now trusted extensions.
@ -326,6 +334,10 @@ class ExtensionManager(
.filter { it.pkgName == pkgName && it.versionCode == versionCode }
_untrustedExtensionsFlow.value -= nowTrustedExtensions
registerNewTrusted(nowTrustedExtensions)
}
private suspend fun registerNewTrusted(nowTrustedExtensions: List<Extension.Untrusted>) {
launchNow {
nowTrustedExtensions
.map { extension ->