From b44da1c7018c88d30be0849569837b4e17c68e0f Mon Sep 17 00:00:00 2001 From: 1fexd <58902674+1fexd@users.noreply.github.com> Date: Fri, 17 Nov 2023 20:41:45 +0100 Subject: [PATCH] feat(Android Widgets (Material U)): Remove `Unlock paid widgets` patch (#3286) --- .../unlock/UnlockPaidWidgetsPatch.kt | 52 ------------------- .../AgendaDaysWidgetUnlockFingerprint.kt | 3 -- .../CalendarBigWidgetUnlockFingerprint.kt | 3 -- ...darWideDayEventsWidgetUnlockFingerprint.kt | 4 -- ...ndarWideTimelineWidgetUnlockFingerprint.kt | 4 -- .../fingerprints/MethodUnlockFingerprint.kt | 12 ----- .../ScreentimeSmallWidgetUnlockFingerprint.kt | 3 -- .../WeatherWidgetUnlockFingerprint.kt | 3 -- 8 files changed, 84 deletions(-) delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/UnlockPaidWidgetsPatch.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/UnlockPaidWidgetsPatch.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/UnlockPaidWidgetsPatch.kt deleted file mode 100644 index 9b11969b4..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/UnlockPaidWidgetsPatch.kt +++ /dev/null @@ -1,52 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock - -import app.revanced.extensions.exception -import app.revanced.patcher.data.BytecodeContext -import app.revanced.patcher.extensions.InstructionExtensions.addInstructions -import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions -import app.revanced.patcher.patch.BytecodePatch -import app.revanced.patcher.patch.annotation.CompatiblePackage -import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.twelvewidgets.unlock.fingerprints.* - -@Patch( - name = "Unlock paid widgets", - description = "Unlocks paid widgets of the app", - compatiblePackages = [CompatiblePackage("com.dci.dev.androidtwelvewidgets")] -) -@Suppress("unused") -object UnlockPaidWidgetsPatch : BytecodePatch( - setOf( - AgendaDaysWidgetUnlockFingerprint, - CalendarBigWidgetUnlockFingerprint, - CalendarWideDayEventsWidgetUnlockFingerprint, - CalendarWideTimelineWidgetUnlockFingerprint, - ScreentimeSmallWidgetUnlockFingerprint, - WeatherWidgetUnlockFingerprint - ) -) { - override fun execute(context: BytecodeContext) { - listOf( - AgendaDaysWidgetUnlockFingerprint, - CalendarBigWidgetUnlockFingerprint, - CalendarWideDayEventsWidgetUnlockFingerprint, - CalendarWideTimelineWidgetUnlockFingerprint, - ScreentimeSmallWidgetUnlockFingerprint, - WeatherWidgetUnlockFingerprint - ).map { fingerprint -> - fingerprint.result?.mutableMethod ?: throw fingerprint.exception - }.forEach { method -> - method.apply { - removeInstructions(4, 3) - addInstructions( - implementation?.instructions?.size!!, - """ - const/4 v1, 0x0 - invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V - return-object v0 - """ - ) - } - } - } -} diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt deleted file mode 100644 index d3330bd5c..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -object AgendaDaysWidgetUnlockFingerprint : MethodUnlockFingerprint("AgendaDaysWidgetConfigureActivity") diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt deleted file mode 100644 index ed930a26c..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -object CalendarBigWidgetUnlockFingerprint : MethodUnlockFingerprint("CalendarBigWidgetConfigureActivity") diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt deleted file mode 100644 index adf3b82a8..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt +++ /dev/null @@ -1,4 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -object CalendarWideDayEventsWidgetUnlockFingerprint : - MethodUnlockFingerprint("CalendarWideDayEventsWidgetConfigureActivity") diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt deleted file mode 100644 index c4f79eff5..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt +++ /dev/null @@ -1,4 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -object CalendarWideTimelineWidgetUnlockFingerprint : - MethodUnlockFingerprint("CalendarWideTimelineWidgetConfigureActivity") diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt deleted file mode 100644 index aa99109b3..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt +++ /dev/null @@ -1,12 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -import app.revanced.patcher.fingerprint.MethodFingerprint - -abstract class MethodUnlockFingerprint(private val className: String) : MethodFingerprint( - "L", - strings = listOf("binding.addButton"), - customFingerprint = { methodDef, _ -> - methodDef.definingClass.endsWith("/$className;") - } -) - diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt deleted file mode 100644 index 7cfdc0246..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -object ScreentimeSmallWidgetUnlockFingerprint : MethodUnlockFingerprint("ScreentimeSmallWidgetConfigureActivity") diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt deleted file mode 100644 index 17bd9e951..000000000 --- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.revanced.patches.twelvewidgets.unlock.fingerprints - -object WeatherWidgetUnlockFingerprint : MethodUnlockFingerprint("WeatherWidgetConfigureActivity")