Skip to content

Commit 4adf69a

Browse files
committed
fix: remove illegal characters in bundled appinfo constant names
1 parent a8e86f1 commit 4adf69a

3 files changed

Lines changed: 21 additions & 23 deletions

File tree

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/AppInfo.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ data class AppInfo(
3838
fun toJson() = jsonModule.encodeToString(this)
3939

4040
object Bundled {
41-
val `Linux/39038` = AppInfo(
41+
val Linux_39038 = AppInfo(
4242
os = "Linux",
4343
kernel = "Linux",
4444
vendorOs = "linux",
@@ -56,6 +56,6 @@ data class AppInfo(
5656
ntLoginType = 1
5757
)
5858

59-
val Linux = `Linux/39038`
59+
val Linux = Linux_39038
6060
}
6161
}

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/android/AndroidAppInfo.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class AndroidAppInfo(
6565
fun toJson() = jsonModule.encodeToString(this)
6666

6767
object Bundled {
68-
val `AndroidPhone/9.1.60` = AndroidAppInfo(
68+
val AndroidPhone_9_1_60 = AndroidAppInfo(
6969
os = "Android",
7070
vendorOs = "android",
7171
qua = "V1_AND_SQ_9.1.60_9388_YYB_D",
@@ -89,7 +89,7 @@ class AndroidAppInfo(
8989
appClientVersion = 0
9090
)
9191

92-
val `AndroidPad/9.1.60` = AndroidAppInfo(
92+
val AndroidPad_9_1_60 = AndroidAppInfo(
9393
os = "ANDROID",
9494
vendorOs = "android",
9595
qua = "V1_AND_SQ_9.1.60_9388_YYB_D",
@@ -113,7 +113,7 @@ class AndroidAppInfo(
113113
appClientVersion = 0
114114
)
115115

116-
val `AndroidPhone/9.1.70` = AndroidAppInfo(
116+
val AndroidPhone_9_1_70 = AndroidAppInfo(
117117
os = "Android",
118118
vendorOs = "android",
119119
qua = "V1_AND_SQ_9.1.70_9898_YYB_D",
@@ -137,7 +137,7 @@ class AndroidAppInfo(
137137
appClientVersion = 0
138138
)
139139

140-
val `AndroidPad/9.1.70` = AndroidAppInfo(
140+
val AndroidPad_9_1_70 = AndroidAppInfo(
141141
os = "ANDROID",
142142
vendorOs = "android",
143143
qua = "V1_AND_SQ_9.1.70_9898_YYB_D",
@@ -161,7 +161,7 @@ class AndroidAppInfo(
161161
appClientVersion = 0
162162
)
163163

164-
val `AndroidPhone/9.2.0` = AndroidAppInfo(
164+
val AndroidPhone_9_2_0 = AndroidAppInfo(
165165
os = "Android",
166166
vendorOs = "android",
167167
qua = "V1_AND_SQ_9.2.0_10970_YYB_D",
@@ -185,7 +185,7 @@ class AndroidAppInfo(
185185
appClientVersion = 0
186186
)
187187

188-
val `AndroidPad/9.2.0` = AndroidAppInfo(
188+
val AndroidPad_9_2_0 = AndroidAppInfo(
189189
os = "ANDROID",
190190
vendorOs = "android",
191191
qua = "V1_AND_SQ_9.2.0_10970_YYB_D",
@@ -209,7 +209,7 @@ class AndroidAppInfo(
209209
appClientVersion = 0
210210
)
211211

212-
val `AndroidPhone/9.2.20` = AndroidAppInfo(
212+
val AndroidPhone_9_2_20 = AndroidAppInfo(
213213
os = "Android",
214214
vendorOs = "android",
215215
qua = "V1_AND_SQ_9.2.20_11650_YYB_D",
@@ -233,7 +233,7 @@ class AndroidAppInfo(
233233
appClientVersion = 0
234234
)
235235

236-
val `AndroidPad/9.2.20` = AndroidAppInfo(
236+
val AndroidPad_9_2_20 = AndroidAppInfo(
237237
os = "ANDROID",
238238
vendorOs = "android",
239239
qua = "V1_AND_SQ_9.2.20_11650_YYB_D",
@@ -257,8 +257,8 @@ class AndroidAppInfo(
257257
appClientVersion = 0
258258
)
259259

260-
val AndroidPhone = `AndroidPhone/9.2.20`
260+
val AndroidPhone = AndroidPhone_9_2_20
261261

262-
val AndroidPad = `AndroidPad/9.2.20`
262+
val AndroidPad = AndroidPad_9_2_20
263263
}
264264
}

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/AppInfo.kt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@ package org.ntqqrev.yogurt
22

33
import org.ntqqrev.acidify.common.AppInfo
44
import org.ntqqrev.acidify.common.android.AndroidAppInfo
5-
import org.ntqqrev.acidify.common.android.AndroidAppInfo.Sig
6-
import org.ntqqrev.acidify.common.android.AndroidAppInfo.WtLoginSdkInfo
75

86

97
val bundledPCAppInfo = mapOf(
10-
"Linux/39038" to AppInfo.Bundled.`Linux/39038`,
8+
"Linux/39038" to AppInfo.Bundled.Linux_39038,
119
)
1210

1311
val bundledAndroidAppInfo = mapOf(
14-
"AndroidPhone/9.1.60" to AndroidAppInfo.Bundled.`AndroidPhone/9.1.60`,
15-
"AndroidPad/9.1.60" to AndroidAppInfo.Bundled.`AndroidPad/9.1.60`,
16-
"AndroidPhone/9.1.70" to AndroidAppInfo.Bundled.`AndroidPhone/9.1.70`,
17-
"AndroidPad/9.1.70" to AndroidAppInfo.Bundled.`AndroidPad/9.1.70`,
18-
"AndroidPhone/9.2.0" to AndroidAppInfo.Bundled.`AndroidPhone/9.2.0`,
19-
"AndroidPad/9.2.0" to AndroidAppInfo.Bundled.`AndroidPad/9.2.0`,
20-
"AndroidPhone/9.2.20" to AndroidAppInfo.Bundled.`AndroidPhone/9.2.20`,
21-
"AndroidPad/9.2.20" to AndroidAppInfo.Bundled.`AndroidPad/9.2.20`,
12+
"AndroidPhone/9.1.60" to AndroidAppInfo.Bundled.AndroidPhone_9_1_60,
13+
"AndroidPad/9.1.60" to AndroidAppInfo.Bundled.AndroidPad_9_1_60,
14+
"AndroidPhone/9.1.70" to AndroidAppInfo.Bundled.AndroidPhone_9_1_70,
15+
"AndroidPad/9.1.70" to AndroidAppInfo.Bundled.AndroidPad_9_1_70,
16+
"AndroidPhone/9.2.0" to AndroidAppInfo.Bundled.AndroidPhone_9_2_0,
17+
"AndroidPad/9.2.0" to AndroidAppInfo.Bundled.AndroidPad_9_2_0,
18+
"AndroidPhone/9.2.20" to AndroidAppInfo.Bundled.AndroidPhone_9_2_20,
19+
"AndroidPad/9.2.20" to AndroidAppInfo.Bundled.AndroidPad_9_2_20,
2220
)

0 commit comments

Comments
 (0)