Skip to content

Commit 068d029

Browse files
refactor: Use notNull delegate to prevent wasting more time in the future
1 parent 0c19dba commit 068d029

File tree

2 files changed

+37
-31
lines changed

2 files changed

+37
-31
lines changed

patches/src/main/kotlin/app/revanced/patches/music/playservice/VersionCheckPatch.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ package app.revanced.patches.music.playservice
44

55
import app.revanced.patcher.patch.resourcePatch
66
import app.revanced.util.findPlayStoreServicesVersion
7+
import kotlin.properties.Delegates
78

8-
var is_7_33_or_greater = false
9+
// Use notNull delegate so an exception is thrown if these fields are accessed before they are set.
10+
11+
var is_7_33_or_greater: Boolean by Delegates.notNull()
912
private set
10-
var is_8_10_or_greater = false
13+
var is_8_10_or_greater: Boolean by Delegates.notNull()
1114
private set
12-
var is_8_11_or_greater = false
15+
var is_8_11_or_greater: Boolean by Delegates.notNull()
1316
private set
14-
var is_8_15_or_greater = false
17+
var is_8_15_or_greater: Boolean by Delegates.notNull()
1518
private set
1619

1720
val versionCheckPatch = resourcePatch(

patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,75 @@ package app.revanced.patches.youtube.misc.playservice
44

55
import app.revanced.patcher.patch.resourcePatch
66
import app.revanced.util.findPlayStoreServicesVersion
7+
import kotlin.properties.Delegates
8+
9+
// Use notNull delegate so an exception is thrown if these fields are accessed before they are set.
710

811
@Deprecated("19.34.42 is the lowest supported version")
9-
var is_19_03_or_greater = false
12+
var is_19_03_or_greater : Boolean by Delegates.notNull()
1013
private set
1114
@Deprecated("19.34.42 is the lowest supported version")
12-
var is_19_04_or_greater = false
15+
var is_19_04_or_greater : Boolean by Delegates.notNull()
1316
private set
1417
@Deprecated("19.34.42 is the lowest supported version")
15-
var is_19_16_or_greater = false
18+
var is_19_16_or_greater : Boolean by Delegates.notNull()
1619
private set
1720
@Deprecated("19.34.42 is the lowest supported version")
18-
var is_19_17_or_greater = false
21+
var is_19_17_or_greater : Boolean by Delegates.notNull()
1922
private set
2023
@Deprecated("19.34.42 is the lowest supported version")
21-
var is_19_18_or_greater = false
24+
var is_19_18_or_greater : Boolean by Delegates.notNull()
2225
private set
2326
@Deprecated("19.34.42 is the lowest supported version")
24-
var is_19_23_or_greater = false
27+
var is_19_23_or_greater : Boolean by Delegates.notNull()
2528
private set
2629
@Deprecated("19.34.42 is the lowest supported version")
27-
var is_19_25_or_greater = false
30+
var is_19_25_or_greater : Boolean by Delegates.notNull()
2831
private set
2932
@Deprecated("19.34.42 is the lowest supported version")
30-
var is_19_26_or_greater = false
33+
var is_19_26_or_greater : Boolean by Delegates.notNull()
3134
private set
3235
@Deprecated("19.34.42 is the lowest supported version")
33-
var is_19_29_or_greater = false
36+
var is_19_29_or_greater : Boolean by Delegates.notNull()
3437
private set
3538
@Deprecated("19.34.42 is the lowest supported version")
36-
var is_19_32_or_greater = false
39+
var is_19_32_or_greater : Boolean by Delegates.notNull()
3740
private set
3841
@Deprecated("19.34.42 is the lowest supported version")
39-
var is_19_33_or_greater = false
42+
var is_19_33_or_greater : Boolean by Delegates.notNull()
4043
private set
4144
@Deprecated("19.34.42 is the lowest supported version")
42-
var is_19_34_or_greater = false
45+
var is_19_34_or_greater : Boolean by Delegates.notNull()
4346
private set
44-
var is_19_35_or_greater = false
47+
var is_19_35_or_greater : Boolean by Delegates.notNull()
4548
private set
46-
var is_19_36_or_greater = false
49+
var is_19_36_or_greater : Boolean by Delegates.notNull()
4750
private set
48-
var is_19_41_or_greater = false
51+
var is_19_41_or_greater : Boolean by Delegates.notNull()
4952
private set
50-
var is_19_43_or_greater = false
53+
var is_19_43_or_greater : Boolean by Delegates.notNull()
5154
private set
52-
var is_19_46_or_greater = false
55+
var is_19_46_or_greater : Boolean by Delegates.notNull()
5356
private set
54-
var is_19_47_or_greater = false
57+
var is_19_47_or_greater : Boolean by Delegates.notNull()
5558
private set
56-
var is_19_49_or_greater = false
59+
var is_19_49_or_greater : Boolean by Delegates.notNull()
5760
private set
58-
var is_20_02_or_greater = false
61+
var is_20_02_or_greater : Boolean by Delegates.notNull()
5962
private set
60-
var is_20_03_or_greater = false
63+
var is_20_03_or_greater : Boolean by Delegates.notNull()
6164
private set
62-
var is_20_05_or_greater = false
65+
var is_20_05_or_greater : Boolean by Delegates.notNull()
6366
private set
64-
var is_20_07_or_greater = false
67+
var is_20_07_or_greater : Boolean by Delegates.notNull()
6568
private set
66-
var is_20_09_or_greater = false
69+
var is_20_09_or_greater : Boolean by Delegates.notNull()
6770
private set
68-
var is_20_10_or_greater = false
71+
var is_20_10_or_greater : Boolean by Delegates.notNull()
6972
private set
70-
var is_20_14_or_greater = false
73+
var is_20_14_or_greater : Boolean by Delegates.notNull()
7174
private set
72-
var is_20_15_or_greater = false
75+
var is_20_15_or_greater : Boolean by Delegates.notNull()
7376
private set
7477

7578
val versionCheckPatch = resourcePatch(

0 commit comments

Comments
 (0)