From ecda492866f7ee8eef8b1e880d0d058fb962771b Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 27 Oct 2025 11:09:55 +0400 Subject: [PATCH] finish merge --- .../app/revanced/patches/duolingo/energy/Fingerprints.kt | 4 ++-- .../patches/instagram/hide/navigation/Fingerprints.kt | 4 ++-- .../instagram/hide/navigation/HideNavigationButtons.kt | 2 +- .../patches/music/layout/compactheader/HideCategoryBar.kt | 8 ++++---- .../revanced/patches/tiktok/misc/share/Fingerprints.kt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/src/main/kotlin/app/revanced/patches/duolingo/energy/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/duolingo/energy/Fingerprints.kt index 73dbcf304..0fbc9e51b 100644 --- a/patches/src/main/kotlin/app/revanced/patches/duolingo/energy/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/duolingo/energy/Fingerprints.kt @@ -7,13 +7,13 @@ import com.android.tools.smali.dexlib2.Opcode /** * Matches the class found in [energyConfigToStringFingerprint]. */ -internal val initializeEnergyConfigFingerprint = fingerprint { +internal val initializeEnergyConfigFingerprint by fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR) opcodes(Opcode.RETURN_VOID) } // Class name currently is not obfuscated but it may be in the future. -internal val energyConfigToStringFingerprint = fingerprint { +internal val energyConfigToStringFingerprint by fingerprint { parameters() returns("Ljava/lang/String;") strings("EnergyConfig(", "maxEnergy=") // Partial string matches. diff --git a/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/Fingerprints.kt index 6dc01f47c..9546b0eb0 100644 --- a/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/Fingerprints.kt @@ -5,12 +5,12 @@ import app.revanced.patcher.fingerprint import app.revanced.patcher.patch.BytecodePatchContext import com.android.tools.smali.dexlib2.AccessFlags -internal val initializeNavigationButtonsListFingerprint = fingerprint { +internal val initializeNavigationButtonsListFingerprint by fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) parameters("Lcom/instagram/common/session/UserSession;", "Z") returns("Ljava/util/List;") } -private val navigationButtonsEnumClassDef = fingerprint { +internal val navigationButtonsEnumClassDef by fingerprint { strings("FEED", "fragment_feed", "SEARCH", "fragment_search") } diff --git a/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/HideNavigationButtons.kt b/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/HideNavigationButtons.kt index e8ec3ee6f..419b813df 100644 --- a/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/HideNavigationButtons.kt +++ b/patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/HideNavigationButtons.kt @@ -63,7 +63,7 @@ val hideNavigationButtonsPatch = bytecodePatch( with(navigationButtonsEnumInitFingerprint.method) { enumNameField = indexOfFirstInstructionOrThrow { opcode == Opcode.IPUT_OBJECT && - (this as TwoRegisterInstruction).registerA == 2 // The p2 register + (this as TwoRegisterInstruction).registerA == 2 // p2 register. }.let { getInstruction(it).getReference()!!.name } diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt index 5a6270551..92d5ad4df 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt @@ -8,8 +8,8 @@ import app.revanced.patches.all.misc.resources.addResourcesPatch import app.revanced.patches.music.misc.extension.sharedExtensionPatch import app.revanced.patches.music.misc.settings.PreferenceScreen import app.revanced.patches.music.misc.settings.settingsPatch -import app.revanced.patches.shared.misc.mapping.get -import app.revanced.patches.shared.misc.mapping.resourceMappings +import app.revanced.patches.shared.misc.mapping.ResourceType +import app.revanced.patches.shared.misc.mapping.getResourceId import app.revanced.patches.shared.misc.settings.preference.SwitchPreference import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @@ -37,14 +37,14 @@ val hideCategoryBar = bytecodePatch( ) execute { - chipCloud = resourceMappings["layout", "chip_cloud"] - addResources("music", "layout.compactheader.hideCategoryBar") PreferenceScreen.GENERAL.addPreferences( SwitchPreference("revanced_music_hide_category_bar"), ) + chipCloud = getResourceId(ResourceType.LAYOUT, "chip_cloud") + chipCloudFingerprint.method.apply { val targetIndex = chipCloudFingerprint.patternMatch!!.endIndex val targetRegister = getInstruction(targetIndex).registerA diff --git a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/share/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/share/Fingerprints.kt index 836be8900..38e8946c1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/share/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/share/Fingerprints.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val urlShorteningFingerprint = fingerprint { +internal val urlShorteningFingerprint by fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC, AccessFlags.FINAL) returns("LX/") parameters(