From 0bdecfe60f7d905c46b50564da901aa445a08736 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Mon, 12 Aug 2024 07:52:14 +0700 Subject: [PATCH] chore: Information about Legacy installer It's currently only there so that backup from upstream won't crash the app --- .../controllers/SettingsAdvancedController.kt | 15 ++++++++++++--- .../commonMain/moko-resources/base/strings.xml | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt index a037a6ee8f..1489ba11ab 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt @@ -67,6 +67,7 @@ import eu.kanade.tachiyomi.util.view.setMessage import eu.kanade.tachiyomi.util.view.setPositiveButton import eu.kanade.tachiyomi.util.view.setTitle import eu.kanade.tachiyomi.util.view.withFadeTransaction +import java.io.File import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers @@ -83,7 +84,6 @@ import yokai.domain.extension.interactor.TrustExtension import yokai.domain.manga.interactor.GetManga import yokai.i18n.MR import yokai.util.lang.getString -import java.io.File import android.R as AR import eu.kanade.tachiyomi.ui.setting.summaryMRes as summaryRes import eu.kanade.tachiyomi.ui.setting.titleMRes as titleRes @@ -338,8 +338,17 @@ class SettingsAdvancedController : SettingsLegacyController() { } infoPreference(MR.strings.ext_installer_summary).apply { basePreferences.extensionInstaller().changesIn(viewScope) { - isVisible = - it != ExtensionInstaller.PACKAGEINSTALLER && Build.VERSION.SDK_INT < Build.VERSION_CODES.S + when (it) { + ExtensionInstaller.SHIZUKU -> { + summary = context.getString(MR.strings.ext_installer_summary) + isVisible = true && Build.VERSION.SDK_INT < Build.VERSION_CODES.S + } + ExtensionInstaller.LEGACY -> { + summary = context.getString(MR.strings.ext_installer_summary_legacy) + isVisible = true + } + else -> isVisible = false + } } } preference { diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml index 6aae802289..e0f0698e8b 100644 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -338,6 +338,7 @@ Default Legacy Allows extensions to be installed without user prompts and enables automatic updates for devices under Android 12 + Legacy installer is not yet implemented, currently falling back to PackageInstaller (Default) Untrusted extension Malicious extensions can read any stored login credentials or execute arbitrary code.\n\nBy trusting this extension you accept these risks. This extension is no longer available.