majjo/XSnap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Multiple crashes

Browse Source
This commit is contained in:
ΞTΞRNAL
2025-10-09 14:03:57 +05:30
parent a25b66a385
commit d832ffcac4
6 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt
View File

@@ -259,7 +259,7 @@ class BridgeClient(
fun setAllScopeNotes(notes: Map<String, String>) = safeServiceCall { service.setAllScopeNotes(notes) }
fun getScriptingInterface(): IScripting = safeServiceCall { service.scriptingInterface }
fun getScriptingInterface(): IScripting? = safeServiceCall<IScripting?> { service.scriptingInterface }
fun getE2eeInterface(): E2eeInterface = safeServiceCall { service.e2eeInterface }

2
core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/ui/FriendNotes.kt
View File

@@ -63,7 +63,7 @@ class FriendNotes: Feature("Friend Notes") {
EditNoteTextField(
modifier = Modifier.padding(top = 8.dp),
primaryColor = primaryColor,
translation = context.translation,
placeholder = context.translation["features.friend_notes.placeholder"],
content = scopeNotes,
setContent = { scopeNotes = it }
)

38
core/src/main/kotlin/me/rhunk/snapenhance/core/scripting/CoreScriptRuntime.kt
View File

@@ -31,30 +31,32 @@ class CoreScriptRuntime(
}
modContext.bridgeClient.addOnConnectedCallback(initNow = true) {
scripting = modContext.bridgeClient.getScriptingInterface()
modContext.bridgeClient.getScriptingInterface()?.let { scriptingInterface ->
scripting = scriptingInterface
if (!isBridgeReloaded) {
scripting.enabledScripts.forEach { path ->
runCatching {
load(path, scripting.getScriptContent(path))
}.onFailure {
logger.error("Failed to load script $path", it)
if (!isBridgeReloaded) {
scriptingInterface.enabledScripts.forEach { path ->
runCatching {
load(path, scriptingInterface.getScriptContent(path))
}.onFailure {
logger.error("Failed to load script $path", it)
}
}
}
}
scripting.registerAutoReloadListener(object : AutoReloadListener.Stub() {
override fun restartApp() {
modContext.softRestartApp()
scriptingInterface.registerAutoReloadListener(object : AutoReloadListener.Stub() {
override fun restartApp() {
modContext.softRestartApp()
}
})
eachModule {
onBridgeConnected(reloaded = isBridgeReloaded)
}
})
eachModule {
onBridgeConnected(reloaded = isBridgeReloaded)
}
if (!isBridgeReloaded) {
isBridgeReloaded = true
if (!isBridgeReloaded) {
isBridgeReloaded = true
}
}
}
}