chore: migrate to new changes from the patcher

2022-10-05 04:13:14 +02:00
parent 3a25dc4fa2
commit 01a4349a3f
212 changed files with 513 additions and 1021 deletions
@@ -2,16 +2,12 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
-@MatchingMethod(
-    "Lvvz;", "a"
-)
-@DirectPatternScanMethod
+
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(
@@ -2,16 +2,12 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-module-fingerprint")
-@MatchingMethod(
-    "Llqh;", "c"
-)
-@DirectPatternScanMethod
+
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(
@@ -2,16 +2,12 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
-@MatchingMethod(
-    "Lmcf;", "c"
-)
-@DirectPatternScanMethod
+
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
@@ -3,17 +3,13 @@ package app.revanced.patches.music.misc.microg.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.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

@Name("google-play-utility-fingerprint")
-@MatchingMethod(
-    "Lnuv;", "b"
-)
-@DirectPatternScanMethod
+
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(
@@ -2,16 +2,12 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.music.misc.microg.annotations.MusicMicroGPatchCompatibility

@Name("google-play-prime-fingerprint")
-@MatchingMethod(
-    "Lrwi;", "a"
-)
-@DirectPatternScanMethod
+
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(
@@ -4,15 +4,11 @@ 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.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

@Name("google-play-service-checker-fingerprint")
-@MatchingMethod(
-    "Lnuv;", "d"
-)
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
@MusicMicroGPatchCompatibility
@Version("0.0.1")
@@ -3,11 +3,11 @@ package app.revanced.patches.music.misc.microg.patch.bytecode
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import app.revanced.patches.music.misc.microg.fingerprints.*
 import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
@@ -39,10 +39,10 @@ class MusicMicroGBytecodePatch : BytecodePatch(
    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
    // - "com.google.android.gms.phenotype.UPDATE",
    // - "com.google.android.gms.phenotype",
-    override fun execute(data: BytecodeData) =
+    override fun execute(context: BytecodeContext) =
        // apply common microG patch
        MicroGBytecodeHelper.patchBytecode(
-            data,
+            context,
            arrayOf(
                MicroGBytecodeHelper.packageNameTransform(
                    Constants.PACKAGE_NAME,
@@ -3,10 +3,10 @@ package app.revanced.patches.music.misc.microg.patch.resource
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
@@ -20,11 +20,11 @@ import app.revanced.util.microg.MicroGResourceHelper
@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
@MusicMicroGPatchCompatibility
@Version("0.0.2")
-class MusicMicroGResourcePatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
+class MusicMicroGResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
        // update manifest
        MicroGResourceHelper.patchManifest(
-            data,
+            context,
            MUSIC_PACKAGE_NAME,
            REVANCED_MUSIC_PACKAGE_NAME,
            REVANCED_MUSIC_APP_NAME
@@ -32,7 +32,7 @@ class MusicMicroGResourcePatch : ResourcePatch() {

        // add metadata to the manifest
        MicroGManifestHelper.addSpoofingMetadata(
-            data,
+            context,
            SPOOFED_PACKAGE_NAME,
            SPOOFED_PACKAGE_SIGNATURE
        )