feat: Restore previous release

This reverts commit 3938f2f1b3.

src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt

@@ -1,22 +1,22 @@
 package app.revanced.util.microg
 
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.microg.Constants.ACTIONS
 import app.revanced.util.microg.Constants.AUTHORITIES
 import app.revanced.util.microg.Constants.MICROG_VENDOR
 import app.revanced.util.microg.Constants.PERMISSIONS
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import com.android.tools.smali.dexlib2.immutable.reference.ImmutableStringReference
 
 /**
  * Helper class for applying bytecode patches needed for the microg-support patches.
@@ -219,25 +219,25 @@ internal object MicroGBytecodeHelper {
      */
     private fun List<MethodFingerprint>.returnEarly() {
         this.forEach { fingerprint ->
-            if (fingerprint.result == null) throw PatchResultError(fingerprint.toString())
-            val result = fingerprint.result!!
-            val stringInstructions = when (result.method.returnType.first()) {
-                'L' -> """
+            fingerprint.result?.let { result ->
+                val stringInstructions = when (result.method.returnType.first()) {
+                    'L' -> """
                         const/4 v0, 0x0
                         return-object v0
                         """
 
-                'V' -> "return-void"
-                'I' -> """
+                    'V' -> "return-void"
+                    'I' -> """
                         const/4 v0, 0x0
                         return v0
                         """
 
-                else -> throw Exception("This case should never happen.")
-            }
-            result.mutableMethod.addInstructions(
-                0, stringInstructions
-            )
+                    else -> throw Exception("This case should never happen.")
+                }
+                result.mutableMethod.addInstructions(
+                    0, stringInstructions
+                )
+            } ?: throw fingerprint.exception
         }
     }
 }

src/main/kotlin/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt

@@ -3,14 +3,12 @@ package app.revanced.util.patch
 import app.revanced.extensions.findMutableMethodOf
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 
-internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
+abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
 
     abstract fun filterMap(
         classDef: ClassDef,
@@ -28,7 +26,7 @@ internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch()
         }
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Find all methods to patch
         buildMap {
             context.classes.forEach { classDef ->
@@ -62,7 +60,5 @@ internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch()
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/util/patch/LiteralValueFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.util.patch
 
 import app.revanced.extensions.containsConstantInstructionValue
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode
 
 abstract class LiteralValueFingerprint(
     returnType: String? = null,

src/main/kotlin/app/revanced/util/patch/MethodCall.kt

@@ -2,15 +2,15 @@ package app.revanced.util.patch
 
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
-internal typealias Instruction35cInfo = Triple<IMethodCall, Instruction35c, Int>
+typealias Instruction35cInfo = Triple<IMethodCall, Instruction35c, Int>
 
-internal interface IMethodCall {
+interface IMethodCall {
     val definedClassName: String
     val methodName: String
     val methodParams: Array<String>
@@ -62,14 +62,14 @@ internal interface IMethodCall {
     }
 }
 
-internal inline fun <reified E> fromMethodReference(methodReference: MethodReference)
+inline fun <reified E> fromMethodReference(methodReference: MethodReference)
         where E : Enum<E>, E : IMethodCall = enumValues<E>().firstOrNull { search ->
     search.definedClassName == methodReference.definingClass
             && search.methodName == methodReference.name
             && methodReference.parameterTypes.toTypedArray().contentEquals(search.methodParams)
 }
 
-internal inline fun <reified E> filterMapInstruction35c(
+inline fun <reified E> filterMapInstruction35c(
     integrationsClassDescriptorPrefix: String,
     classDef: ClassDef,
     instruction: Instruction,

src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt

@@ -1,20 +1,22 @@
 package app.revanced.util.resources
 
-import app.revanced.patcher.data.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.w3c.dom.Node
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
-internal object ResourceUtils {
+@Suppress("MemberVisibilityCanBePrivate")
+object ResourceUtils {
 
     /**
      * Merge strings. This manages [StringResource]s automatically.
+     *
      * @param host The hosting xml resource. Needs to be a valid strings.xml resource.
      */
-    internal fun ResourceContext.mergeStrings(host: String) {
+    fun ResourceContext.mergeStrings(host: String) {
         this.iterateXmlNodeChildren(host, "resources") {
             // TODO: figure out why this is needed
             if (!it.hasAttributes()) return@iterateXmlNodeChildren
@@ -31,10 +33,11 @@ internal object ResourceUtils {
 
     /**
      * Copy resources from the current class loader to the resource directory.
+     *
      * @param sourceResourceDirectory The source resource directory name.
      * @param resources The resources to copy.
      */
-    internal fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resources: ResourceGroup) {
+    fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resources: ResourceGroup) {
         val classLoader = ResourceUtils.javaClass.classLoader
         val targetResourceDirectory = this["res"]
 
@@ -54,7 +57,7 @@ internal object ResourceUtils {
      * @param resourceDirectoryName The name of the directory of the resource.
      * @param resources A list of resource names.
      */
-    internal class ResourceGroup(val resourceDirectoryName: String, vararg val resources: String)
+    class ResourceGroup(val resourceDirectoryName: String, vararg val resources: String)
 
     /**
      * Iterate through the children of a node by its tag.
@@ -62,7 +65,7 @@ internal object ResourceUtils {
      * @param targetTag The target xml node.
      * @param callback The callback to call when iterating over the nodes.
      */
-    internal fun ResourceContext.iterateXmlNodeChildren(
+    fun ResourceContext.iterateXmlNodeChildren(
         resource: String,
         targetTag: String,
         callback: (node: Node) -> Unit