commit 8bdd7a16b4b940e2af0deeb54a5d7f394163888c parent f0c34e27bb914a08c0b5e29482b1d9c625d9a464 Author: rhunk <101876869+rhunk@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:26:40 +0200 fix(scripting): remove reload listener for now Diffstat:
6 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/scripting/RemoteScriptManager.kt b/app/src/main/kotlin/me/rhunk/snapenhance/scripting/RemoteScriptManager.kt @@ -5,7 +5,6 @@ import androidx.documentfile.provider.DocumentFile import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.bridge.scripting.IPCListener import me.rhunk.snapenhance.bridge.scripting.IScripting -import me.rhunk.snapenhance.bridge.scripting.ReloadListener import me.rhunk.snapenhance.scripting.type.ModuleInfo import java.io.InputStream @@ -14,7 +13,6 @@ class RemoteScriptManager( ) : IScripting.Stub() { val runtime = ScriptRuntime(context.log, context.androidContext.classLoader) - private val reloadListeners = mutableListOf<ReloadListener>() private val cachedModuleInfo = mutableMapOf<String, ModuleInfo>() private val ipcListeners = IPCListeners() @@ -80,10 +78,6 @@ class RemoteScriptManager( return getScriptInputStream(moduleName) { it?.bufferedReader()?.readText() } } - override fun registerReloadListener(listener: ReloadListener) { - reloadListeners.add(listener) - } - override fun registerIPCListener(channel: String, eventName: String, listener: IPCListener) { ipcListeners.getOrPut(channel) { mutableMapOf() }.getOrPut(eventName) { mutableSetOf() }.add(listener) } diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/scripting/ScriptsSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/scripting/ScriptsSection.kt @@ -2,6 +2,7 @@ package me.rhunk.snapenhance.ui.manager.sections.scripting import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn @@ -73,7 +74,9 @@ class ScriptsSection : Section() { context.modDatabase.getScripts() } - LazyColumn { + LazyColumn( + modifier = Modifier.fillMaxSize() + ) { item { if (scriptModules.isEmpty()) { Text( diff --git a/core/src/main/aidl/me/rhunk/snapenhance/bridge/scripting/IScripting.aidl b/core/src/main/aidl/me/rhunk/snapenhance/bridge/scripting/IScripting.aidl @@ -1,6 +1,5 @@ package me.rhunk.snapenhance.bridge.scripting; -import me.rhunk.snapenhance.bridge.scripting.ReloadListener; import me.rhunk.snapenhance.bridge.scripting.IPCListener; interface IScripting { @@ -8,8 +7,6 @@ interface IScripting { @nullable String getScriptContent(String path); - void registerReloadListener(ReloadListener listener); - void registerIPCListener(String channel, String eventName, IPCListener listener); void sendIPCMessage(String channel, String eventName, in String[] args); diff --git a/core/src/main/aidl/me/rhunk/snapenhance/bridge/scripting/ReloadListener.aidl b/core/src/main/aidl/me/rhunk/snapenhance/bridge/scripting/ReloadListener.aidl @@ -1,5 +0,0 @@ -package me.rhunk.snapenhance.bridge.scripting; - -oneway interface ReloadListener { - void reloadScript(String path, String content); -} diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt b/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt @@ -7,8 +7,6 @@ import android.content.pm.PackageManager import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import me.rhunk.snapenhance.bridge.SyncCallback -import me.rhunk.snapenhance.bridge.scripting.IPCListener -import me.rhunk.snapenhance.bridge.scripting.ReloadListener import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.bridge.BridgeClient @@ -21,8 +19,6 @@ import me.rhunk.snapenhance.data.SnapClassCache import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker import me.rhunk.snapenhance.hook.hook -import me.rhunk.snapenhance.scripting.IPCInterface -import me.rhunk.snapenhance.scripting.Listener import kotlin.time.ExperimentalTime import kotlin.time.measureTime diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/scripting/core/CoreScriptRuntime.kt b/core/src/main/kotlin/me/rhunk/snapenhance/scripting/core/CoreScriptRuntime.kt @@ -2,7 +2,6 @@ package me.rhunk.snapenhance.scripting.core import me.rhunk.snapenhance.bridge.scripting.IPCListener import me.rhunk.snapenhance.bridge.scripting.IScripting -import me.rhunk.snapenhance.bridge.scripting.ReloadListener import me.rhunk.snapenhance.core.logger.AbstractLogger import me.rhunk.snapenhance.scripting.IPCInterface import me.rhunk.snapenhance.scripting.Listener @@ -17,12 +16,6 @@ class CoreScriptRuntime( fun connect(scriptingInterface: IScripting) { scriptingInterface.apply { - registerReloadListener(object: ReloadListener.Stub() { - override fun reloadScript(path: String, content: String) { - reload(path, content) - } - }) - buildModuleObject = { module -> putConst("ipc", this, object: IPCInterface() { override fun onBroadcast(channel: String, eventName: String, listener: Listener) {