generated from ReVanced/revanced-patches-template
-
-
Notifications
You must be signed in to change notification settings - Fork 323
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into fork/feat_reorganize_settings
# Conflicts: # src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt
- Loading branch information
Showing
21 changed files
with
341 additions
and
57 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| org.gradle.parallel = true | ||
| org.gradle.caching = true | ||
| kotlin.code.style = official | ||
| version = 4.3.0-dev.4 | ||
| version = 4.3.0-dev.12 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package app.revanced.patches.openinghours.misc.fix.crash | ||
|
|
||
| import app.revanced.patcher.data.BytecodeContext | ||
| import app.revanced.patcher.extensions.InstructionExtensions.getInstructions | ||
| import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction | ||
| import app.revanced.patcher.extensions.newLabel | ||
| import app.revanced.patcher.patch.BytecodePatch | ||
| import app.revanced.patcher.patch.annotation.CompatiblePackage | ||
| import app.revanced.patcher.patch.annotation.Patch | ||
| import app.revanced.patches.openinghours.misc.fix.crash.fingerprints.SetPlaceFingerprint | ||
| import app.revanced.util.exception | ||
| import app.revanced.util.getReference | ||
| import com.android.tools.smali.dexlib2.Opcode | ||
| import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21t | ||
| import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction | ||
| import com.android.tools.smali.dexlib2.iface.instruction.Instruction | ||
| import com.android.tools.smali.dexlib2.iface.reference.MethodReference | ||
|
|
||
| @Patch( | ||
| name = "Fix crash", | ||
| compatiblePackages = [CompatiblePackage("de.simon.openinghours", ["1.0"])], | ||
| ) | ||
| @Suppress("unused") | ||
| object FixCrashPatch : BytecodePatch( | ||
| setOf(SetPlaceFingerprint), | ||
| ) { | ||
|
|
||
| override fun execute(context: BytecodeContext) { | ||
| SetPlaceFingerprint.result?.let { | ||
| val indexedInstructions = it.mutableMethod.getInstructions().withIndex().toList() | ||
|
|
||
| /** | ||
| * This function replaces all `checkNotNull` instructions in the integer interval | ||
| * from [startIndex] to [endIndex], both inclusive. In place of the `checkNotNull` | ||
| * instruction an if-null check is inserted. If the if-null check yields that | ||
| * the value is indeed null, we jump to a newly created label at `endIndex + 1`. | ||
| */ | ||
| fun avoidNullPointerException(startIndex: Int, endIndex: Int) { | ||
| val continueLabel = it.mutableMethod.newLabel(endIndex + 1) | ||
|
|
||
| for (index in startIndex..endIndex) { | ||
| val instruction = indexedInstructions[index].value | ||
|
|
||
| if (!instruction.isCheckNotNullInstruction) { | ||
| continue | ||
| } | ||
|
|
||
| val checkNotNullInstruction = instruction as FiveRegisterInstruction | ||
| val originalRegister = checkNotNullInstruction.registerC | ||
|
|
||
| it.mutableMethod.replaceInstruction( | ||
| index, | ||
| BuilderInstruction21t( | ||
| Opcode.IF_EQZ, | ||
| originalRegister, | ||
| continueLabel, | ||
| ), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| val getOpeningHoursIndex = getIndicesOfInvoke( | ||
| indexedInstructions, | ||
| "Lde/simon/openinghours/models/Place;", | ||
| "getOpeningHours", | ||
| ) | ||
|
|
||
| val setWeekDayTextIndex = getIndexOfInvoke( | ||
| indexedInstructions, | ||
| "Lde/simon/openinghours/views/custom/PlaceCard;", | ||
| "setWeekDayText", | ||
| ) | ||
|
|
||
| val startCalculateStatusIndex = getIndexOfInvoke( | ||
| indexedInstructions, | ||
| "Lde/simon/openinghours/views/custom/PlaceCard;", | ||
| "startCalculateStatus", | ||
| ) | ||
|
|
||
| // Replace the Intrinsics;->checkNotNull instructions with a null check | ||
| // and jump to our newly created label if it returns true. | ||
| // This avoids the NullPointerExceptions. | ||
| avoidNullPointerException(getOpeningHoursIndex[1], startCalculateStatusIndex) | ||
| avoidNullPointerException(getOpeningHoursIndex[0], setWeekDayTextIndex) | ||
| } ?: throw SetPlaceFingerprint.exception | ||
| } | ||
|
|
||
| private fun isInvokeInstruction(instruction: Instruction, className: String, methodName: String): Boolean { | ||
| val methodRef = instruction.getReference<MethodReference>() ?: return false | ||
| return methodRef.definingClass == className && methodRef.name == methodName | ||
| } | ||
|
|
||
| private fun getIndicesOfInvoke( | ||
| instructions: List<IndexedValue<Instruction>>, | ||
| className: String, | ||
| methodName: String, | ||
| ): List<Int> = instructions.mapNotNull { (index, instruction) -> | ||
| if (isInvokeInstruction(instruction, className, methodName)) { | ||
| index | ||
| } else { | ||
| null | ||
| } | ||
| } | ||
|
|
||
| private fun getIndexOfInvoke( | ||
| instructions: List<IndexedValue<Instruction>>, | ||
| className: String, | ||
| methodName: String, | ||
| ): Int = instructions.first { (_, instruction) -> | ||
| isInvokeInstruction(instruction, className, methodName) | ||
| }.index | ||
|
|
||
| private val Instruction.isCheckNotNullInstruction | ||
| get() = isInvokeInstruction(this, "Lkotlin/jvm/internal/Intrinsics;", "checkNotNull") | ||
| } |
12 changes: 12 additions & 0 deletions
12
...tlin/app/revanced/patches/openinghours/misc/fix/crash/fingerprints/SetPlaceFingerprint.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package app.revanced.patches.openinghours.misc.fix.crash.fingerprints | ||
|
|
||
| import app.revanced.patcher.fingerprint.MethodFingerprint | ||
|
|
||
| internal object SetPlaceFingerprint : MethodFingerprint( | ||
| "V", | ||
| parameters = listOf("Lde/simon/openinghours/models/Place;"), | ||
| customFingerprint = { methodDef, _ -> | ||
| methodDef.definingClass == "Lde/simon/openinghours/views/custom/PlaceCard;" && | ||
| methodDef.name == "setPlace" | ||
| }, | ||
| ) |
Oops, something went wrong.