From 907c3aaa46ad4ff3effea08fe3532edd243c1486 Mon Sep 17 00:00:00 2001 From: kalarina Date: Sat, 31 Oct 2026 11:32:10 +0200 Subject: [PATCH] Use the built-in server list directly --- app/src/main/java/cc/skysparkle/sparkledns/Providers.kt | 6 ++---- .../main/java/cc/skysparkle/sparkledns/SettingsScreen.kt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt index e686d4b..356f859 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt @@ -45,12 +45,10 @@ object Providers { ), ) - val list: List get() = builtIn - // The project's own server stays the default whatever order the list uses - val default: DohProvider get() = list.firstOrNull { it.id == DEFAULT_ID } ?: list.first() + val default: DohProvider = builtIn.firstOrNull { it.id == DEFAULT_ID } ?: builtIn.first() - fun byId(id: String): DohProvider = list.firstOrNull { it.id == id } ?: default + fun byId(id: String): DohProvider = builtIn.firstOrNull { it.id == id } ?: default } fun parseIps(raw: String): List = diff --git a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt index c60b353..b75988b 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt @@ -122,7 +122,7 @@ fun SettingsScreen( SectionLabel(stringResource(R.string.servers), Modifier.padding(top = 8.dp)) Column(Modifier.fillMaxWidth().appCard()) { - Providers.list.forEachIndexed { index, provider -> + Providers.builtIn.forEachIndexed { index, provider -> if (index > 0) ListDivider() ServerRow( title = provider.name,