From 45d42a14055f969c925cad3c2a20d7a2c08eab20 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 22 Sep 2025 18:48:44 +0400 Subject: [PATCH] fix merge error --- .../patches/youtube/misc/settings/SettingsPatch.kt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt index afb5f32f5..76dcab24a 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt @@ -216,15 +216,6 @@ val settingsPatch = bytecodePatch( } } -// // Add setting to force Cairo settings fragment on/off. -// cairoFragmentConfigFingerprint.let { -// it.method.insertLiteralOverride( -// it.instructionMatches.last().index, -// "$LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->useCairoSettingsFragment(Z)Z" -// ) -// } -// } - // Add setting to force Cairo settings fragment on/off. cairoFragmentConfigFingerprint.method.insertLiteralOverride( cairoFragmentConfigFingerprint.instructionMatches.first().index, @@ -254,9 +245,11 @@ internal fun modifyActivityForSettingsInjection( // Modify Activity and remove all existing layout code. // Must modify an existing activity and cannot add a new activity to the manifest, // as that fails for root installations. + val superClass = activityOnCreateClass.superclass activityOnCreateMethod.addInstructions( - 1, + 0, """ + invoke-super { p0, p1 }, $superClass->onCreate(Landroid/os/Bundle;)V invoke-static { p0 }, $extensionClassType->initialize(Landroid/app/Activity;)V return-void """