chore: Merge branch dev to main (#314)

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [20.0.2-dev.1](https:/ReVanced/revanced-patcher/compare/v20.0.1...v20.0.2-dev.1) (2024-10-15)
+
+
+### Bug Fixes
+
+* Make it work on Android 12 and lower by using existing APIs ([#312](https:/ReVanced/revanced-patcher/issues/312)) ([a44802e](https:/ReVanced/revanced-patcher/commit/a44802ef4ebf59ae47213854ba761c81dadc51f3))
+
 ## [20.0.1](https:/ReVanced/revanced-patcher/compare/v20.0.0...v20.0.1) (2024-10-13)
 
 

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.parallel = true
 org.gradle.caching = true
-version = 20.0.1
+version = 20.0.2-dev.1

src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt

@@ -62,17 +62,16 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
  * Merge the extensions for this set of patches.
  */
  internal fun Set<Patch<*>>.mergeExtensions() {
- // Lookup map for fast checking if a class exists by its type.
+ // Lookup map to check if a class exists by its type quickly.
  val classesByType = mutableMapOf<String, ClassDef>().apply {
  classes.forEach { classDef -> put(classDef.type, classDef) }
  }
 
  forEachRecursively { patch ->
- if (patch is BytecodePatch && patch.extension != null) {
+ if (patch !is BytecodePatch) return@forEachRecursively
 
- val extension = patch.extension.readAllBytes()
-
- RawDexIO.readRawDexFile(extension, 0, null).classes.forEach { classDef ->
+ patch.extension?.use { extensionStream ->
+ RawDexIO.readRawDexFile(extensionStream, 0, null).classes.forEach { classDef ->
  val existingClass = classesByType[classDef.type] ?: run {
  logger.fine("Adding class \"$classDef\"")