From ddf1edb35dcc216cd1377300c097470796f6e3ba Mon Sep 17 00:00:00 2001 From: rhunk <101876869+rhunk@users.noreply.github.com> Date: Sun, 28 Apr 2024 18:02:52 +0200 Subject: [PATCH] fix(composer_hooks): log crash --- .../kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt | 2 ++ .../snapenhance/core/features/impl/experiments/ComposerHooks.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt index 84fef959..4c78b017 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt @@ -6,6 +6,7 @@ import android.content.Context import android.content.Intent import android.content.ServiceConnection import android.os.* +import android.util.Log import de.robv.android.xposed.XposedHelpers import me.rhunk.snapenhance.bridge.AccountStorage import me.rhunk.snapenhance.bridge.BridgeInterface @@ -108,6 +109,7 @@ class BridgeClient( return runCatching { block() }.getOrElse { + Log.e("SnapEnhance", "service call failed", it) if (it is DeadObjectException) { context.softRestartApp() } diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt index 3313d66b..76470671 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt @@ -167,7 +167,7 @@ class ComposerHooks: Feature("ComposerHooks", loadParams = FeatureLoadParams.ACT "log" -> { if (argc < 3) return false val logLevel = composerMarshaller.getUntyped(1) as? String ?: return false - val message = composerMarshaller.getUntyped(2) as? String ?: return false + val message = (composerMarshaller.getUntyped(2) as? String)?.takeIf { it.length < 1024 * 512 } ?: return false val tag = "ComposerLogs"