fix(Reddit): Update Hide ads patch for new versions of Reddit

Author: chsbuffer

README.md

@@ -59,7 +59,7 @@
 ### Threads
 - Hide ads
 
-### Reddit (2024.17.0)
+### Reddit
 - Hide ads
 - Sanitize sharing links
 

app/src/main/java/io/github/chsbuffer/revancedxposed/AppPatchInfo.kt

@@ -13,7 +13,7 @@ class AppPatchInfo(val appName: String, val packageName: String, val patches: Ar
 val appPatchConfigurations = listOf(
     AppPatchInfo("YouTube", "com.google.android.youtube", YouTubePatches),
     AppPatchInfo("YT Music", "com.google.android.apps.youtube.music", YTMusicPatches),
-    AppPatchInfo("Reddit (2024.17.0)", "com.reddit.frontpage", RedditPatches),
+    AppPatchInfo("Reddit", "com.reddit.frontpage", RedditPatches),
     AppPatchInfo("Google Photos", "com.google.android.apps.photos", GooglePhotosPatches),
     AppPatchInfo("Instagram", "com.instagram.android", MetaPatches),
     AppPatchInfo("Threads", "com.instagram.barcelona", MetaPatches),

app/src/main/java/io/github/chsbuffer/revancedxposed/PatchExecutor.kt

@@ -255,6 +255,9 @@ class PatchExecutor(val appContext: Application, val lpparam: LoadPackageParam):
     val KProperty0<FindMethodFunc>.method
         get() = getDexMethod(this.name, this.get()).toMethod()
 
+    val KProperty0<FindMethodFunc>.constructor
+        get() = getDexMethod(this.name, this.get()).toConstructor()
+
     val KProperty0<FindMethodFunc>.dexMethod
         get() = getDexMethod(this.name, this.get())
 

app/src/main/java/io/github/chsbuffer/revancedxposed/reddit/ad/comments/Fingerprints.kt

@@ -1,11 +1,11 @@
 package io.github.chsbuffer.revancedxposed.reddit.ad.comments
 
 import io.github.chsbuffer.revancedxposed.fingerprint
+import org.luckypray.dexkit.query.enums.StringMatchType
 
 val hideCommentAdsFingerprint = fingerprint {
-    strings(
-        "link",
-        // CommentPageRepository is not returning a link object
-        "is not returning a link object"
-    )
+    methodMatcher {
+        name("invokeSuspend")
+        declaredClass("LoadAdsCombinedCall", StringMatchType.Contains)
+    }
 }

app/src/main/java/io/github/chsbuffer/revancedxposed/reddit/ad/comments/HideCommentAdsPatch.kt

@@ -8,7 +8,7 @@ val HideCommentAds = patch(
     ::hideCommentAdsFingerprint.hookMethod {
         before {
             Logger.printDebug { "Hide Comment" }
-            it.result = Object()
+            it.result = it.args[0]
         }
     }
 }

app/src/main/java/io/github/chsbuffer/revancedxposed/reddit/ad/general/HideAdsPatch.kt

@@ -47,8 +47,12 @@ val HideAds = patch(
     // AdElementConverter is conveniently responsible for inserting all feed ads.
     // By removing the appending instruction no ad posts gets appended to the feed.
     ::AdPostSectionInitFingerprint.hookMethod {
+        val arg = ::AdPostSectionInitFingerprint.constructor.parameters.indexOfFirst {
+            MutableList::class.java.isAssignableFrom(it.type)
+        }
+        Logger.printInfo { "AdPostSection sections arg index: $arg" }
         before { param ->
-            val sections = param.args[3] as MutableList<*>
+            val sections = param.args[arg] as MutableList<*>
             sections.javaClass.findFieldByExactType(Array<Any>::class.java)!!
                 .set(sections, emptyArray<Any>())
             Logger.printDebug { "Removed ads from popular and latest feed" }

app/src/main/res/values/arrays.xml

@@ -3,6 +3,7 @@
     <string-array name="scope">
         <item>com.google.android.apps.youtube.music</item>
         <item>com.google.android.youtube</item>
+        <item>com.reddit.frontpage</item>
         <item>com.google.android.apps.photos</item>
         <item>com.instagram.android</item>
         <item>com.instagram.barcelona</item>