From 0525c356493fce7a6664050133159edbe3d9db92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Menu?= Date: Tue, 11 Jun 2024 15:37:00 +0200 Subject: [PATCH] Simplification --- .../main/java/org/readium/r2/shared/extensions/String.kt | 6 ------ .../shared/src/main/java/org/readium/r2/shared/util/Url.kt | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/readium/shared/src/main/java/org/readium/r2/shared/extensions/String.kt b/readium/shared/src/main/java/org/readium/r2/shared/extensions/String.kt index 2da0a7c2ec..31304feb7a 100644 --- a/readium/shared/src/main/java/org/readium/r2/shared/extensions/String.kt +++ b/readium/shared/src/main/java/org/readium/r2/shared/extensions/String.kt @@ -57,12 +57,6 @@ internal fun String.toJsonOrNull(): JSONObject? = null } -/** - * Percent-decodes a string. - */ -internal fun String.percentDecoded(): String = - Uri.decode(this) - /** * Percent-encodes an URL path section. * diff --git a/readium/shared/src/main/java/org/readium/r2/shared/util/Url.kt b/readium/shared/src/main/java/org/readium/r2/shared/util/Url.kt index 150d38528f..0e7a255c3b 100644 --- a/readium/shared/src/main/java/org/readium/r2/shared/util/Url.kt +++ b/readium/shared/src/main/java/org/readium/r2/shared/util/Url.kt @@ -18,7 +18,6 @@ import kotlinx.parcelize.Parcelize import org.readium.r2.shared.DelicateReadiumApi import org.readium.r2.shared.InternalReadiumApi import org.readium.r2.shared.extensions.isPrintableAscii -import org.readium.r2.shared.extensions.percentDecoded import org.readium.r2.shared.extensions.percentEncodedPath import org.readium.r2.shared.extensions.tryOrNull @@ -269,7 +268,7 @@ public class AbsoluteUrl private constructor(override val uri: Uri) : Url() { return scheme == other.scheme && uri.authority == other.uri.authority && - path?.percentDecoded() == other.path?.percentDecoded() && + path == other.path && query == other.query && fragment == other.fragment } @@ -304,7 +303,7 @@ public class RelativeUrl private constructor(override val uri: Uri) : Url() { other as RelativeUrl - return path?.percentDecoded() == other.path?.percentDecoded() && + return path == other.path && query == other.query && fragment == other.fragment }