refactor: Add SettingsPatch dependencies to patches

crimera · Apr 30, 2024 · 6d252f8 · 6d252f8
1 parent 2d80876
commit 6d252f8
Show file tree

Hide file tree

Showing 28 changed files with 89 additions and 73 deletions.
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideAds.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideAds.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideAds :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideAds()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideCTJ.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideCTJ.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideCTJ :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideCommToJoin()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideCTS.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideCTS.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideCTS :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideCreatorsToSub()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideDetailedPosts.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideDetailedPosts.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -16,13 +17,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideDetailedPosts :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideDetailedPost()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideGoogleAds.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideGoogleAds.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideGoogleAds :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideGAds()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HidePinnedByFollowers.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HidePinnedByFollowers.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HidePinnedByFollowers :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideRevistPinnedPost()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideRevistBmk.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideRevistBmk.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideRevistBmk :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideRevistBookmark()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideWTF.kt b/src/main/kotlin/crimera/patches/twitter/ads/timelineEntryHook/HideWTF.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.ads.timelineEntryHook
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.misc.settings.SettingsPatch
@@ -15,13 +16,13 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
     use = true
 )
 object HideWTF :BytecodePatch(
-    setOf()
+    setOf(SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideWhoToFollow()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/ads/trends/HidePromotedTrendPatch.kt b/src/main/kotlin/crimera/patches/twitter/ads/trends/HidePromotedTrendPatch.kt
@@ -56,9 +56,9 @@ class HidePromotedTrendPatch : BytecodePatch(
         )
 
 
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hidePromotedTrends()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/DisableChirpFontPatch.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/DisableChirpFontPatch.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.featureFlag
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.featureFlag.fingerprints.FeatureFlagLoadFingerprint
@@ -25,10 +26,10 @@ object DisableChirpFontPatch: BytecodePatch(
             "${SettingsPatch.FSTS_DESCRIPTOR}->chirpFont()V"
         )
 
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->enableFont()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
         //end
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/FeatureFlagPatch.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/FeatureFlagPatch.kt
@@ -17,12 +17,12 @@ import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFing
 @Patch(
     name = "Hook feature flag",
     compatiblePackages = [CompatiblePackage("com.twitter.android")],
-    dependencies = [FeatureFlagResourcePatch::class],
+    dependencies = [FeatureFlagResourcePatch::class, SettingsPatch::class],
     use = true
 )
 @Suppress("unused")
 object FeatureFlagPatch:BytecodePatch(
-    setOf(FeatureFlagFingerprint,IntegrationsUtilsFingerprint)
+    setOf(FeatureFlagFingerprint,IntegrationsUtilsFingerprint, SettingsStatusLoadFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
 
@@ -41,10 +41,10 @@ object FeatureFlagPatch:BytecodePatch(
 
         booleanMethod.addInstructions(loc+1,METHOD)
 
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->enableFeatureFlags()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
         IntegrationsUtilsFingerprint.result!!.mutableMethod.addInstruction(
             1,
             "${SettingsPatch.FSTS_DESCRIPTOR}->load()V"

diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/HideBookmarkInTimelinePatch.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/HideBookmarkInTimelinePatch.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.featureFlag
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import crimera.patches.twitter.misc.settings.SettingsPatch
 import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFingerprint
 
@@ -26,10 +27,10 @@ object HideBookmarkInTimelinePatch:BytecodePatch(
             "${SettingsPatch.FSTS_DESCRIPTOR}->bookmarkInTimeline()V"
         )
 
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideInlineBmk()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
         //end
     }

diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/HideFABMenuButtonsPatch.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/HideFABMenuButtonsPatch.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.featureFlag
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.featureFlag.fingerprints.FeatureFlagLoadFingerprint
@@ -20,15 +21,15 @@ class HideFABMenuButtonsPatch : BytecodePatch(
     setOf( FeatureFlagLoadFingerprint,SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideFABBtns()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
-        FeatureFlagLoadFingerprint.result!!.mutableMethod.addInstruction(
+        FeatureFlagLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.FSTS_DESCRIPTOR}->fabMenu()V"
-        )
+        ) ?: throw PatchException("FeatureFlagLoadFingerprint not found")
         //end
     }
 }
diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/HideImmersivePlayer.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/HideImmersivePlayer.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.featureFlag
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.featureFlag.fingerprints.FeatureFlagLoadFingerprint
@@ -21,10 +22,10 @@ class HideImmersivePlayer : BytecodePatch(
     setOf( FeatureFlagLoadFingerprint,SettingsStatusLoadFingerprint)
 ){
     override fun execute(context: BytecodeContext) {
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideImmersivePlayer()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
 
         FeatureFlagLoadFingerprint.result!!.mutableMethod.addInstruction(
             0,

diff --git a/src/main/kotlin/crimera/patches/twitter/featureFlag/RemoveViewCountPatch.kt b/src/main/kotlin/crimera/patches/twitter/featureFlag/RemoveViewCountPatch.kt
@@ -3,6 +3,7 @@ package crimera.patches.twitter.featureFlag
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import crimera.patches.twitter.featureFlag.fingerprints.FeatureFlagLoadFingerprint
@@ -26,10 +27,10 @@ object RemoveViewCountPatch: BytecodePatch(
             "${SettingsPatch.FSTS_DESCRIPTOR}->viewCount()V"
         )
 
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->hideViewCount()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
     }
 
 }
diff --git a/...n/crimera/patches/twitter/interaction/downloads/changedirectory/ChangeDownloadDirPatch.kt b/...n/crimera/patches/twitter/interaction/downloads/changedirectory/ChangeDownloadDirPatch.kt
@@ -49,9 +49,9 @@ object ChangeDownloadDirPatch: BytecodePatch(
             move-result-object p1
         """.trimIndent())
 
-        SettingsStatusLoadFingerprint.result!!.mutableMethod.addInstruction(
+        SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "${SettingsPatch.SSTS_DESCRIPTOR}->enableDownloadFolder()V"
-        )
+        ) ?: throw PatchException("SettingsStatusLoadFingerprint not found")
     }
 }