From ab09b95d5a1abe3aa6278a6f7eebe1635f7e446f Mon Sep 17 00:00:00 2001 From: andreas-byfut <356109509+andreas-byfut@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:46:36 +0100 Subject: [PATCH] fix(host): keep per-host overrides from becoming the app-wide default The app-wide terminal profile and colour scheme are the lowest-id rows, and Settings only inserts them on the first edit. Creating a host's first override before that inserted it as the lowest-id row, so every host picked it up as the default. insertOverride() on both DAOs now writes the default row first when it is missing, then the override, in one transaction. --- .../shellwave/core/db/dao/ColorSchemeDao.kt | 17 ++++ .../core/db/dao/TerminalProfileDao.kt | 17 ++++ .../feature/host/AddEditHostScreen.kt | 7 +- .../feature/host/InsertOverrideTest.kt | 84 +++++++++++++++++++ 4 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 app/src/test/java/io/github/lordofpolls/shellwave/feature/host/InsertOverrideTest.kt diff --git a/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/ColorSchemeDao.kt b/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/ColorSchemeDao.kt index bfdefc9..383402a 100644 --- a/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/ColorSchemeDao.kt +++ b/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/ColorSchemeDao.kt @@ -4,8 +4,10 @@ import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.Query +import androidx.room.Transaction import androidx.room.Update import io.github.lordofpolls.shellwave.core.db.entities.ColorSchemeEntity +import io.github.lordofpolls.shellwave.terminal.DEFAULT_COLOR_SCHEME import kotlinx.coroutines.flow.Flow @Dao @@ -30,4 +32,19 @@ interface ColorSchemeDao { @Delete suspend fun delete(scheme: ColorSchemeEntity) + + /** + * Inserts a new per-host row and returns it. + * + * The app-wide default is the lowest-id row and Settings only inserts it on the first edit, so + * a row inserted into an empty table would become the default for every host. The default is + * therefore written first when missing. One transaction keeps two quick calls from inserting + * two defaults. + */ + @Transaction + suspend fun insertOverride(): ColorSchemeEntity { + if (getDefault() == null) insert(DEFAULT_COLOR_SCHEME.copy(id = 0)) + val fresh = DEFAULT_COLOR_SCHEME.copy(id = 0, name = "Custom") + return fresh.copy(id = insert(fresh)) + } } diff --git a/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/TerminalProfileDao.kt b/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/TerminalProfileDao.kt index 49dbf2a..7071e26 100644 --- a/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/TerminalProfileDao.kt +++ b/app/src/main/java/io/github/lordofpolls/shellwave/core/db/dao/TerminalProfileDao.kt @@ -4,8 +4,10 @@ import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.Query +import androidx.room.Transaction import androidx.room.Update import io.github.lordofpolls.shellwave.core.db.entities.TerminalProfileEntity +import io.github.lordofpolls.shellwave.terminal.DEFAULT_TERMINAL_PROFILE import kotlinx.coroutines.flow.Flow @Dao @@ -30,4 +32,19 @@ interface TerminalProfileDao { @Delete suspend fun delete(profile: TerminalProfileEntity) + + /** + * Inserts a new per-host row and returns it. + * + * The app-wide default is the lowest-id row and Settings only inserts it on the first edit, so + * a row inserted into an empty table would become the default for every host. The default is + * therefore written first when missing. One transaction keeps two quick calls from inserting + * two defaults. + */ + @Transaction + suspend fun insertOverride(): TerminalProfileEntity { + if (getDefault() == null) insert(DEFAULT_TERMINAL_PROFILE.copy(id = 0)) + val fresh = DEFAULT_TERMINAL_PROFILE.copy(id = 0, name = "Host override") + return fresh.copy(id = insert(fresh)) + } } diff --git a/app/src/main/java/io/github/lordofpolls/shellwave/feature/host/AddEditHostScreen.kt b/app/src/main/java/io/github/lordofpolls/shellwave/feature/host/AddEditHostScreen.kt index d728870..ba1ed3d 100644 --- a/app/src/main/java/io/github/lordofpolls/shellwave/feature/host/AddEditHostScreen.kt +++ b/app/src/main/java/io/github/lordofpolls/shellwave/feature/host/AddEditHostScreen.kt @@ -96,7 +96,6 @@ import io.github.lordofpolls.shellwave.ssh.publicKeyLineOf import io.github.lordofpolls.shellwave.ssh.readKeyText import io.github.lordofpolls.shellwave.ssh.resolveProxyHops import io.github.lordofpolls.shellwave.terminal.DEFAULT_COLOR_SCHEME -import io.github.lordofpolls.shellwave.terminal.DEFAULT_TERMINAL_PROFILE import io.github.lordofpolls.shellwave.ui.design.BackTopBar import io.github.lordofpolls.shellwave.ui.design.CollapsibleSection import io.github.lordofpolls.shellwave.ui.design.ColorPickerDialog @@ -217,8 +216,7 @@ fun AddEditHostScreen( fun enableProfileOverride() { overridesToggled = true scope.launch { - val fresh = DEFAULT_TERMINAL_PROFILE.copy(id = 0, name = "Host override") - terminalProfileOverride = fresh.copy(id = terminalProfileDao.insert(fresh)) + terminalProfileOverride = terminalProfileDao.insertOverride() } } @@ -237,8 +235,7 @@ fun AddEditHostScreen( fun enableSchemeOverride() { overridesToggled = true scope.launch { - val fresh = DEFAULT_COLOR_SCHEME.copy(id = 0, name = "Custom") - colorSchemeOverride = fresh.copy(id = colorSchemeDao.insert(fresh)) + colorSchemeOverride = colorSchemeDao.insertOverride() } } diff --git a/app/src/test/java/io/github/lordofpolls/shellwave/feature/host/InsertOverrideTest.kt b/app/src/test/java/io/github/lordofpolls/shellwave/feature/host/InsertOverrideTest.kt new file mode 100644 index 0000000..bdc0c87 --- /dev/null +++ b/app/src/test/java/io/github/lordofpolls/shellwave/feature/host/InsertOverrideTest.kt @@ -0,0 +1,84 @@ +package io.github.lordofpolls.shellwave.feature.host + +import io.github.lordofpolls.shellwave.core.db.dao.ColorSchemeDao +import io.github.lordofpolls.shellwave.core.db.dao.TerminalProfileDao +import io.github.lordofpolls.shellwave.core.db.entities.ColorSchemeEntity +import io.github.lordofpolls.shellwave.core.db.entities.TerminalProfileEntity +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.runBlocking +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotEquals +import org.junit.Test + +private class InMemoryProfileDao(val rows: MutableMap = mutableMapOf()) : + TerminalProfileDao { + private var nextId = 1L + + override suspend fun getAll(): List = rows.values.toList() + override suspend fun getDefault(): TerminalProfileEntity? = rows.minByOrNull { it.key }?.value + override fun observeDefault(): Flow = TODO() + override suspend fun getById(id: Long): TerminalProfileEntity? = rows[id] + override suspend fun insert(profile: TerminalProfileEntity): Long { + val id = nextId++ + rows[id] = profile.copy(id = id) + return id + } + override suspend fun update(profile: TerminalProfileEntity) = TODO() + override suspend fun delete(profile: TerminalProfileEntity) = TODO() +} + +private class InMemorySchemeDao(val rows: MutableMap = mutableMapOf()) : ColorSchemeDao { + private var nextId = 1L + + override suspend fun getAll(): List = rows.values.toList() + override suspend fun getDefault(): ColorSchemeEntity? = rows.minByOrNull { it.key }?.value + override fun observeDefault(): Flow = TODO() + override suspend fun getById(id: Long): ColorSchemeEntity? = rows[id] + override suspend fun insert(scheme: ColorSchemeEntity): Long { + val id = nextId++ + rows[id] = scheme.copy(id = id) + return id + } + override suspend fun update(scheme: ColorSchemeEntity) = TODO() + override suspend fun delete(scheme: ColorSchemeEntity) = TODO() +} + +class InsertOverrideTest { + + @Test + fun profileOverride_inEmptyTable_doesNotBecomeDefault() = runBlocking { + val dao = InMemoryProfileDao() + val override = dao.insertOverride() + assertNotEquals(override.id, dao.getDefault()?.id) + assertEquals("Default", dao.getDefault()?.name) + assertEquals(2, dao.rows.size) + } + + @Test + fun profileOverride_withExistingDefault_addsOnlyTheOverride() = runBlocking { + val dao = InMemoryProfileDao() + dao.insertOverride() + val defaultId = dao.getDefault()?.id + dao.insertOverride() + assertEquals(defaultId, dao.getDefault()?.id) + assertEquals(3, dao.rows.size) + } + + @Test + fun schemeOverride_inEmptyTable_doesNotBecomeDefault() = runBlocking { + val dao = InMemorySchemeDao() + val override = dao.insertOverride() + assertNotEquals(override.id, dao.getDefault()?.id) + assertEquals(2, dao.rows.size) + } + + @Test + fun schemeOverride_withExistingDefault_addsOnlyTheOverride() = runBlocking { + val dao = InMemorySchemeDao() + dao.insertOverride() + val defaultId = dao.getDefault()?.id + dao.insertOverride() + assertEquals(defaultId, dao.getDefault()?.id) + assertEquals(3, dao.rows.size) + } +}