diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/FeatureFlagPatch.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/FeatureFlagPatch.kt index e015fe85..3d7295b5 100644 --- a/src/main/kotlin/crimera/patches/twitter/featureFlag/FeatureFlagPatch.kt +++ b/src/main/kotlin/crimera/patches/twitter/featureFlag/FeatureFlagPatch.kt @@ -25,11 +25,7 @@ object FeatureFlagPatch : BytecodePatch( setOf( FeatureFlagFingerprint, IntegrationsUtilsFingerprint, - SettingsStatusLoadFingerprint, - CustomAdapterFingerprint, - GetCountFingerprint, - OnCreateViewHolderFingerprint, - OnBindViewHolderFingerprint + SettingsStatusLoadFingerprint ) ) { override fun execute(context: BytecodeContext) { @@ -52,20 +48,5 @@ object FeatureFlagPatch : BytecodePatch( IntegrationsUtilsFingerprint.result!!.mutableMethod.addInstruction( 1, "${SettingsPatch.FSTS_DESCRIPTOR}->load()V" ) - - // Change the getCount override method name - val customAdapter = CustomAdapterFingerprint.result - ?: throw PatchException("getCount Method of CustomAdapter not found") - - customAdapter.mutableMethod.name = GetCountFingerprint.result?.method?.name - ?: throw PatchException("getCount Method of RecyclerView not found") - - // onCreateViewHolder - customAdapter.mutableClass.methods.first { it.name == "onCreateViewHolder" }.name = OnCreateViewHolderFingerprint.result?.method?.name - ?: throw PatchException("onCreateViewHolder Method of RecyclerView not found") - - // onBindViewHolder - customAdapter.mutableClass.methods.first { it.name == "onBindViewHolder" }.name = OnBindViewHolderFingerprint.result?.method?.name - ?: throw PatchException("onBindViewHolder Method of RecyclerView not found") } } \ No newline at end of file diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/fingerprints/RecyclerViewFingerprints.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/fingerprints/RecyclerViewFingerprints.kt deleted file mode 100644 index 6341f39b..00000000 --- a/src/main/kotlin/crimera/patches/twitter/featureFlag/fingerprints/RecyclerViewFingerprints.kt +++ /dev/null @@ -1,29 +0,0 @@ -package crimera.patches.twitter.featureFlag.fingerprints - -import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.MethodFingerprint -import com.android.tools.smali.dexlib2.AccessFlags - -object GetCountFingerprint: MethodFingerprint( - accessFlags = AccessFlags.PUBLIC or AccessFlags.ABSTRACT, - returnType = "I", - customFingerprint = { methodDef, _ -> - methodDef.definingClass.endsWith("Landroidx/recyclerview/widget/RecyclerView\$e;") - } -) - -object OnCreateViewHolderFingerprint: MethodFingerprint( - accessFlags = AccessFlags.PUBLIC or AccessFlags.ABSTRACT, - returnType = "Landroidx/recyclerview/widget/RecyclerView\$c0;", - customFingerprint = { methodDef, _ -> - methodDef.definingClass.endsWith("Landroidx/recyclerview/widget/RecyclerView\$e;") - } -) - -object OnBindViewHolderFingerprint: MethodFingerprint( - accessFlags = AccessFlags.PUBLIC or AccessFlags.ABSTRACT, - returnType = "V", - customFingerprint = { methodDef, _ -> - methodDef.definingClass.endsWith("Landroidx/recyclerview/widget/RecyclerView\$e;") - } -) \ No newline at end of file diff --git a/src/main/resources/twitter/settings/layout/feature_flags_view.xml b/src/main/resources/twitter/settings/layout/feature_flags_view.xml index b279b448..e9b9bbac 100644 --- a/src/main/resources/twitter/settings/layout/feature_flags_view.xml +++ b/src/main/resources/twitter/settings/layout/feature_flags_view.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:id="@+id/linearLayout"> -