From 159f7f3c3d3b4f660945d3e062c08984a1dfb1b4 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 23 May 2022 21:14:43 +0200 Subject: [PATCH] chore: update matching method names for `microg` patch Signed-off-by: oSumAtrIX --- .../patch/bytecode/MicroGBytecodePatch.kt | 6 ++--- .../patch/resource/MicroGResourcePatch.kt | 22 +++++++++---------- .../youtube/misc/microg/shared/Constants.kt | 2 +- .../signatures/GooglePlayUtilitySignature.kt | 2 +- .../signatures/IntegrityCheckSignature.kt | 2 +- .../misc/microg/signatures/PrimeSignature.kt | 2 +- .../signatures/ServiceCheckSignature.kt | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt index 2a990c866..6918b6f37 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt @@ -21,7 +21,7 @@ import app.revanced.patcher.util.smali.toInstructions import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME -import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_REVANCED_PACKAGE_NAME +import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME import app.revanced.patches.youtube.misc.microg.signatures.GooglePlayUtilitySignature import app.revanced.patches.youtube.misc.microg.signatures.IntegrityCheckSignature import app.revanced.patches.youtube.misc.microg.signatures.PrimeSignature @@ -98,7 +98,7 @@ class MicroGBytecodePatch : BytecodePatch( val newString = if (replaceMode == StringReplaceMode.REPLACE_WITH_REVANCED) stringValue.replace( - "com.google.android.youtube", BASE_REVANCED_PACKAGE_NAME + "com.google.android.youtube", REVANCED_PACKAGE_NAME ) else stringValue.replace("com.google", BASE_MICROG_PACKAGE_NAME) @@ -167,7 +167,7 @@ class MicroGBytecodePatch : BytecodePatch( } implementation.replaceInstruction( - index, "const-string v$register, \"$BASE_REVANCED_PACKAGE_NAME\"".toInstruction() + index, "const-string v$register, \"$REVANCED_PACKAGE_NAME\"".toInstruction() ) } } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt index a816afa19..627608cd4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt @@ -10,34 +10,34 @@ import app.revanced.patcher.patch.implementation.misc.PatchResult import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME -import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_REVANCED_PACKAGE_NAME +import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME @Patch -@Name("microg-bytecode-patch") -@Description("Bytecode patch to allow YouTube ReVanced to run without root and under a different package name.") +@Name("microg-resource-patch") +@Description("Resource patch to allow YouTube ReVanced to run without root and under a different package name.") @MicroGPatchCompatibility @Version("0.0.1") class MicroGResourcePatch : ResourcePatch() { override fun execute(data: ResourceData): PatchResult { data.writer("AndroidManifest.xml").write( data.reader("AndroidManifest.xml").readText().replace( - "package=\"com.google.android.youtube\"", "package=\"$BASE_REVANCED_PACKAGE_NAME\"" + "package=\"com.google.android.youtube\"", "package=\"$REVANCED_PACKAGE_NAME\"" ).replace( " android:label=\"@string/application_name\" ", " android:label=\"{APP_NAME}\" " ).replace( "", " \n " @@ -46,10 +46,10 @@ class MicroGResourcePatch : ResourcePatch() { val replacement = arrayOf( Pair( - "com.google.android.youtube.SuggestionProvider", "$BASE_REVANCED_PACKAGE_NAME.SuggestionProvider" + "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider" ), Pair( - "com.google.android.youtube.fileprovider", "$BASE_REVANCED_PACKAGE_NAME.fileprovider" + "com.google.android.youtube.fileprovider", "$REVANCED_PACKAGE_NAME.fileprovider" ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt index 1cf4adde8..768101e0a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt @@ -2,5 +2,5 @@ package app.revanced.patches.youtube.misc.microg.shared object Constants { internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle" - internal const val BASE_REVANCED_PACKAGE_NAME = "app.revanced.android.youtube" + internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube" } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/GooglePlayUtilitySignature.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/GooglePlayUtilitySignature.kt index 4ee53a429..c1a2664d8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/GooglePlayUtilitySignature.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/GooglePlayUtilitySignature.kt @@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode @Name("google-play-utility-signature") @MatchingMethod( - "Llpe;", "b" + "Llss;", "b" ) @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value. @MicroGPatchCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/IntegrityCheckSignature.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/IntegrityCheckSignature.kt index bb0cd28aa..697c744d9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/IntegrityCheckSignature.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/IntegrityCheckSignature.kt @@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode @Name("google-play-sig-check-signature") @MatchingMethod( - "Ldsf;", "d" + "Ldwn;", "d" ) @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value. @MicroGPatchCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/PrimeSignature.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/PrimeSignature.kt index 598747e1e..ed5903cce 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/PrimeSignature.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/PrimeSignature.kt @@ -9,7 +9,7 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @Name("google-play-prime-signature") @MatchingMethod( - "Louy;", "e" + "Lpag;", "d" ) @DirectPatternScanMethod @MicroGPatchCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/ServiceCheckSignature.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/ServiceCheckSignature.kt index 79f6c2476..0731e2457 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/ServiceCheckSignature.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/ServiceCheckSignature.kt @@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode @Name("google-play-service-checker-signature") @MatchingMethod( - "Llpe;", "d" + "Llss;", "d" ) @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value. @MicroGPatchCompatibility