SheWhoReignsSupreme/GoonXposed
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Revert bundle url to Bunny, various http changes

Browse source
This commit is contained in:
amsyarasyiq 2024-04-03 07:14:31 +08:00
parent 2261501ffe
commit c639b3c36b
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/kotlin/io/github/pyoncord/xposed/FontsModule.kt
View file

@ -142,7 +142,6 @@ class FontsModule: PyonModule() {
Typeface.createFromAsset(assetManager, fileName)
} catch (e: java.lang.RuntimeException) {
// If the typeface asset does not exist, try another extension.
XposedBridge.log("(under) acquiring $fileName font failed ${e.cause}")
continue
}
}

14
app/src/main/kotlin/io/github/pyoncord/xposed/Main.kt
View file

@ -33,7 +33,8 @@ class Main : IXposedHookLoadPackage {
private val pyonModules: Array<PyonModule> = arrayOf(
ThemeModule(),
SysColorsModule(),
FontsModule()
FontsModule(),
// BubbleModule()
)
fun buildLoaderJsonString(): String {
@ -100,13 +101,15 @@ class Main : IXposedHookLoadPackage {
val httpJob = scope.async(Dispatchers.IO) {
try {
val client = HttpClient(CIO) {
install(HttpTimeout) { requestTimeoutMillis = 3000 }
if (bundle.exists()) install(HttpTimeout) {
requestTimeoutMillis = 3000
}
install(UserAgent) { agent = "PyoncordXposed" }
}
val url =
if (config.customLoadUrl.enabled) config.customLoadUrl.url
else "https://raw.githubusercontent.com/pyoncord/builds/main/pyoncord.js"
else "https://cdn.jsdelivr.net/gh/pyoncord/detta-builds@main/bunny.js"
val response: HttpResponse = client.get(url) {
headers {
@ -118,7 +121,8 @@ class Main : IXposedHookLoadPackage {
if (response.status == HttpStatusCode.OK) {
bundle.writeBytes(response.body())
response.headers["Etag"]?.let { etag.writeText(it) }
if (response.headers["Etag"] != null) etag.writeText(response.headers["Etag"]!!)
else if (etag.exists()) etag.delete()
}
return@async
@ -148,7 +152,7 @@ class Main : IXposedHookLoadPackage {
)
}
if (bundle.exists()) XposedBridge.invokeOriginalMethod(
XposedBridge.invokeOriginalMethod(
loadScriptFromFile,
param.thisObject,
arrayOf(bundle.absolutePath, bundle.absolutePath, param.args[2])