Skip to content

refactor(app): unify log appending and remove dead code #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
primalkz merged 1 commit into from
Apr 7, 2026
Merged

refactor(app): unify log appending and remove dead code #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions app/src/main/java/org/akuatech/ksupatcher/viewmodel/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,15 +698,6 @@ class MainViewModel(
}
}

private fun appendLogLine(existing: String?, message: String): String {
val combined = if (existing.isNullOrBlank()) {
message
} else {
"$existing\n$message"
}
return if (combined.length > MAX_LOG_CHARS) combined.takeLast(MAX_LOG_CHARS) else combined
}

private fun publishStreamingLog(log: String, updatePatch: Boolean) {
_state.update { state ->
val trimmed = if (log.length > MAX_LOG_CHARS) log.takeLast(MAX_LOG_CHARS) else log
Expand Down Expand Up @@ -769,11 +760,19 @@ class MainViewModel(
private suspend fun executeOtaFlow(lkmMode: Boolean) {
fun appendLog(msg: String) {
_state.update { state ->
val sb = StringBuilder()
val existing = if (lkmMode) state.patchState.lastOutput else state.otaState.log
if (!existing.isNullOrBlank()) {
appendTrimmed(sb, existing)
appendTrimmed(sb, "\n")
}
appendTrimmed(sb, msg)
val output = sb.toString()

if (lkmMode) {
val newOutput = appendLogLine(state.patchState.lastOutput, msg)
state.copy(patchState = state.patchState.copy(lastOutput = newOutput))
state.copy(patchState = state.patchState.copy(lastOutput = output))
} else {
state.copy(otaState = state.otaState.copy(log = appendLogLine(state.otaState.log, msg)))
state.copy(otaState = state.otaState.copy(log = output))
}
}
}
Expand Down
Loading