diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/Fingerprints.kt index 6e1e0212b..7c3b0f97e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/Fingerprints.kt @@ -21,11 +21,8 @@ internal val removePreferenceFingerprint = legacyFingerprint( accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = listOf("Landroidx/preference/Preference;"), opcodes = listOf(Opcode.INVOKE_VIRTUAL), - customFingerprint = custom@{ method, _ -> - if (method.definingClass != "Landroidx/preference/PreferenceGroup;") { - return@custom false - } - val instructions = method.implementation?.instructions ?: return@custom false - instructions.elementAt(0).opcode == Opcode.INVOKE_DIRECT + customFingerprint = { method, classDef -> + classDef.type == "Landroidx/preference/PreferenceGroup;" && + method.implementation?.instructions?.elementAt(0)?.opcode == Opcode.INVOKE_DIRECT } ) diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/SettingsMenuPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/SettingsMenuPatch.kt index ba54b950e..a9c51fc4e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/SettingsMenuPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/settingmenu/SettingsMenuPatch.kt @@ -14,7 +14,7 @@ val settingsMenuPatch = bytecodePatch( ) { execute { val findPreferenceMethodCall = findPreferenceFingerprint.methodCall() - val removePreferenceMethodCall = findPreferenceFingerprint.methodCall() + val removePreferenceMethodCall = removePreferenceFingerprint.methodCall() findMethodOrThrow(EXTENSION_CLASS_DESCRIPTOR) { name == "removePreference"