refactor: make use of named arguments

2022-08-31 20:38:38 +02:00
parent 0be9f00915
commit 572c110a6e
93 changed files with 160 additions and 393 deletions
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.amoled.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class AmoledCompatibility
@@ -3,7 +3,6 @@ package app.revanced.patches.youtube.layout.autoplaybutton.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
@@ -19,8 +18,7 @@ import org.jf.dexlib2.Opcode
 object AutoNavInformerFingerprint : MethodFingerprint(
    "Z",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_INTERFACE,
        Opcode.MOVE_RESULT_OBJECT,
@@ -28,6 +26,5 @@ object AutoNavInformerFingerprint : MethodFingerprint(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT,
    ),
-    null,
-    { it.definingClass.endsWith("WillAutonavInformer;") }
+    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
 )
@@ -13,8 +13,8 @@ import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayBu
@AutoplayButtonCompatibility
@Version("0.0.1")
 object LayoutConstructorFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("1.0x"),
-    { methodDef ->
+    strings = listOf("1.0x"),
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
    }
 )
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.header.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumHeadingCompatibility
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.icon.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CustomBrandingCompatibility
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.castbutton.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CastButtonCompatibility
@@ -16,10 +16,7 @@ import org.jf.dexlib2.Opcode
@ShortsButtonCompatibility
@Version("0.0.1")
 object FullscreenViewAdderFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.IGET_BOOLEAN
    )
 )
@@ -16,10 +16,8 @@ import org.jf.dexlib2.Opcode
@ShortsButtonCompatibility
@Version("0.0.1")
 object FullscreenViewAdderParentFingerprint : MethodFingerprint(
-    null,
-    null,
-    listOf("L", "L"),
-    listOf(
+    parameters = listOf("L", "L"),
+    opcodes = listOf(
        Opcode.GOTO,
        Opcode.IGET_BOOLEAN,
        Opcode.IF_EQ,
@@ -27,6 +25,5 @@ object FullscreenViewAdderParentFingerprint : MethodFingerprint(
        Opcode.CONST_4,
        Opcode.INVOKE_VIRTUAL,
    ),
-    null,
-    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
+    customFingerprint = { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
 )
@@ -3,9 +3,9 @@ package app.revanced.patches.youtube.layout.reels.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,6 +17,6 @@ import org.jf.dexlib2.AccessFlags
@HideReelsCompatibility
@Version("0.0.1")
 object HideReelsFingerprint : MethodFingerprint(
-    null, AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L", "L"), null,
-    listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL, parameters = listOf("L", "L"),
+    strings = listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
 )
@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object DislikeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
-    null,
-    listOf("like/dislike")
+    strings = listOf("like/dislike")
 )
@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object LikeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
-    null,
-    listOf("like/like")
+     strings = listOf("like/like")
 )
@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object RemoveLikeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
-    null,
-    listOf("like/removelike")
+    strings = listOf("like/removelike")
 )
@@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.Retu
@ReturnYouTubeDislikeCompatibility
@Version("0.0.1")
 object TextComponentSpecParentFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    listOf("TextComponentSpec: No converter for extension: ")
+    strings = listOf("TextComponentSpec: No converter for extension: ")
 )
@@ -15,7 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint(
-    "V", null, null,
-    null,
-    listOf("timed_markers_width")
+    "V",
+    strings = listOf("timed_markers_width")
 )
@@ -17,8 +17,5 @@ import org.jf.dexlib2.util.MethodUtil
@Version("0.0.1")
 object NextGenWatchLayoutFingerprint : MethodFingerprint(
    "V", // constructors return void, in favour of speed of matching, this fingerprint has been added
-    null,
-    null,
-    null,
    customFingerprint =  { methodDef -> MethodUtil.isConstructor(methodDef) && methodDef.parameterTypes.size == 3 && methodDef.definingClass.endsWith("NextGenWatchLayout;") }
 )
@@ -16,7 +16,6 @@ import org.jf.dexlib2.Opcode
@SponsorBlockCompatibility
@Version("0.0.1")
 object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(
-    null, null, null,
-    listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
-    listOf("Media progress reported outside media playback: ")
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
+    strings = listOf("Media progress reported outside media playback: ")
 )
