Get the Skysparkle key only by signing in

Remove manual key entry from settings and the first-launch guide. When a
key is present, settings show its first characters and can copy the
full address for use in a browser or on another device.
This commit is contained in:
2026-11-18 14:31:34 +02:00
parent 005768f18a
commit 361d82a4ed
8 changed files with 88 additions and 84 deletions
@@ -129,14 +129,6 @@ fun OnboardingScreen(onDone: () -> Unit) {
Step(1, stringResource(R.string.onb_key_step1)) Step(1, stringResource(R.string.onb_key_step1))
Step(2, stringResource(R.string.onb_key_step2)) Step(2, stringResource(R.string.onb_key_step2))
Step(3, stringResource(R.string.onb_key_step3)) Step(3, stringResource(R.string.onb_key_step3))
Spacer(Modifier.height(4.dp))
Column(Modifier.fillMaxWidth().appCard().padding(top = 16.dp)) {
KeyField(
value = keyInput,
valid = keyValid,
onChange = { keyInput = it },
)
}
} }
} }
} }
@@ -148,12 +140,16 @@ fun OnboardingScreen(onDone: () -> Unit) {
modifier = Modifier.fillMaxWidth().height(52.dp), modifier = Modifier.fillMaxWidth().height(52.dp),
) { Text(stringResource(R.string.onb_next), fontWeight = FontWeight.Bold) } ) { Text(stringResource(R.string.onb_next), fontWeight = FontWeight.Bold) }
} else { } else {
Button( // The key comes only from signing in; a successful sign-in closes the guide by itself
onClick = { finish(useKey = true) }, if (keyValid) {
enabled = keyValid, Button(
shape = RoundedCornerShape(16.dp), onClick = { finish(useKey = true) },
modifier = Modifier.fillMaxWidth().height(52.dp), shape = RoundedCornerShape(16.dp),
) { Text(stringResource(R.string.onb_done), fontWeight = FontWeight.Bold) } modifier = Modifier.fillMaxWidth().height(52.dp),
) { Text(stringResource(R.string.onb_done), fontWeight = FontWeight.Bold) }
} else {
SignInButton(again = false, shape = RoundedCornerShape(16.dp), modifier = Modifier.fillMaxWidth().height(52.dp))
}
TextButton(onClick = { finish(useKey = false) }, modifier = Modifier.fillMaxWidth()) { TextButton(onClick = { finish(useKey = false) }, modifier = Modifier.fillMaxWidth()) {
Text(stringResource(R.string.onb_skip), color = Palette.Fg3) Text(stringResource(R.string.onb_skip), color = Palette.Fg3)
} }
@@ -1,5 +1,11 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.content.ClipData
import android.content.ClipDescription
import android.content.ClipboardManager
import android.content.Context
import android.os.Build
import android.os.PersistableBundle
import android.widget.Toast import android.widget.Toast
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
@@ -29,6 +35,7 @@ import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@@ -41,6 +48,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@@ -83,7 +91,6 @@ fun SettingsScreen(
val isCustom = selected == Providers.CUSTOM_ID val isCustom = selected == Providers.CUSTOM_ID
val customValid = remember(customUrl) { customUrl.trim().toHttpUrlOrNull()?.isHttps == true } val customValid = remember(customUrl) { customUrl.trim().toHttpUrlOrNull()?.isHttps == true }
val keyValid = remember(keyInput) { SkysparkleKey.parse(keyInput) != null }
val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3, keyInput) { prefs.resolve() } val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3, keyInput) { prefs.resolve() }
val canConnect = selectedProvider.url.toHttpUrlOrNull()?.isHttps == true val canConnect = selectedProvider.url.toHttpUrlOrNull()?.isHttps == true
@@ -138,16 +145,7 @@ fun SettingsScreen(
) )
if (provider.id == Providers.DEFAULT_ID) { if (provider.id == Providers.DEFAULT_ID) {
AnimatedVisibility(visible = selected == Providers.DEFAULT_ID, enter = Motion.expandIn, exit = Motion.collapseOut) { AnimatedVisibility(visible = selected == Providers.DEFAULT_ID, enter = Motion.expandIn, exit = Motion.collapseOut) {
KeyField( KeyField(key = keyInput)
value = keyInput,
valid = keyValid,
onChange = {
keyInput = it
// Saved as the bare key, also when the whole address was pasted
prefs.skysparkleKey = SkysparkleKey.parse(it) ?: it.trim()
testResult = null
},
)
} }
} }
} }
@@ -279,48 +277,64 @@ fun SettingsScreen(
} }
} }
// Access key for the Skysparkle server: sign in to get it automatically, or paste one by hand // Access key for the Skysparkle server. It comes only from signing in; the address can be
// copied to use the same key in a browser or on another device
@Composable @Composable
internal fun KeyField(value: String, valid: Boolean, onChange: (String) -> Unit, modifier: Modifier = Modifier) { internal fun KeyField(key: String, modifier: Modifier = Modifier) {
val context = LocalContext.current val context = LocalContext.current
val signIn by SkysparkleSignIn.state.collectAsStateWithLifecycle() val hasKey = SkysparkleKey.parse(key) != null
val working = signIn == SkysparkleSignIn.State.Waiting || signIn == SkysparkleSignIn.State.Exchanging
val showError = value.isNotBlank() && !valid
Column( Column(
modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp), modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
verticalArrangement = Arrangement.spacedBy(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp),
) { ) {
Button( if (hasKey) {
onClick = { SkysparkleSignIn.start(context) }, Row(verticalAlignment = Alignment.CenterVertically) {
enabled = !working, Text(
shape = RoundedCornerShape(14.dp), stringResource(R.string.key_status, key.take(4)),
modifier = Modifier.fillMaxWidth(), color = Palette.Fg2,
) { fontSize = 13.sp,
if (working) { modifier = Modifier.weight(1f),
CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp, color = LocalContentColor.current) )
Spacer(Modifier.width(10.dp)) TextButton(onClick = { copyKeyAddress(context, key) }) {
Text(stringResource(R.string.key_copy))
}
} }
Text(stringResource(if (working) R.string.sign_in_working else if (valid) R.string.sign_in_again else R.string.sign_in))
} }
Text(stringResource(R.string.key_or_paste), color = Palette.Fg3, fontSize = 12.sp, modifier = Modifier.padding(top = 6.dp)) SignInButton(again = hasKey, modifier = Modifier.fillMaxWidth())
OutlinedTextField( }
value = value, }
onValueChange = onChange,
label = { Text(stringResource(R.string.key_label)) }, // Starts the browser sign-in; shows progress while the app waits for it
singleLine = true, @Composable
isError = showError, internal fun SignInButton(again: Boolean, modifier: Modifier = Modifier, shape: Shape = RoundedCornerShape(14.dp)) {
shape = RoundedCornerShape(14.dp), val context = LocalContext.current
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done), val signIn by SkysparkleSignIn.state.collectAsStateWithLifecycle()
modifier = Modifier.fillMaxWidth(), val working = signIn == SkysparkleSignIn.State.Waiting || signIn == SkysparkleSignIn.State.Exchanging
) Button(onClick = { SkysparkleSignIn.start(context) }, enabled = !working, shape = shape, modifier = modifier) {
if (working) {
CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp, color = LocalContentColor.current)
Spacer(Modifier.width(10.dp))
}
Text( Text(
stringResource(if (showError) R.string.key_invalid else R.string.key_hint), stringResource(if (working) R.string.sign_in_working else if (again) R.string.sign_in_again else R.string.sign_in),
color = if (showError) Palette.Blocked else Palette.Fg3, fontWeight = FontWeight.Bold,
fontSize = 12.sp,
) )
} }
} }
// The key is personal, so the clipboard is told to hide it from previews (Android 13+),
// and Android 13+ confirms the copy itself
private fun copyKeyAddress(context: Context, key: String) {
val clip = ClipData.newPlainText("SkySparkle", SkysparkleKey.url(key))
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
clip.description.extras = PersistableBundle().apply { putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true) }
}
context.getSystemService(ClipboardManager::class.java).setPrimaryClip(clip)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
Toast.makeText(context, R.string.key_copied, Toast.LENGTH_SHORT).show()
}
}
// Result of the Skysparkle sign-in, shown once on the screen that started it // Result of the Skysparkle sign-in, shown once on the screen that started it
@Composable @Composable
internal fun SignInResult(onKey: (String) -> Unit) { internal fun SignInResult(onKey: (String) -> Unit) {
+4 -5
View File
@@ -138,13 +138,12 @@
<string name="alert_bad_url_text">Die Serveradresse ist keine gültige HTTPS-URL. Öffne SparkleDNS und prüfe den Server.</string> <string name="alert_bad_url_text">Die Serveradresse ist keine gültige HTTPS-URL. Öffne SparkleDNS und prüfe den Server.</string>
<string name="alert_lockdown_title">DNS-Server nicht erreichbar</string> <string name="alert_lockdown_title">DNS-Server nicht erreichbar</string>
<string name="alert_lockdown_text">„Verbindungen ohne VPN blockieren“ ist aktiv, daher erreicht SparkleDNS den DNS-Server nicht und Anfragen schlagen fehl. Schalte es in den VPN-Einstellungen von Android aus.</string> <string name="alert_lockdown_text">„Verbindungen ohne VPN blockieren“ ist aktiv, daher erreicht SparkleDNS den DNS-Server nicht und Anfragen schlagen fehl. Schalte es in den VPN-Einstellungen von Android aus.</string>
<string name="key_label">Zugangsschlüssel</string>
<string name="key_hint">Füge den Schlüssel oder die ganze Adresse aus deinem Konto auf skysparkle.cc ein</string>
<string name="key_invalid">Das sieht nicht wie ein Schlüssel aus. Kopiere ihn erneut auf der Seite „Schlüssel“.</string>
<string name="sign_in">Mit Skysparkle anmelden</string> <string name="sign_in">Mit Skysparkle anmelden</string>
<string name="sign_in_again">Erneut anmelden</string> <string name="sign_in_again">Erneut anmelden</string>
<string name="sign_in_working">Anmeldung läuft…</string> <string name="sign_in_working">Anmeldung läuft…</string>
<string name="key_or_paste">Oder füge einen Schlüssel aus deinem Konto von Hand ein</string> <string name="key_status">Schlüssel hinzugefügt: %1$s…</string>
<string name="key_copy">Adresse kopieren</string>
<string name="key_copied">Adresse kopiert. Füge sie im Browser oder auf einem anderen Gerät ein.</string>
<string name="sign_in_done">Angemeldet. Der Schlüssel wurde hinzugefügt.</string> <string name="sign_in_done">Angemeldet. Der Schlüssel wurde hinzugefügt.</string>
<string name="sign_in_failed">Anmeldung fehlgeschlagen. Bitte versuche es erneut.</string> <string name="sign_in_failed">Anmeldung fehlgeschlagen. Bitte versuche es erneut.</string>
<string name="sign_in_expired">Die Anmeldung hat zu lange gedauert. Bitte starte sie neu.</string> <string name="sign_in_expired">Die Anmeldung hat zu lange gedauert. Bitte starte sie neu.</string>
@@ -152,7 +151,7 @@
<string name="sign_in_suspended">Dieses Skysparkle-Konto ist gesperrt.</string> <string name="sign_in_suspended">Dieses Skysparkle-Konto ist gesperrt.</string>
<string name="sign_in_network">Keine Verbindung zu skysparkle.cc. Prüfe das Internet und versuche es erneut.</string> <string name="sign_in_network">Keine Verbindung zu skysparkle.cc. Prüfe das Internet und versuche es erneut.</string>
<string name="key_needed">Der SkySparkle-Server braucht einen persönlichen Zugangsschlüssel. Er ist kostenlos: Melde dich mit Skysparkle an, und die App holt den Schlüssel selbst.</string> <string name="key_needed">Der SkySparkle-Server braucht einen persönlichen Zugangsschlüssel. Er ist kostenlos: Melde dich mit Skysparkle an, und die App holt den Schlüssel selbst.</string>
<string name="key_add">Schlüssel hinzufügen</string> <string name="key_add">Anmelden</string>
<string name="alert_no_key_text">Der SkySparkle-Server braucht einen Zugangsschlüssel. Öffne SparkleDNS und melde dich unter Einstellungen mit Skysparkle an.</string> <string name="alert_no_key_text">Der SkySparkle-Server braucht einen Zugangsschlüssel. Öffne SparkleDNS und melde dich unter Einstellungen mit Skysparkle an.</string>
<string name="onb_welcome_title">Willkommen bei SparkleDNS</string> <string name="onb_welcome_title">Willkommen bei SparkleDNS</string>
<string name="onb_welcome_text">Privates DNS für dein ganzes Handy, ohne Server der großen Tech-Konzerne.</string> <string name="onb_welcome_text">Privates DNS für dein ganzes Handy, ohne Server der großen Tech-Konzerne.</string>
+4 -5
View File
@@ -138,13 +138,12 @@
<string name="alert_bad_url_text">サーバーのアドレスが有効な HTTPS URL ではありません。SparkleDNS を開いてサーバーを確認してください。</string> <string name="alert_bad_url_text">サーバーのアドレスが有効な HTTPS URL ではありません。SparkleDNS を開いてサーバーを確認してください。</string>
<string name="alert_lockdown_title">DNS サーバーに接続できません</string> <string name="alert_lockdown_title">DNS サーバーに接続できません</string>
<string name="alert_lockdown_text">「VPN なしの接続をブロック」がオンのため、SparkleDNS は DNS サーバーに接続できず、名前解決に失敗します。Android の VPN 設定でオフにしてください。</string> <string name="alert_lockdown_text">「VPN なしの接続をブロック」がオンのため、SparkleDNS は DNS サーバーに接続できず、名前解決に失敗します。Android の VPN 設定でオフにしてください。</string>
<string name="key_label">アクセスキー</string>
<string name="key_hint">skysparkle.cc のアカウントからキーまたはアドレス全体を貼り付けてください</string>
<string name="key_invalid">キーの形式ではありません。「キー」ページからもう一度コピーしてください。</string>
<string name="sign_in">Skysparkle でサインイン</string> <string name="sign_in">Skysparkle でサインイン</string>
<string name="sign_in_again">もう一度サインイン</string> <string name="sign_in_again">もう一度サインイン</string>
<string name="sign_in_working">サインイン中…</string> <string name="sign_in_working">サインイン中…</string>
<string name="key_or_paste">またはアカウントのキーを手動で貼り付け</string> <string name="key_status">キーを追加済み:%1$s…</string>
<string name="key_copy">アドレスをコピー</string>
<string name="key_copied">アドレスをコピーしました。ブラウザや他のデバイスに貼り付けてください。</string>
<string name="sign_in_done">サインインしました。キーを追加しました。</string> <string name="sign_in_done">サインインしました。キーを追加しました。</string>
<string name="sign_in_failed">サインインに失敗しました。もう一度お試しください。</string> <string name="sign_in_failed">サインインに失敗しました。もう一度お試しください。</string>
<string name="sign_in_expired">サインインに時間がかかりすぎました。最初からやり直してください。</string> <string name="sign_in_expired">サインインに時間がかかりすぎました。最初からやり直してください。</string>
@@ -152,7 +151,7 @@
<string name="sign_in_suspended">この Skysparkle アカウントは停止されています。</string> <string name="sign_in_suspended">この Skysparkle アカウントは停止されています。</string>
<string name="sign_in_network">skysparkle.cc に接続できません。インターネット接続を確認して、もう一度お試しください。</string> <string name="sign_in_network">skysparkle.cc に接続できません。インターネット接続を確認して、もう一度お試しください。</string>
<string name="key_needed">SkySparkle サーバーには個人用のアクセスキーが必要です。無料です:Skysparkle でサインインすると、アプリが自動でキーを取得します。</string> <string name="key_needed">SkySparkle サーバーには個人用のアクセスキーが必要です。無料です:Skysparkle でサインインすると、アプリが自動でキーを取得します。</string>
<string name="key_add">キーを追加</string> <string name="key_add">サインイン</string>
<string name="alert_no_key_text">SkySparkle サーバーにはアクセスキーが必要です。SparkleDNS を開き、「設定」で Skysparkle にサインインしてください。</string> <string name="alert_no_key_text">SkySparkle サーバーにはアクセスキーが必要です。SparkleDNS を開き、「設定」で Skysparkle にサインインしてください。</string>
<string name="onb_welcome_title">SparkleDNS へようこそ</string> <string name="onb_welcome_title">SparkleDNS へようこそ</string>
<string name="onb_welcome_text">大手 IT 企業のサーバーを使わない、スマホ全体のプライベート DNS。</string> <string name="onb_welcome_text">大手 IT 企業のサーバーを使わない、スマホ全体のプライベート DNS。</string>
+4 -5
View File
@@ -138,13 +138,12 @@
<string name="alert_bad_url_text">Serverio adresas nėra tinkamas HTTPS adresas. Atidarykite SparkleDNS ir patikrinkite serverį.</string> <string name="alert_bad_url_text">Serverio adresas nėra tinkamas HTTPS adresas. Atidarykite SparkleDNS ir patikrinkite serverį.</string>
<string name="alert_lockdown_title">DNS serveris nepasiekiamas</string> <string name="alert_lockdown_title">DNS serveris nepasiekiamas</string>
<string name="alert_lockdown_text">Įjungta „Blokuoti ryšius be VPN“, todėl SparkleDNS negali pasiekti DNS serverio ir užklausos nepavyksta. Išjunkite tai Android VPN nustatymuose.</string> <string name="alert_lockdown_text">Įjungta „Blokuoti ryšius be VPN“, todėl SparkleDNS negali pasiekti DNS serverio ir užklausos nepavyksta. Išjunkite tai Android VPN nustatymuose.</string>
<string name="key_label">Prieigos raktas</string>
<string name="key_hint">Įklijuokite raktą arba visą adresą iš savo paskyros skysparkle.cc</string>
<string name="key_invalid">Tai nepanašu į raktą. Nukopijuokite jį dar kartą puslapyje „Raktai“.</string>
<string name="sign_in">Prisijungti su Skysparkle</string> <string name="sign_in">Prisijungti su Skysparkle</string>
<string name="sign_in_again">Prisijungti iš naujo</string> <string name="sign_in_again">Prisijungti iš naujo</string>
<string name="sign_in_working">Jungiamasi…</string> <string name="sign_in_working">Jungiamasi…</string>
<string name="key_or_paste">Arba įklijuokite raktą iš savo paskyros ranka</string> <string name="key_status">Raktas pridėtas: %1$s…</string>
<string name="key_copy">Kopijuoti adresą</string>
<string name="key_copied">Adresas nukopijuotas. Įklijuokite jį naršyklėje arba kitame įrenginyje.</string>
<string name="sign_in_done">Prisijungta. Raktas pridėtas.</string> <string name="sign_in_done">Prisijungta. Raktas pridėtas.</string>
<string name="sign_in_failed">Prisijungti nepavyko. Bandykite dar kartą.</string> <string name="sign_in_failed">Prisijungti nepavyko. Bandykite dar kartą.</string>
<string name="sign_in_expired">Prisijungimas užtruko per ilgai. Pradėkite iš naujo.</string> <string name="sign_in_expired">Prisijungimas užtruko per ilgai. Pradėkite iš naujo.</string>
@@ -152,7 +151,7 @@
<string name="sign_in_suspended">Ši Skysparkle paskyra sustabdyta.</string> <string name="sign_in_suspended">Ši Skysparkle paskyra sustabdyta.</string>
<string name="sign_in_network">Nėra ryšio su skysparkle.cc. Patikrinkite internetą ir bandykite dar kartą.</string> <string name="sign_in_network">Nėra ryšio su skysparkle.cc. Patikrinkite internetą ir bandykite dar kartą.</string>
<string name="key_needed">SkySparkle serveriui reikia asmeninio prieigos rakto. Tai nemokama: prisijunkite su Skysparkle, ir programėlė gaus raktą pati.</string> <string name="key_needed">SkySparkle serveriui reikia asmeninio prieigos rakto. Tai nemokama: prisijunkite su Skysparkle, ir programėlė gaus raktą pati.</string>
<string name="key_add">Pridėti raktą</string> <string name="key_add">Prisijungti</string>
<string name="alert_no_key_text">SkySparkle serveriui reikia prieigos rakto. Atidarykite SparkleDNS ir skiltyje „Nustatymai“ prisijunkite su Skysparkle.</string> <string name="alert_no_key_text">SkySparkle serveriui reikia prieigos rakto. Atidarykite SparkleDNS ir skiltyje „Nustatymai“ prisijunkite su Skysparkle.</string>
<string name="onb_welcome_title">Sveiki atvykę į SparkleDNS</string> <string name="onb_welcome_title">Sveiki atvykę į SparkleDNS</string>
<string name="onb_welcome_text">Privatus DNS visam telefonui, be didžiųjų technologijų įmonių serverių.</string> <string name="onb_welcome_text">Privatus DNS visam telefonui, be didžiųjų technologijų įmonių serverių.</string>
+4 -5
View File
@@ -138,13 +138,12 @@
<string name="alert_bad_url_text">Адрес сервера не является корректным HTTPS-адресом. Откройте SparkleDNS и проверьте сервер.</string> <string name="alert_bad_url_text">Адрес сервера не является корректным HTTPS-адресом. Откройте SparkleDNS и проверьте сервер.</string>
<string name="alert_lockdown_title">DNS-сервер недоступен</string> <string name="alert_lockdown_title">DNS-сервер недоступен</string>
<string name="alert_lockdown_text">Включено «Блокировать соединения без VPN», поэтому SparkleDNS не может связаться с DNS-сервером и запросы не проходят. Отключите это в настройках VPN Android.</string> <string name="alert_lockdown_text">Включено «Блокировать соединения без VPN», поэтому SparkleDNS не может связаться с DNS-сервером и запросы не проходят. Отключите это в настройках VPN Android.</string>
<string name="key_label">Ключ доступа</string>
<string name="key_hint">Вставьте ключ или весь адрес из аккаунта на skysparkle.cc</string>
<string name="key_invalid">Это не похоже на ключ. Скопируйте его ещё раз на странице «Ключи».</string>
<string name="sign_in">Войти через Skysparkle</string> <string name="sign_in">Войти через Skysparkle</string>
<string name="sign_in_again">Войти заново</string> <string name="sign_in_again">Войти заново</string>
<string name="sign_in_working">Выполняется вход…</string> <string name="sign_in_working">Выполняется вход…</string>
<string name="key_or_paste">Или вставьте ключ из аккаунта вручную</string> <string name="key_status">Ключ добавлен: %1$s…</string>
<string name="key_copy">Скопировать адрес</string>
<string name="key_copied">Адрес скопирован. Вставьте его в браузер или на другом устройстве.</string>
<string name="sign_in_done">Вход выполнен. Ключ добавлен.</string> <string name="sign_in_done">Вход выполнен. Ключ добавлен.</string>
<string name="sign_in_failed">Не удалось войти. Попробуйте ещё раз.</string> <string name="sign_in_failed">Не удалось войти. Попробуйте ещё раз.</string>
<string name="sign_in_expired">Вход занял слишком много времени. Начните заново.</string> <string name="sign_in_expired">Вход занял слишком много времени. Начните заново.</string>
@@ -152,7 +151,7 @@
<string name="sign_in_suspended">Этот аккаунт Skysparkle заблокирован.</string> <string name="sign_in_suspended">Этот аккаунт Skysparkle заблокирован.</string>
<string name="sign_in_network">Нет связи с skysparkle.cc. Проверьте интернет и попробуйте ещё раз.</string> <string name="sign_in_network">Нет связи с skysparkle.cc. Проверьте интернет и попробуйте ещё раз.</string>
<string name="key_needed">Серверу SkySparkle нужен личный ключ доступа. Это бесплатно: войдите через Skysparkle, и приложение получит ключ само.</string> <string name="key_needed">Серверу SkySparkle нужен личный ключ доступа. Это бесплатно: войдите через Skysparkle, и приложение получит ключ само.</string>
<string name="key_add">Добавить ключ</string> <string name="key_add">Войти</string>
<string name="alert_no_key_text">Серверу SkySparkle нужен ключ доступа. Откройте SparkleDNS и войдите через Skysparkle в разделе «Настройки».</string> <string name="alert_no_key_text">Серверу SkySparkle нужен ключ доступа. Откройте SparkleDNS и войдите через Skysparkle в разделе «Настройки».</string>
<string name="onb_welcome_title">Добро пожаловать в SparkleDNS</string> <string name="onb_welcome_title">Добро пожаловать в SparkleDNS</string>
<string name="onb_welcome_text">Приватный DNS для всего телефона, без серверов крупных корпораций.</string> <string name="onb_welcome_text">Приватный DNS для всего телефона, без серверов крупных корпораций.</string>
+4 -5
View File
@@ -138,13 +138,12 @@
<string name="alert_bad_url_text">服务器地址不是有效的 HTTPS 网址。请打开 SparkleDNS 检查服务器。</string> <string name="alert_bad_url_text">服务器地址不是有效的 HTTPS 网址。请打开 SparkleDNS 检查服务器。</string>
<string name="alert_lockdown_title">无法连接 DNS 服务器</string> <string name="alert_lockdown_title">无法连接 DNS 服务器</string>
<string name="alert_lockdown_text">已开启“屏蔽未使用 VPN 的连接”,SparkleDNS 无法连接 DNS 服务器,解析会失败。请在 Android 的 VPN 设置中关闭该选项。</string> <string name="alert_lockdown_text">已开启“屏蔽未使用 VPN 的连接”,SparkleDNS 无法连接 DNS 服务器,解析会失败。请在 Android 的 VPN 设置中关闭该选项。</string>
<string name="key_label">访问密钥</string>
<string name="key_hint">粘贴 skysparkle.cc 账户中的密钥或完整地址</string>
<string name="key_invalid">这看起来不像密钥。请在“密钥”页面重新复制。</string>
<string name="sign_in">使用 Skysparkle 登录</string> <string name="sign_in">使用 Skysparkle 登录</string>
<string name="sign_in_again">重新登录</string> <string name="sign_in_again">重新登录</string>
<string name="sign_in_working">正在登录…</string> <string name="sign_in_working">正在登录…</string>
<string name="key_or_paste">或手动粘贴账户中的密钥</string> <string name="key_status">已添加密钥:%1$s…</string>
<string name="key_copy">复制地址</string>
<string name="key_copied">地址已复制。可粘贴到浏览器或其他设备中。</string>
<string name="sign_in_done">已登录,密钥已添加。</string> <string name="sign_in_done">已登录,密钥已添加。</string>
<string name="sign_in_failed">登录失败,请重试。</string> <string name="sign_in_failed">登录失败,请重试。</string>
<string name="sign_in_expired">登录耗时过长,请重新开始。</string> <string name="sign_in_expired">登录耗时过长,请重新开始。</string>
@@ -152,7 +151,7 @@
<string name="sign_in_suspended">此 Skysparkle 账户已被暂停。</string> <string name="sign_in_suspended">此 Skysparkle 账户已被暂停。</string>
<string name="sign_in_network">无法连接 skysparkle.cc。请检查网络后重试。</string> <string name="sign_in_network">无法连接 skysparkle.cc。请检查网络后重试。</string>
<string name="key_needed">SkySparkle 服务器需要个人访问密钥。完全免费:使用 Skysparkle 登录,应用会自动获取密钥。</string> <string name="key_needed">SkySparkle 服务器需要个人访问密钥。完全免费:使用 Skysparkle 登录,应用会自动获取密钥。</string>
<string name="key_add">添加密钥</string> <string name="key_add">登录</string>
<string name="alert_no_key_text">SkySparkle 服务器需要访问密钥。请打开 SparkleDNS,在“设置”中使用 Skysparkle 登录。</string> <string name="alert_no_key_text">SkySparkle 服务器需要访问密钥。请打开 SparkleDNS,在“设置”中使用 Skysparkle 登录。</string>
<string name="onb_welcome_title">欢迎使用 SparkleDNS</string> <string name="onb_welcome_title">欢迎使用 SparkleDNS</string>
<string name="onb_welcome_text">为整部手机提供私密 DNS,不使用大型科技公司的服务器。</string> <string name="onb_welcome_text">为整部手机提供私密 DNS,不使用大型科技公司的服务器。</string>
+4 -5
View File
@@ -139,13 +139,12 @@
<string name="alert_bad_url_text">The server address is not a valid HTTPS URL. Open SparkleDNS and check the server.</string> <string name="alert_bad_url_text">The server address is not a valid HTTPS URL. Open SparkleDNS and check the server.</string>
<string name="alert_lockdown_title">DNS server unreachable</string> <string name="alert_lockdown_title">DNS server unreachable</string>
<string name="alert_lockdown_text">\"Block connections without VPN\" is on, so SparkleDNS cannot reach the DNS server and lookups fail. Turn it off in Android VPN settings.</string> <string name="alert_lockdown_text">\"Block connections without VPN\" is on, so SparkleDNS cannot reach the DNS server and lookups fail. Turn it off in Android VPN settings.</string>
<string name="key_label">Access key</string>
<string name="key_hint">Paste the key or the whole address from your account at skysparkle.cc</string>
<string name="key_invalid">This doesn\'t look like a key. Copy it again from the Keys page.</string>
<string name="sign_in">Sign in with Skysparkle</string> <string name="sign_in">Sign in with Skysparkle</string>
<string name="sign_in_again">Sign in again</string> <string name="sign_in_again">Sign in again</string>
<string name="sign_in_working">Signing in…</string> <string name="sign_in_working">Signing in…</string>
<string name="key_or_paste">Or paste a key from your account by hand</string> <string name="key_status">Key added: %1$s…</string>
<string name="key_copy">Copy address</string>
<string name="key_copied">Address copied. Paste it in a browser or on another device.</string>
<string name="sign_in_done">Signed in. The key has been added.</string> <string name="sign_in_done">Signed in. The key has been added.</string>
<string name="sign_in_failed">Sign-in failed. Please try again.</string> <string name="sign_in_failed">Sign-in failed. Please try again.</string>
<string name="sign_in_expired">The sign-in took too long. Please start again.</string> <string name="sign_in_expired">The sign-in took too long. Please start again.</string>
@@ -153,7 +152,7 @@
<string name="sign_in_suspended">This Skysparkle account is suspended.</string> <string name="sign_in_suspended">This Skysparkle account is suspended.</string>
<string name="sign_in_network">No connection to skysparkle.cc. Check the internet and try again.</string> <string name="sign_in_network">No connection to skysparkle.cc. Check the internet and try again.</string>
<string name="key_needed">The SkySparkle server needs a personal access key. It is free: sign in with Skysparkle and the app gets the key by itself.</string> <string name="key_needed">The SkySparkle server needs a personal access key. It is free: sign in with Skysparkle and the app gets the key by itself.</string>
<string name="key_add">Add key</string> <string name="key_add">Sign in</string>
<string name="alert_no_key_text">The SkySparkle server needs an access key. Open SparkleDNS and sign in with Skysparkle in Settings.</string> <string name="alert_no_key_text">The SkySparkle server needs an access key. Open SparkleDNS and sign in with Skysparkle in Settings.</string>
<string name="onb_welcome_title">Welcome to SparkleDNS</string> <string name="onb_welcome_title">Welcome to SparkleDNS</string>
<string name="onb_welcome_text">Private DNS for your whole phone, without big-tech servers.</string> <string name="onb_welcome_text">Private DNS for your whole phone, without big-tech servers.</string>