From 1b04ce0ac6fcf37d0a7a3da29163a023c67b95e5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz <58138378+D34DPlayer@users.noreply.github.com> Date: Sun, 5 Dec 2021 17:19:37 +0100 Subject: [PATCH] Add sui support (#6318) * Update shizuku api version * SettingsAdvanced Controller: Verify if Sui is available (cherry picked from commit 0a6160d7cf8a343ebe60ec814c42e3272a015d2e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt --- app/build.gradle.kts | 2 +- .../kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8312a374d..5fcb7e437 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -257,7 +257,7 @@ dependencies { implementation("com.mikepenz:aboutlibraries-core:${BuildPluginsVersion.ABOUTLIB_PLUGIN}") // Shizuku - val shizukuVersion = "12.0.0" + val shizukuVersion = "12.1.0" implementation("dev.rikka.shizuku:api:$shizukuVersion") implementation("dev.rikka.shizuku:provider:$shizukuVersion") diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index e50c7e1b7..1661a4966 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -57,6 +57,7 @@ import exh.source.EH_SOURCE_ID import exh.source.EXH_SOURCE_ID import kotlinx.coroutines.Job import kotlinx.coroutines.flow.launchIn +import rikka.sui.Sui import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy @@ -233,7 +234,7 @@ class SettingsAdvancedController : SettingsController() { onChange { if (it == PreferenceValues.ExtensionInstaller.SHIZUKU.name && - !context.isPackageInstalled("moe.shizuku.privileged.api") + !(context.isPackageInstalled("moe.shizuku.privileged.api") || Sui.isSui()) ) { MaterialAlertDialogBuilder(context) .setTitle(R.string.ext_installer_shizuku)