From 068d029a0374595e2a61d753a34afeaee29aa21b Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Tue, 14 Oct 2025 15:43:05 +0400
Subject: [PATCH] refactor: Use notNull delegate to prevent wasting more time
 in the future

---
 .../music/playservice/VersionCheckPatch.kt    | 11 ++--
 .../misc/playservice/VersionCheckPatch.kt     | 57 ++++++++++---------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/patches/src/main/kotlin/app/revanced/patches/music/playservice/VersionCheckPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/playservice/VersionCheckPatch.kt
index b14d6b659..d923c954f 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/playservice/VersionCheckPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/playservice/VersionCheckPatch.kt
@@ -4,14 +4,17 @@ package app.revanced.patches.music.playservice
 
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.util.findPlayStoreServicesVersion
+import kotlin.properties.Delegates
 
-var is_7_33_or_greater = false
+// Use notNull delegate so an exception is thrown if these fields are accessed before they are set.
+
+var is_7_33_or_greater: Boolean by Delegates.notNull()
     private set
-var is_8_10_or_greater = false
+var is_8_10_or_greater: Boolean by Delegates.notNull()
     private set
-var is_8_11_or_greater = false
+var is_8_11_or_greater: Boolean by Delegates.notNull()
     private set
-var is_8_15_or_greater = false
+var is_8_15_or_greater: Boolean by Delegates.notNull()
     private set
 
 val versionCheckPatch = resourcePatch(
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
index fd713626d..133beddfb 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
@@ -4,72 +4,75 @@ package app.revanced.patches.youtube.misc.playservice
 
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.util.findPlayStoreServicesVersion
+import kotlin.properties.Delegates
+
+// Use notNull delegate so an exception is thrown if these fields are accessed before they are set.
 
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_03_or_greater = false
+var is_19_03_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_04_or_greater = false
+var is_19_04_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_16_or_greater = false
+var is_19_16_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_17_or_greater = false
+var is_19_17_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_18_or_greater = false
+var is_19_18_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_23_or_greater = false
+var is_19_23_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_25_or_greater = false
+var is_19_25_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_26_or_greater = false
+var is_19_26_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_29_or_greater = false
+var is_19_29_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_32_or_greater = false
+var is_19_32_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_33_or_greater = false
+var is_19_33_or_greater : Boolean by Delegates.notNull()
     private set
 @Deprecated("19.34.42 is the lowest supported version")
-var is_19_34_or_greater = false
+var is_19_34_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_35_or_greater = false
+var is_19_35_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_36_or_greater = false
+var is_19_36_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_41_or_greater = false
+var is_19_41_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_43_or_greater = false
+var is_19_43_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_46_or_greater = false
+var is_19_46_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_47_or_greater = false
+var is_19_47_or_greater : Boolean by Delegates.notNull()
     private set
-var is_19_49_or_greater = false
+var is_19_49_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_02_or_greater = false
+var is_20_02_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_03_or_greater = false
+var is_20_03_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_05_or_greater = false
+var is_20_05_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_07_or_greater = false
+var is_20_07_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_09_or_greater = false
+var is_20_09_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_10_or_greater = false
+var is_20_10_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_14_or_greater = false
+var is_20_14_or_greater : Boolean by Delegates.notNull()
     private set
-var is_20_15_or_greater = false
+var is_20_15_or_greater : Boolean by Delegates.notNull()
     private set
 
 val versionCheckPatch = resourcePatch(