diff --git a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt new file mode 100644 index 000000000..c6cf42886 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt @@ -0,0 +1,8 @@ +package app.revanced.patches.syncforreddit.ads.annotations + +import app.revanced.patcher.annotation.Compatibility +import app.revanced.patcher.annotation.Package + +@Compatibility([Package("com.laurencedawson.reddit_sync")]) +@Target(AnnotationTarget.CLASS) +internal annotation class DisableAdsCompatibility diff --git a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt new file mode 100644 index 000000000..b58eb6aa8 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt @@ -0,0 +1,11 @@ +package app.revanced.patches.syncforreddit.ads.fingerprints + +import app.revanced.patcher.extensions.or +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import org.jf.dexlib2.AccessFlags + +object IsAdsEnabledFingerprint : MethodFingerprint( + returnType = "Z", + access = AccessFlags.PUBLIC or AccessFlags.STATIC, + strings = listOf("SyncIapHelper") +) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt new file mode 100644 index 000000000..ef5e2a945 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt @@ -0,0 +1,39 @@ +package app.revanced.patches.syncforreddit.ads.patch + +import app.revanced.extensions.toErrorResult +import app.revanced.patcher.annotation.Description +import app.revanced.patcher.annotation.Name +import app.revanced.patcher.annotation.Version +import app.revanced.patcher.data.BytecodeContext +import app.revanced.patcher.extensions.addInstructions +import app.revanced.patcher.patch.BytecodePatch +import app.revanced.patcher.patch.PatchResult +import app.revanced.patcher.patch.PatchResultSuccess +import app.revanced.patcher.patch.annotations.DependsOn +import app.revanced.patcher.patch.annotations.Patch +import app.revanced.patches.syncforreddit.ads.annotations.DisableAdsCompatibility +import app.revanced.patches.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint +import app.revanced.patches.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch + +@Patch +@Name("disable-ads") +@DependsOn([DisablePiracyDetectionPatch::class]) +@Description("Disables ads.") +@Version("0.0.1") +@DisableAdsCompatibility +class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) { + override fun execute(context: BytecodeContext): PatchResult { + IsAdsEnabledFingerprint.result?.mutableMethod?.apply { + addInstructions( + 0, + """ + const/4 v0, 0x0 + return v0 + """ + ) + } ?: return IsAdsEnabledFingerprint.toErrorResult() + + return PatchResultSuccess() + } + +} \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt b/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt new file mode 100644 index 000000000..a4920f751 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt @@ -0,0 +1,29 @@ +package app.revanced.patches.syncforreddit.detection.piracy.fingerprints + +import app.revanced.patcher.extensions.or +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import org.jf.dexlib2.AccessFlags +import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.ReferenceInstruction +import org.jf.dexlib2.iface.reference.TypeReference + +object PiracyDetectionFingerprint : MethodFingerprint( + returnType = "V", + access = AccessFlags.PRIVATE or AccessFlags.FINAL, + opcodes = listOf( + Opcode.NEW_INSTANCE, + Opcode.INVOKE_DIRECT, + Opcode.NEW_INSTANCE, + Opcode.INVOKE_DIRECT, + Opcode.INVOKE_VIRTUAL + ), + customFingerprint = { method -> + method.implementation?.instructions?.any { + if (it.opcode != Opcode.NEW_INSTANCE) return@any false + + val reference = (it as ReferenceInstruction).reference + + reference.toString() == "Lcom/github/javiersantos/piracychecker/PiracyChecker;" + } ?: false + } +) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt new file mode 100644 index 000000000..ad7f2f9a1 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt @@ -0,0 +1,28 @@ +package app.revanced.patches.syncforreddit.detection.piracy.patch + +import app.revanced.extensions.toErrorResult +import app.revanced.patcher.annotation.Description +import app.revanced.patcher.annotation.Version +import app.revanced.patcher.data.BytecodeContext +import app.revanced.patcher.extensions.addInstructions +import app.revanced.patcher.patch.BytecodePatch +import app.revanced.patcher.patch.PatchResult +import app.revanced.patcher.patch.PatchResultSuccess +import app.revanced.patches.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint + +@Description("Disables detection of modified versions.") +@Version("0.0.1") +class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) { + override fun execute(context: BytecodeContext): PatchResult { + PiracyDetectionFingerprint.result?.mutableMethod?.apply { + addInstructions( + 0, + """ + return-void + """ + ) + } ?: return PiracyDetectionFingerprint.toErrorResult() + + return PatchResultSuccess() + } +} \ No newline at end of file