Lea/revanced-patches-tasker
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: wrong patches in upgrade-tab-remover

Browse source 
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
oSumAtrIX 2022-04-27 03:06:52 +02:00
parent e5fd7cece9
commit 518229031c
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/kotlin/app/revanced/patches/music/layout/RemoveUpgradeTabPatch.kt
View file

@ -13,6 +13,7 @@ import org.jf.dexlib2.AccessFlags
import org.jf.dexlib2.Opcode import org.jf.dexlib2.Opcode
import org.jf.dexlib2.builder.instruction.BuilderInstruction22t import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
import org.jf.dexlib2.iface.instruction.formats.Instruction22c import org.jf.dexlib2.iface.instruction.formats.Instruction22c
import org.jf.dexlib2.iface.instruction.formats.Instruction35c
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
@ -99,15 +100,15 @@ class RemoveUpgradeTabPatch : Patch(
val pivotBarElementFieldRef = val pivotBarElementFieldRef =
(implementation.instructions[result.scanData.endIndex - 1] as Instruction22c).reference (implementation.instructions[result.scanData.endIndex - 1] as Instruction22c).reference
val register = (implementation.instructions.first() as Instruction35c).registerC
// first compile all the needed instructions // first compile all the needed instructions
val instructionList = val instructionList =
""" """
invoke-interface { v0 }, Ljava/util/List;->size()I invoke-interface { v0 }, Ljava/util/List;->size()I
move-result v1 move-result v1
const/4 v2, 0x3 const/4 v2, 0x3
const/4 v1, 0x3 invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
invoke-interface {v0, v1}, Ljava/util/List;->remove(I)Ljava/lang/Object; iput-object v0, v$register, $pivotBarElementFieldRef
iput-object v0, p0, $pivotBarElementFieldRef
""".trimIndent().toInstructions().toMutableList() """.trimIndent().toInstructions().toMutableList()
@ -116,6 +117,8 @@ class RemoveUpgradeTabPatch : Patch(
result.scanData.endIndex - 1, result.scanData.endIndex - 1,
instructionList[0] // invoke-interface instructionList[0] // invoke-interface
) )
// do not forget to remove this instruction since we added it already
instructionList.removeFirst()
val exitInstruction = instructionList.last() // iput-object val exitInstruction = instructionList.last() // iput-object
implementation.addInstruction( implementation.addInstruction(
@ -127,7 +130,7 @@ class RemoveUpgradeTabPatch : Patch(
// add the necessary if statement to remove the upgrade tab button in case it exists // add the necessary if statement to remove the upgrade tab button in case it exists
instructionList.add( instructionList.add(
3, // if-le 2, // if-le
BuilderInstruction22t( BuilderInstruction22t(
Opcode.IF_LE, Opcode.IF_LE,
1, 2, 1, 2,