chore: Merge branch dev to main (ReVanced#3201)

E85Addict · May 21, 2024 · b5ad889 · b5ad889
2 parents e5967ad + 4f3100e
commit b5ad889
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [4.8.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.8.0...v4.8.1-dev.1) (2024-05-21)
+
+
+### Bug Fixes
+
+* Use UrlDecoder API available in older Android versions ([d42fbb1](https://github.com/ReVanced/revanced-patches/commit/d42fbb152126cf2177315c4706fb03bc89f5af1c))
+
 # [4.8.0](https://github.com/ReVanced/revanced-patches/compare/v4.7.0...v4.8.0) (2024-05-21)
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.8.0
+version = 4.8.1-dev.1
diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt
@@ -14,7 +14,6 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import java.net.URLDecoder
-import java.nio.charset.StandardCharsets
 import java.util.jar.JarFile
 
 abstract class BaseIntegrationsPatch(
@@ -77,7 +76,8 @@ abstract class BaseIntegrationsPatch(
 
             if (urlString.startsWith("jar:file:")) {
                 val end = urlString.lastIndexOf('!')
-                return URLDecoder.decode(urlString.substring("jar:file:".length, end), StandardCharsets.UTF_8)
+
+                return URLDecoder.decode(urlString.substring("jar:file:".length, end), "UTF-8")
             }
         }
         throw IllegalStateException("Not running from inside a JAR file.")