Sign in with Skysparkle to get the access key

The key field now starts a browser sign-in at skysparkle.cc/app/connect
(PKCE). The site returns to cc.skysparkle.sparkledns://connect with a
one-time code, and the app exchanges it for a new key. Pasting a key by
hand still works.

Remove the Gitea templates; the project lives on GitHub.
This commit is contained in:
2026-11-18 14:11:48 +02:00
parent a6f22ddfb2
commit 005768f18a
18 changed files with 355 additions and 140 deletions
-28
View File
@@ -1,28 +0,0 @@
---
name: Bug report
about: Something doesn't work as expected
title: "[Bug] "
---
**What happened**
**Steps to reproduce**
1.
2.
3.
**What you expected**
**Environment**
- App version:
- Installed from: Gitea / F-Droid
- Device and Android version:
- DoH server in use:
- Network: Wi-Fi / mobile data
**Screenshots or logs** (optional — please remove domains you don't want to share)
@@ -1,15 +0,0 @@
---
name: DoH server or blocklist
about: Suggest a DoH server or blocklist preset
title: "[Preset] "
---
- Type: DoH server / blocklist
- Name:
- URL:
- Homepage or documentation:
- Privacy policy (DoH servers) or license (blocklists):
- Donation page (DoH servers, optional):
- [ ] DoH server: public and supports RFC 8484
- [ ] Blocklist: public and actively maintained
-18
View File
@@ -1,18 +0,0 @@
---
name: Feature request
about: Suggest an idea that fits the app
title: "[Feature] "
---
<!-- Please check the "Out of scope" list in CONTRIBUTING.md before opening this. -->
**What problem does this solve**
**Proposed solution**
**Alternatives you considered**
- [ ] I'd like to implement this myself
-12
View File
@@ -1,12 +0,0 @@
---
name: Translation fix
about: Report a wrong or awkward translation
title: "[Translation] "
---
<!-- Currently supported: English, Russian. For a new language, open a feature request first. -->
- Language:
- Screen or place in the app:
- Current text:
- Suggested text:
-17
View File
@@ -1,17 +0,0 @@
## What does this change
## Related issue
Closes #
## Checklist
- [ ] Discussed in an issue first (not needed for small fixes)
- [ ] `./gradlew assembleDebug` builds
- [ ] Tested on a device or emulator (Android version: )
- [ ] DNS queries only go to the selected DoH server
- [ ] No ads, analytics, trackers or Google Play Services / Firebase dependencies
- [ ] New strings added to `values/strings.xml` (missing translations noted below)
- [ ] Screenshots added for UI changes
- [ ] I agree that my contribution is licensed under GPL-3.0-or-later
+1 -1
View File
@@ -19,7 +19,7 @@ title: "[Bug] "
**Environment** **Environment**
- App version: - App version:
- Installed from: Gitea / GitHub / F-Droid / Google Play - Installed from: GitHub / F-Droid / Google Play
- Device and Android version: - Device and Android version:
- DoH server in use: - DoH server in use:
- Network: Wi-Fi / mobile data - Network: Wi-Fi / mobile data
+8
View File
@@ -32,11 +32,19 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" android:exported="true"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<!-- End of the Skysparkle sign-in: the site sends the browser back with a one-time code -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="cc.skysparkle.sparkledns" android:host="connect" />
</intent-filter>
</activity> </activity>
<service <service
@@ -57,6 +57,8 @@ class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
AppLogo.preload(this) AppLogo.preload(this)
// Opened by the browser at the end of the Skysparkle sign-in (not again after rotation)
if (savedInstanceState == null) handleSignIn(intent)
enableEdgeToEdge() enableEdgeToEdge()
setContent { setContent {
MaterialTheme(colorScheme = AppColors) { MaterialTheme(colorScheme = AppColors) {
@@ -70,6 +72,27 @@ class MainActivity : ComponentActivity() {
} }
} }
} }
// singleTask: the sign-in callback reaches the running activity instead of opening a second one
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
handleSignIn(intent)
}
// Back from the browser without finishing the sign-in. A real callback arrives in
// onNewIntent, which always runs before this
override fun onResume() {
super.onResume()
SkysparkleSignIn.cancelWaiting()
}
private fun handleSignIn(intent: Intent?) {
val uri = intent?.data
if (intent?.action == Intent.ACTION_VIEW && SkysparkleSignIn.isCallback(uri)) {
SkysparkleSignIn.handle(this, uri!!)
}
}
} }
internal class TestResult(val ok: Boolean, val text: String) internal class TestResult(val ok: Boolean, val text: String)
@@ -66,6 +66,12 @@ fun OnboardingScreen(onDone: () -> Unit) {
onDone() onDone()
} }
// Signed in from the guide: the key is saved, nothing is left to do here
SignInResult { key ->
keyInput = key
finish(useKey = true)
}
BackHandler(enabled = page > 0) { page-- } BackHandler(enabled = page > 0) { page-- }
Box( Box(
@@ -129,7 +135,6 @@ fun OnboardingScreen(onDone: () -> Unit) {
value = keyInput, value = keyInput,
valid = keyValid, valid = keyValid,
onChange = { keyInput = it }, onChange = { keyInput = it },
onGetKey = { openUrl(context, SkysparkleKey.SIGNUP_URL) },
) )
} }
} }
@@ -63,7 +63,6 @@ object Providers {
// keys; the server answers only /dns/<key>, there is no shared public address. // keys; the server answers only /dns/<key>, there is no shared public address.
object SkysparkleKey { object SkysparkleKey {
const val BASE_URL = "https://skysparkle.cc/dns/" const val BASE_URL = "https://skysparkle.cc/dns/"
const val SIGNUP_URL = "https://skysparkle.cc/login#register"
private val KEY = Regex("^[A-Za-z0-9_-]{24}$") private val KEY = Regex("^[A-Za-z0-9_-]{24}$")
private val IN_URL = Regex("/dns/([A-Za-z0-9_-]{24})(?:[/?#].*)?$") private val IN_URL = Regex("/dns/([A-Za-z0-9_-]{24})(?:[/?#].*)?$")
@@ -1,5 +1,6 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.widget.Toast
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState import androidx.compose.animation.animateColorAsState
@@ -21,12 +22,15 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
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.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@@ -93,6 +97,13 @@ fun SettingsScreen(
testResult = null testResult = null
} }
// Signed in from the key field: the key is already saved, show it and select the server
SignInResult { key ->
keyInput = key
selected = Providers.DEFAULT_ID
testResult = null
}
fun runTest() { fun runTest() {
val provider = prefs.resolve() val provider = prefs.resolve()
testing = true testing = true
@@ -136,7 +147,6 @@ fun SettingsScreen(
prefs.skysparkleKey = SkysparkleKey.parse(it) ?: it.trim() prefs.skysparkleKey = SkysparkleKey.parse(it) ?: it.trim()
testResult = null testResult = null
}, },
onGetKey = { openUrl(context, SkysparkleKey.SIGNUP_URL) },
) )
} }
} }
@@ -269,14 +279,30 @@ fun SettingsScreen(
} }
} }
// Access key for the Skysparkle server, with a link to the account page where keys are made // Access key for the Skysparkle server: sign in to get it automatically, or paste one by hand
@Composable @Composable
internal fun KeyField(value: String, valid: Boolean, onChange: (String) -> Unit, onGetKey: () -> Unit, modifier: Modifier = Modifier) { internal fun KeyField(value: String, valid: Boolean, onChange: (String) -> Unit, modifier: Modifier = Modifier) {
val context = LocalContext.current
val signIn by SkysparkleSignIn.state.collectAsStateWithLifecycle()
val working = signIn == SkysparkleSignIn.State.Waiting || signIn == SkysparkleSignIn.State.Exchanging
val showError = value.isNotBlank() && !valid 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(
onClick = { SkysparkleSignIn.start(context) },
enabled = !working,
shape = RoundedCornerShape(14.dp),
modifier = Modifier.fillMaxWidth(),
) {
if (working) {
CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp, color = LocalContentColor.current)
Spacer(Modifier.width(10.dp))
}
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))
OutlinedTextField( OutlinedTextField(
value = value, value = value,
onValueChange = onChange, onValueChange = onChange,
@@ -292,8 +318,26 @@ internal fun KeyField(value: String, valid: Boolean, onChange: (String) -> Unit,
color = if (showError) Palette.Blocked else Palette.Fg3, color = if (showError) Palette.Blocked else Palette.Fg3,
fontSize = 12.sp, fontSize = 12.sp,
) )
OutlinedButton(onClick = onGetKey, shape = RoundedCornerShape(14.dp)) { }
Text(stringResource(R.string.key_get)) }
// Result of the Skysparkle sign-in, shown once on the screen that started it
@Composable
internal fun SignInResult(onKey: (String) -> Unit) {
val context = LocalContext.current
val signIn by SkysparkleSignIn.state.collectAsStateWithLifecycle()
LaunchedEffect(signIn) {
when (val s = signIn) {
is SkysparkleSignIn.State.Done -> {
onKey(s.key)
Toast.makeText(context, R.string.sign_in_done, Toast.LENGTH_SHORT).show()
SkysparkleSignIn.consume()
}
is SkysparkleSignIn.State.Failed -> {
Toast.makeText(context, s.message, Toast.LENGTH_LONG).show()
SkysparkleSignIn.consume()
}
else -> Unit
} }
} }
} }
@@ -0,0 +1,172 @@
package cc.skysparkle.sparkledns
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.util.Base64
import android.util.Log
import androidx.annotation.StringRes
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import org.json.JSONObject
import java.io.IOException
import java.security.MessageDigest
import java.security.SecureRandom
// Sign-in with a Skysparkle account: the app gets its access key without copying it by hand.
//
// OAuth for native apps (RFC 8252) with PKCE (RFC 7636): the account page opens in the browser,
// so the password never passes through the app. After "Connect" the site sends the browser to
// cc.skysparkle.sparkledns://connect?code=…&state=…, and the app trades the one-time code for a
// new key. Only this app knows the verifier, so a code caught by another app is useless.
object SkysparkleSignIn {
private const val CONNECT_URL = "https://skysparkle.cc/app/connect"
private const val TOKEN_URL = "https://skysparkle.cc/api/app/token"
private const val SCHEME = "cc.skysparkle.sparkledns"
private const val HOST = "connect"
// The browser step must be finished within this time (the site keeps codes for 5 minutes)
private const val PENDING_TTL_MS = 30 * 60_000L
sealed interface State {
data object Idle : State
data object Waiting : State
data object Exchanging : State
data class Done(val key: String) : State
data class Failed(@StringRes val message: Int) : State
}
private val _state = MutableStateFlow<State>(State.Idle)
val state: StateFlow<State> = _state.asStateFlow()
// Not tied to a screen: rotating or leaving the screen must not cancel the exchange
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
fun isCallback(uri: Uri?): Boolean = uri?.scheme == SCHEME && uri.host == HOST
// Opens the account page. Verifier and state are kept on disk: the system may stop the app
// while the browser is in front.
fun start(context: Context) {
val verifier = randomToken(32)
val state = randomToken(24)
pending(context).edit()
.putString(P_VERIFIER, verifier)
.putString(P_STATE, state)
.putLong(P_AT, System.currentTimeMillis())
.apply()
val url = Uri.parse(CONNECT_URL).buildUpon()
.appendQueryParameter("challenge", challengeOf(verifier))
.appendQueryParameter("state", state)
.appendQueryParameter("device", Build.MODEL.take(40))
.build()
_state.value = State.Waiting
try {
context.startActivity(Intent(Intent.ACTION_VIEW, url).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
} catch (e: RuntimeException) {
Log.w("SparkleDNS", "Cannot open the sign-in page", e)
_state.value = State.Failed(R.string.no_browser)
}
}
// The browser came back to the app: check state, then trade the code for a key.
fun handle(context: Context, uri: Uri) {
val app = context.applicationContext
val p = pending(app)
val state = p.getString(P_STATE, null)
val verifier = p.getString(P_VERIFIER, null)
val fresh = System.currentTimeMillis() - p.getLong(P_AT, 0) < PENDING_TTL_MS
if (state == null || verifier == null || !fresh || uri.getQueryParameter("state") != state) {
// A link that this app did not start, or an old one: ignore it
if (state == null || !fresh) _state.value = State.Idle
return
}
p.edit().clear().apply()
if (uri.getQueryParameter("error") != null) {
_state.value = State.Idle // "Cancel" on the site
return
}
val code = uri.getQueryParameter("code")
if (code.isNullOrEmpty()) {
_state.value = State.Failed(R.string.sign_in_failed)
return
}
_state.value = State.Exchanging
scope.launch {
_state.value = when (val r = exchange(code, verifier)) {
is Result.Key -> {
Prefs(app).apply {
skysparkleKey = r.key
providerId = Providers.DEFAULT_ID
}
State.Done(r.key)
}
is Result.Error -> State.Failed(r.message)
}
}
}
// The screen showed the result; the next sign-in starts clean
fun consume() {
val s = _state.value
if (s is State.Done || s is State.Failed) _state.value = State.Idle
}
// Returning from the browser without finishing (back button) should not leave a spinner
fun cancelWaiting() {
if (_state.value == State.Waiting) _state.value = State.Idle
}
private sealed interface Result {
class Key(val key: String) : Result
class Error(@StringRes val message: Int) : Result
}
private fun exchange(code: String, verifier: String): Result {
val body = JSONObject().put("code", code).put("verifier", verifier).toString()
.toRequestBody("application/json".toMediaType())
val request = Request.Builder().url(TOKEN_URL).post(body).build()
return try {
Http.client.newCall(request).execute().use { response ->
val json = runCatching { JSONObject(response.body.string()) }.getOrNull()
val key = json?.optString("key").orEmpty()
when {
response.isSuccessful && SkysparkleKey.parse(key) != null -> Result.Key(key)
json?.optString("error") == "verify_email_first" -> Result.Error(R.string.sign_in_verify)
json?.optString("error") == "invalid_grant" -> Result.Error(R.string.sign_in_expired)
json?.optString("error") == "account_suspended" -> Result.Error(R.string.sign_in_suspended)
else -> Result.Error(R.string.sign_in_failed)
}
}
} catch (e: IOException) {
Log.w("SparkleDNS", "Key exchange failed", e)
Result.Error(R.string.sign_in_network)
}
}
private fun pending(context: Context) =
context.applicationContext.getSharedPreferences("sign_in", Context.MODE_PRIVATE)
private val random = SecureRandom()
private fun randomToken(bytes: Int): String =
b64url(ByteArray(bytes).also(random::nextBytes))
private fun challengeOf(verifier: String): String =
b64url(MessageDigest.getInstance("SHA-256").digest(verifier.toByteArray(Charsets.US_ASCII)))
private fun b64url(data: ByteArray): String =
Base64.encodeToString(data, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
private const val P_VERIFIER = "verifier"
private const val P_STATE = "state"
private const val P_AT = "at"
}
+16 -7
View File
@@ -141,20 +141,29 @@
<string name="key_label">Zugangsschlüssel</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_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="key_invalid">Das sieht nicht wie ein Schlüssel aus. Kopiere ihn erneut auf der Seite „Schlüssel“.</string>
<string name="key_get">Kostenlosen Schlüssel holen</string> <string name="sign_in">Mit Skysparkle anmelden</string>
<string name="key_needed">Der SkySparkle-Server braucht einen persönlichen Zugangsschlüssel. Er ist kostenlos: Erstelle ein Konto auf skysparkle.cc und füge den Schlüssel hinzu.</string> <string name="sign_in_again">Erneut anmelden</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="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_expired">Die Anmeldung hat zu lange gedauert. Bitte starte sie neu.</string>
<string name="sign_in_verify">Bestätige zuerst deine E-Mail-Adresse und melde dich dann erneut an.</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="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">Schlüssel hinzufügen</string>
<string name="alert_no_key_text">Der SkySparkle-Server braucht einen Zugangsschlüssel. Öffne SparkleDNS und füge deinen Schlüssel unter Einstellungen hinzu.</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>
<string name="onb_point_encrypt">Verschlüsselt jede DNS-Anfrage mit DNS-over-HTTPS</string> <string name="onb_point_encrypt">Verschlüsselt jede DNS-Anfrage mit DNS-over-HTTPS</string>
<string name="onb_point_block">Blockiert Werbung und Tracker in allen Apps</string> <string name="onb_point_block">Blockiert Werbung und Tracker in allen Apps</string>
<string name="onb_point_independent">Nur unabhängige Server, nie Google oder Cloudflare</string> <string name="onb_point_independent">Nur unabhängige Server, nie Google oder Cloudflare</string>
<string name="onb_key_title">Hol dir deinen Zugangsschlüssel</string> <string name="onb_key_title">Hol dir deinen Zugangsschlüssel</string>
<string name="onb_key_text">Der SkySparkle-Server arbeitet mit einem persönlichen Schlüssel. Der kostenlose Tarif hat Grenzen, die bezahlten nicht.</string> <string name="onb_key_text">Der SkySparkle-Server arbeitet mit einem persönlichen Schlüssel. Er ist kostenlos: Melde dich an, und die App holt den Schlüssel selbst.</string>
<string name="onb_key_step1">Erstelle ein kostenloses Konto auf skysparkle.cc</string> <string name="onb_key_step1">Tippe auf „Mit Skysparkle anmelden“ – die Seite öffnet sich im Browser</string>
<string name="onb_key_step2">Öffne „Schlüssel“ und erstelle einen Schlüssel für dieses Handy</string> <string name="onb_key_step2">Melde dich an oder erstelle ein kostenloses Konto</string>
<string name="onb_key_step3">Kopiere den Schlüssel oder die Adresse und füge sie unten ein</string> <string name="onb_key_step3">Tippe auf „Connect“ – du kommst mit dem Schlüssel hierher zurück</string>
<string name="onb_next">Weiter</string> <string name="onb_next">Weiter</string>
<string name="onb_done">Starten</string> <string name="onb_done">Starten</string>
<string name="onb_skip">Überspringen, ich wähle einen anderen Server</string> <string name="onb_skip">Überspringen, ich wähle einen anderen Server</string>
+16 -7
View File
@@ -141,20 +141,29 @@
<string name="key_label">アクセスキー</string> <string name="key_label">アクセスキー</string>
<string name="key_hint">skysparkle.cc のアカウントからキーまたはアドレス全体を貼り付けてください</string> <string name="key_hint">skysparkle.cc のアカウントからキーまたはアドレス全体を貼り付けてください</string>
<string name="key_invalid">キーの形式ではありません。「キー」ページからもう一度コピーしてください。</string> <string name="key_invalid">キーの形式ではありません。「キー」ページからもう一度コピーしてください。</string>
<string name="key_get">無料のキーを取得</string> <string name="sign_in">Skysparkle でサインイン</string>
<string name="key_needed">SkySparkle サーバーには個人用のアクセスキーが必要です。無料です:skysparkle.cc でアカウントを作成してキーを追加してください。</string> <string name="sign_in_again">もう一度サインイン</string>
<string name="sign_in_working">サインイン中…</string>
<string name="key_or_paste">またはアカウントのキーを手動で貼り付け</string>
<string name="sign_in_done">サインインしました。キーを追加しました。</string>
<string name="sign_in_failed">サインインに失敗しました。もう一度お試しください。</string>
<string name="sign_in_expired">サインインに時間がかかりすぎました。最初からやり直してください。</string>
<string name="sign_in_verify">先にメールアドレスを確認してから、もう一度サインインしてください。</string>
<string name="sign_in_suspended">この Skysparkle アカウントは停止されています。</string>
<string name="sign_in_network">skysparkle.cc に接続できません。インターネット接続を確認して、もう一度お試しください。</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 を開いて「設定」でキーを追加してください。</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>
<string name="onb_point_encrypt">DNS-over-HTTPS ですべての DNS 問い合わせを暗号化</string> <string name="onb_point_encrypt">DNS-over-HTTPS ですべての DNS 問い合わせを暗号化</string>
<string name="onb_point_block">すべてのアプリで広告とトラッカーをブロック</string> <string name="onb_point_block">すべてのアプリで広告とトラッカーをブロック</string>
<string name="onb_point_independent">独立系サーバーのみ。Google や Cloudflare は使いません</string> <string name="onb_point_independent">独立系サーバーのみ。Google や Cloudflare は使いません</string>
<string name="onb_key_title">アクセスキーを取得</string> <string name="onb_key_title">アクセスキーを取得</string>
<string name="onb_key_text">SkySparkle サーバーは個人用キーで動作します。無料プランには制限があり、有料プランにはありません。</string> <string name="onb_key_text">SkySparkle サーバーは個人用キーで動作します。無料です:サインインすると、アプリが自動でキーを取得します。</string>
<string name="onb_key_step1">skysparkle.cc で無料アカウントを作成</string> <string name="onb_key_step1">「Skysparkle でサインイン」をタップ — ブラウザでサイトが開きます</string>
<string name="onb_key_step2">「キー」を開き、このスマホ用のキーを作成</string> <string name="onb_key_step2">サインインするか、無料アカウントを作成</string>
<string name="onb_key_step3">キーまたはアドレスをコピーして下に貼り付け</string> <string name="onb_key_step3">「Connect」をタップ — キーを持ってここに戻ります</string>
<string name="onb_next">次へ</string> <string name="onb_next">次へ</string>
<string name="onb_done">開始</string> <string name="onb_done">開始</string>
<string name="onb_skip">スキップして別のサーバーを選ぶ</string> <string name="onb_skip">スキップして別のサーバーを選ぶ</string>
+16 -7
View File
@@ -141,20 +141,29 @@
<string name="key_label">Prieigos raktas</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_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="key_invalid">Tai nepanašu į raktą. Nukopijuokite jį dar kartą puslapyje „Raktai“.</string>
<string name="key_get">Gauti nemokamą raktą</string> <string name="sign_in">Prisijungti su Skysparkle</string>
<string name="key_needed">SkySparkle serveriui reikia asmeninio prieigos rakto. Tai nemokama: susikurkite paskyrą skysparkle.cc ir pridėkite raktą.</string> <string name="sign_in_again">Prisijungti iš naujo</string>
<string name="sign_in_working">Jungiamasi…</string>
<string name="key_or_paste">Arba įklijuokite raktą iš savo paskyros ranka</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_expired">Prisijungimas užtruko per ilgai. Pradėkite iš naujo.</string>
<string name="sign_in_verify">Pirmiausia patvirtinkite el. paštą, tada prisijunkite dar kartą.</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="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">Pridėti raktą</string>
<string name="alert_no_key_text">SkySparkle serveriui reikia prieigos rakto. Atidarykite SparkleDNS ir pridėkite raktą skiltyje „Nustatymai“.</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>
<string name="onb_point_encrypt">Šifruoja kiekvieną DNS užklausą per DNS-over-HTTPS</string> <string name="onb_point_encrypt">Šifruoja kiekvieną DNS užklausą per DNS-over-HTTPS</string>
<string name="onb_point_block">Blokuoja reklamas ir sekiklius visose programėlėse</string> <string name="onb_point_block">Blokuoja reklamas ir sekiklius visose programėlėse</string>
<string name="onb_point_independent">Tik nepriklausomi serveriai, jokio Google ar Cloudflare</string> <string name="onb_point_independent">Tik nepriklausomi serveriai, jokio Google ar Cloudflare</string>
<string name="onb_key_title">Gaukite prieigos raktą</string> <string name="onb_key_title">Gaukite prieigos raktą</string>
<string name="onb_key_text">SkySparkle serveris veikia su asmeniniu raktu. Nemokamas planas turi apribojimų, mokami – ne.</string> <string name="onb_key_text">SkySparkle serveris veikia su asmeniniu raktu. Tai nemokama: prisijunkite, ir programėlė gaus raktą pati.</string>
<string name="onb_key_step1">Susikurkite nemokamą paskyrą skysparkle.cc</string> <string name="onb_key_step1">Paspauskite „Prisijungti su Skysparkle“ – svetainė atsidarys naršyklėje</string>
<string name="onb_key_step2">Atidarykite „Raktai“ ir sukurkite raktą šiam telefonui</string> <string name="onb_key_step2">Prisijunkite arba susikurkite nemokamą paskyrą</string>
<string name="onb_key_step3">Nukopijuokite raktą arba adresą ir įklijuokite žemiau</string> <string name="onb_key_step3">Paspauskite „Prijungti“ – grįšite čia su raktu</string>
<string name="onb_next">Toliau</string> <string name="onb_next">Toliau</string>
<string name="onb_done">Pradėti</string> <string name="onb_done">Pradėti</string>
<string name="onb_skip">Praleisti, pasirinksiu kitą serverį</string> <string name="onb_skip">Praleisti, pasirinksiu kitą serverį</string>
+16 -7
View File
@@ -141,20 +141,29 @@
<string name="key_label">Ключ доступа</string> <string name="key_label">Ключ доступа</string>
<string name="key_hint">Вставьте ключ или весь адрес из аккаунта на skysparkle.cc</string> <string name="key_hint">Вставьте ключ или весь адрес из аккаунта на skysparkle.cc</string>
<string name="key_invalid">Это не похоже на ключ. Скопируйте его ещё раз на странице «Ключи».</string> <string name="key_invalid">Это не похоже на ключ. Скопируйте его ещё раз на странице «Ключи».</string>
<string name="key_get">Получить бесплатный ключ</string> <string name="sign_in">Войти через Skysparkle</string>
<string name="key_needed">Серверу SkySparkle нужен личный ключ доступа. Это бесплатно: создайте аккаунт на skysparkle.cc и добавьте ключ.</string> <string name="sign_in_again">Войти заново</string>
<string name="sign_in_working">Выполняется вход…</string>
<string name="key_or_paste">Или вставьте ключ из аккаунта вручную</string>
<string name="sign_in_done">Вход выполнен. Ключ добавлен.</string>
<string name="sign_in_failed">Не удалось войти. Попробуйте ещё раз.</string>
<string name="sign_in_expired">Вход занял слишком много времени. Начните заново.</string>
<string name="sign_in_verify">Сначала подтвердите e-mail, затем войдите ещё раз.</string>
<string name="sign_in_suspended">Этот аккаунт Skysparkle заблокирован.</string>
<string name="sign_in_network">Нет связи с skysparkle.cc. Проверьте интернет и попробуйте ещё раз.</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 и добавьте ключ в разделе «Настройки».</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>
<string name="onb_point_encrypt">Шифрует каждый DNS-запрос через DNS-over-HTTPS</string> <string name="onb_point_encrypt">Шифрует каждый DNS-запрос через DNS-over-HTTPS</string>
<string name="onb_point_block">Блокирует рекламу и трекеры во всех приложениях</string> <string name="onb_point_block">Блокирует рекламу и трекеры во всех приложениях</string>
<string name="onb_point_independent">Только независимые серверы, без Google и Cloudflare</string> <string name="onb_point_independent">Только независимые серверы, без Google и Cloudflare</string>
<string name="onb_key_title">Получите ключ доступа</string> <string name="onb_key_title">Получите ключ доступа</string>
<string name="onb_key_text">Сервер SkySparkle работает по личному ключу. У бесплатного тарифа есть ограничения, у платных — нет.</string> <string name="onb_key_text">Сервер SkySparkle работает по личному ключу. Это бесплатно: войдите, и приложение получит ключ само.</string>
<string name="onb_key_step1">Создайте бесплатный аккаунт на skysparkle.cc</string> <string name="onb_key_step1">Нажмите «Войти через Skysparkle» — сайт откроется в браузере</string>
<string name="onb_key_step2">Откройте «Ключи» и создайте ключ для этого телефона</string> <string name="onb_key_step2">Войдите или создайте бесплатный аккаунт</string>
<string name="onb_key_step3">Скопируйте ключ или адрес и вставьте ниже</string> <string name="onb_key_step3">Нажмите «Connect» — вы вернётесь сюда уже с ключом</string>
<string name="onb_next">Далее</string> <string name="onb_next">Далее</string>
<string name="onb_done">Начать</string> <string name="onb_done">Начать</string>
<string name="onb_skip">Пропустить, выберу другой сервер</string> <string name="onb_skip">Пропустить, выберу другой сервер</string>
+16 -7
View File
@@ -141,20 +141,29 @@
<string name="key_label">访问密钥</string> <string name="key_label">访问密钥</string>
<string name="key_hint">粘贴 skysparkle.cc 账户中的密钥或完整地址</string> <string name="key_hint">粘贴 skysparkle.cc 账户中的密钥或完整地址</string>
<string name="key_invalid">这看起来不像密钥。请在“密钥”页面重新复制。</string> <string name="key_invalid">这看起来不像密钥。请在“密钥”页面重新复制。</string>
<string name="key_get">获取免费密钥</string> <string name="sign_in">使用 Skysparkle 登录</string>
<string name="key_needed">SkySparkle 服务器需要个人访问密钥。完全免费:在 skysparkle.cc 创建账户并添加密钥。</string> <string name="sign_in_again">重新登录</string>
<string name="sign_in_working">正在登录…</string>
<string name="key_or_paste">或手动粘贴账户中的密钥</string>
<string name="sign_in_done">已登录,密钥已添加。</string>
<string name="sign_in_failed">登录失败,请重试。</string>
<string name="sign_in_expired">登录耗时过长,请重新开始。</string>
<string name="sign_in_verify">请先确认电子邮箱,然后重新登录。</string>
<string name="sign_in_suspended">此 Skysparkle 账户已被暂停。</string>
<string name="sign_in_network">无法连接 skysparkle.cc。请检查网络后重试。</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,在“设置”中添加密钥。</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>
<string name="onb_point_encrypt">通过 DNS-over-HTTPS 加密每一次 DNS 查询</string> <string name="onb_point_encrypt">通过 DNS-over-HTTPS 加密每一次 DNS 查询</string>
<string name="onb_point_block">在所有应用中拦截广告和跟踪器</string> <string name="onb_point_block">在所有应用中拦截广告和跟踪器</string>
<string name="onb_point_independent">只使用独立服务器,不用 Google 或 Cloudflare</string> <string name="onb_point_independent">只使用独立服务器,不用 Google 或 Cloudflare</string>
<string name="onb_key_title">获取访问密钥</string> <string name="onb_key_title">获取访问密钥</string>
<string name="onb_key_text">SkySparkle 服务器使用个人密钥。免费套餐有限制,付费套餐没有。</string> <string name="onb_key_text">SkySparkle 服务器使用个人密钥。完全免费:登录后,应用会自动获取密钥。</string>
<string name="onb_key_step1">在 skysparkle.cc 创建免费账户</string> <string name="onb_key_step1">点击“使用 Skysparkle 登录”——网站将在浏览器中打开</string>
<string name="onb_key_step2">打开“密钥”,为这部手机创建密钥</string> <string name="onb_key_step2">登录或创建免费账户</string>
<string name="onb_key_step3">复制密钥或地址,粘贴到下方</string> <string name="onb_key_step3">点击“Connect”——带着密钥回到这里</string>
<string name="onb_next">下一步</string> <string name="onb_next">下一步</string>
<string name="onb_done">开始</string> <string name="onb_done">开始</string>
<string name="onb_skip">跳过,我选择其他服务器</string> <string name="onb_skip">跳过,我选择其他服务器</string>
+16 -7
View File
@@ -142,20 +142,29 @@
<string name="key_label">Access key</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_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="key_invalid">This doesn\'t look like a key. Copy it again from the Keys page.</string>
<string name="key_get">Get a free key</string> <string name="sign_in">Sign in with Skysparkle</string>
<string name="key_needed">The SkySparkle server needs a personal access key. It is free: create an account at skysparkle.cc and add the key.</string> <string name="sign_in_again">Sign in again</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="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_expired">The sign-in took too long. Please start again.</string>
<string name="sign_in_verify">Confirm your e-mail first, then sign in again.</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="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">Add key</string>
<string name="alert_no_key_text">The SkySparkle server needs an access key. Open SparkleDNS and add your key 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>
<string name="onb_point_encrypt">Encrypts every DNS lookup with DNS-over-HTTPS</string> <string name="onb_point_encrypt">Encrypts every DNS lookup with DNS-over-HTTPS</string>
<string name="onb_point_block">Blocks ads and trackers in all apps</string> <string name="onb_point_block">Blocks ads and trackers in all apps</string>
<string name="onb_point_independent">Uses only independent servers, never Google or Cloudflare</string> <string name="onb_point_independent">Uses only independent servers, never Google or Cloudflare</string>
<string name="onb_key_title">Get your access key</string> <string name="onb_key_title">Get your access key</string>
<string name="onb_key_text">The SkySparkle server works with a personal key. The free plan has limits; paid plans have none.</string> <string name="onb_key_text">The SkySparkle server works with a personal key. It is free: sign in, and the app gets the key by itself.</string>
<string name="onb_key_step1">Create a free account at skysparkle.cc</string> <string name="onb_key_step1">Tap “Sign in with Skysparkle” — the site opens in your browser</string>
<string name="onb_key_step2">Open Keys and create a key for this phone</string> <string name="onb_key_step2">Sign in or create a free account</string>
<string name="onb_key_step3">Copy the key or the address and paste it below</string> <string name="onb_key_step3">Tap “Connect” — you are back here with the key</string>
<string name="onb_next">Next</string> <string name="onb_next">Next</string>
<string name="onb_done">Start</string> <string name="onb_done">Start</string>
<string name="onb_skip">Skip, I\'ll choose another server</string> <string name="onb_skip">Skip, I\'ll choose another server</string>