@@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object PlayerInitFingerprint : MethodFingerprint(
-    null, null, null,
-    null,
    strings = listOf(
        "playVideo called on player response with no videoStreamingData."
    ),
@@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object PlayerOverlaysLayoutInitFingerprint : MethodFingerprint(
-    null, null, null,
-    null,
-    null,
-    { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
+
+    customFingerprint = { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
 )
@@ -18,11 +18,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
@Version("0.0.1")
 object RectangleFieldInvalidatorFingerprint : MethodFingerprint(
    "V",
-    null,
-    null,
-    null,
-    null,
-    custom@{ methodDef ->
+    customFingerprint = custom@{ methodDef ->
        val instructions = methodDef.implementation?.instructions!!
        val instructionCount = instructions.count()

@@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object SeekFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    listOf("Attempting to seek during an ad")
+    strings = listOf("Attempting to seek during an ad")
 )
@@ -16,8 +16,7 @@ import org.jf.dexlib2.Opcode
@SponsorBlockCompatibility
@Version("0.0.1")
 object VideoLengthFingerprint : MethodFingerprint(
-    null, null, null,
-    listOf(
+    opcodes = listOf(
        Opcode.MOVE_RESULT_WIDE,
        Opcode.CMP_LONG,
        Opcode.IF_LEZ,
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object VideoTimeFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
+    strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
 )
@@ -16,6 +16,6 @@ import org.jf.dexlib2.Opcode
@TabletMiniPlayerCompatibility
@Version("0.0.1")
 object MiniPlayerOverrideFingerprint : MethodFingerprint(
-    "Z", AccessFlags.STATIC or AccessFlags.PUBLIC ,null,
-    listOf(Opcode.RETURN), // anchor to insert the instruction
+    "Z", AccessFlags.STATIC or AccessFlags.PUBLIC,
+    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
 )
@@ -16,6 +16,6 @@ import org.jf.dexlib2.Opcode
@TabletMiniPlayerCompatibility
@Version("0.0.1")
 object MiniPlayerOverrideNoContextFingerprint : MethodFingerprint(
-    "Z", AccessFlags.FINAL or AccessFlags.PRIVATE ,null,
-    listOf(Opcode.RETURN), // anchor to insert the instruction
+    "Z", AccessFlags.FINAL or AccessFlags.PRIVATE,
+    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
 )
@@ -32,6 +32,5 @@ object MiniPlayerResponseModelSizeCheckFingerprint : MethodFingerprint(
        Opcode.INVOKE_STATIC,
        Opcode.MOVE_RESULT,
        Opcode.IF_NEZ,
-        ),
-    null
+        )
 )
@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
@HideWatermarkCompatibility
@Version("0.0.1")
 object HideWatermarkFingerprint : MethodFingerprint (
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), null ,null, null
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L")
 )
@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
@HideWatermarkCompatibility
@Version("0.0.1")
 object HideWatermarkParentFingerprint : MethodFingerprint (
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, null, null, listOf("player_overlay_in_video_programming"), null
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, strings = listOf("player_overlay_in_video_programming")
 )
@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -18,31 +17,7 @@ import org.jf.dexlib2.Opcode
@DirectPatternScanMethod
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
-This finds the following method:
-public final View i(akrl akrlVar, adpd adpdVar) {
-}
-
-Method we search for is located in smali now.
-See:
-.method public final i(Lakrl;Ladpd;)Landroid/view/View;
-    iget-object v0, p0, Ljkg;->a:Landroid/app/Activity;
-    invoke-static {v0}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater;
-    move-result-object v0
-    iget-object v1, p0, Ljkg;->g:Ljis;
-    const/4 v2, 0x0
-    invoke-interface {v1, v2}, Ljis;->h(Z)V
-    iget-object p1, p1, Lakrl;->f:Lahnq;
-    if-nez p1, :cond_12
-    sget-object p1, Lahnq;->a:Lahnq;
-    :cond_12
-    iget-object v1, p0, Ljkg;->x:Ltxm;
-    invoke-static {v1}, Lfbn;->aF(Ltxm;)Z //THIS IS WHAT WE SEARCH FOR (Method fbn.aF)
-    move-result v1
- */
-
 object WideSearchbarOneFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC),
-    null, null
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"),
+    listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC)
 )
@@ -3,10 +3,9 @@ package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,31 +16,7 @@ import org.jf.dexlib2.AccessFlags
@FuzzyPatternScanMethod(3)
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
- * This finds the following method:
-  private final void l(PaneDescriptor paneDescriptor) {
-        Class cls = null;
-        ahat f = paneDescriptor != null ? paneDescriptor.f() : null;
-        if (paneDescriptor != null) {
-            cls = paneDescriptor.a;
-        }
-        ftu k = k();
-        if ((k == null || !k.bk()) && ((!frx.k(f) && !((Boolean) aqer.S(this.n).X(new fac(this, f, 19)).K(irx.i).aH(false)).booleanValue()) || (f != null && f.qA(ReelWatchEndpointOuterClass$ReelWatchEndpoint.reelWatchEndpoint)))) {
-            String j = frx.j(f);
-            if ((j != null && ("FEhistory".equals(j) || "FEmy_videos".equals(j) || "FEpurchases".equals(j) || j.startsWith("VL"))) || cls == this.I.E() || cls == this.G.a) {
-                this.F = 3;
-                return;
-            } else {
-                this.F = 2;
-                return;
-            }
-        }
-        this.F = 1;
-    }
- */
-
 object WideSearchbarOneParentFingerprint : MethodFingerprint(
-    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"), null,
-    listOf("FEhistory", "FEmy_videos", "FEpurchases")
+    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"),
+    strings = listOf("FEhistory", "FEmy_videos", "FEpurchases")
 )
@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -18,32 +17,8 @@ import org.jf.dexlib2.Opcode
@DirectPatternScanMethod
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
-public static jis h(Context context, txm txmVar, uag uagVar, txp txpVar) {
-        return fbn.aB(txmVar) ? new jhx(context, txmVar, uagVar, txpVar) : jis.d;
-    }
-
-Method we search for is located in smali now.
-See:
-.method public static h(Landroid/content/Context;Ltxm;Luag;Ltxp;)Ljis;
-    invoke-static {p1}, Lfbn;->aB(Ltxm;)Z //this is the method we want to change. fbn.aB
-    move-result v0
-    if-eqz v0, :cond_c
-    new-instance v0, Ljhx;
-    invoke-direct {v0, p0, p1, p2, p3}, Ljhx;-><init>(Landroid/content/Context;Ltxm;Luag;Ltxp;)V
-    goto :goto_e
-    :cond_c
-    sget-object v0, Ljis;->d:Ljis;
-    :goto_e
-    return-object v0
-.end method
-
- */
-
 object WideSearchbarTwoFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
        Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_EQZ, Opcode.NEW_INSTANCE
-    ),
-    null, null
+    )
 )
@@ -14,19 +14,7 @@ import org.jf.dexlib2.AccessFlags
 )
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
-This finds following method:
-public static ies i(br brVar) {
-        bp f = brVar.getSupportFragmentManager().f("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT");
-        if (f != null) {
-            return (kga) f;
-        }
-        return new kga();
-    }
- */
-
 object WideSearchbarTwoParentFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null,
-    listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"),
+    strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
 )