From 0dda64b9d80a47a96fb52d13b5e0ece6d5fca2b1 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Wed, 26 Feb 2025 02:18:45 +0600 Subject: [PATCH] Use `.toUri()` extension function --- .../eu/kanade/presentation/more/onboarding/PermissionStep.kt | 3 ++- .../java/eu/kanade/tachiyomi/data/download/DownloadCache.kt | 3 ++- .../tachiyomi/extension/util/ExtensionInstallReceiver.kt | 3 ++- .../java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt index 98f141788..325fe966e 100644 --- a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt +++ b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt @@ -44,6 +44,7 @@ import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.util.collectAsState import tachiyomi.presentation.core.util.secondaryItemAlpha import uy.kohesive.injekt.injectLazy +import androidx.core.net.toUri internal class PermissionStep : OnboardingStep { @@ -112,7 +113,7 @@ internal class PermissionStep : OnboardingStep { onButtonClick = { @SuppressLint("BatteryLife") val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply { - data = Uri.parse("package:${context.packageName}") + data = "package:${context.packageName}".toUri() } context.startActivity(intent) }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt index 532b7d243..968c7a5a3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt @@ -54,6 +54,7 @@ import uy.kohesive.injekt.api.get import java.io.File import kotlin.time.Duration.Companion.hours import kotlin.time.Duration.Companion.seconds +import androidx.core.net.toUri /** * Cache where we dump the downloads directory from the filesystem. This class is needed because @@ -454,7 +455,7 @@ private object UniFileAsStringSerializer : KSerializer { override fun deserialize(decoder: Decoder): UniFile? { return if (decoder.decodeNotNullMark()) { - UniFile.fromUri(Injekt.get(), Uri.parse(decoder.decodeString())) + UniFile.fromUri(Injekt.get(), decoder.decodeString().toUri()) } else { decoder.decodeNull() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt index a0ccb23fb..5ba064396 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt @@ -14,6 +14,7 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.core.common.util.system.logcat +import androidx.core.net.toUri /** * Broadcast receiver that listens for the system's packages installed, updated or removed, and only @@ -138,7 +139,7 @@ internal class ExtensionInstallReceiver(private val listener: Listener) : Broadc private fun notify(context: Context, pkgName: String, action: String) { Intent(action).apply { - data = Uri.parse("package:$pkgName") + data = "package:$pkgName".toUri() `package` = context.packageName context.sendBroadcast(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index f4367dcfc..83b8b8325 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -158,7 +158,7 @@ val Context.isShizukuInstalled get() = isPackageInstalled("moe.shizuku.privilege fun Context.launchRequestPackageInstallsPermission() { Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply { - data = Uri.parse("package:$packageName") + data = "package:$packageName".toUri() startActivity(this) } }