Simplification

readium · Jun 11, 2024 · 0525c35 · 0525c35
1 parent c1a50e9
commit 0525c35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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
     }