diff --git a/.gitea/ISSUE_TEMPLATE/bug_report.md b/.gitea/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index d2743c1..0000000
--- a/.gitea/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -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)
-
diff --git a/.gitea/ISSUE_TEMPLATE/doh_server_or_blocklist.md b/.gitea/ISSUE_TEMPLATE/doh_server_or_blocklist.md
deleted file mode 100644
index b6ad3d6..0000000
--- a/.gitea/ISSUE_TEMPLATE/doh_server_or_blocklist.md
+++ /dev/null
@@ -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
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request.md b/.gitea/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 925c384..0000000
--- a/.gitea/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Feature request
-about: Suggest an idea that fits the app
-title: "[Feature] "
----
-
-
-
-**What problem does this solve**
-
-
-**Proposed solution**
-
-
-**Alternatives you considered**
-
-
-- [ ] I'd like to implement this myself
diff --git a/.gitea/ISSUE_TEMPLATE/translation_fix.md b/.gitea/ISSUE_TEMPLATE/translation_fix.md
deleted file mode 100644
index 239a75f..0000000
--- a/.gitea/ISSUE_TEMPLATE/translation_fix.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Translation fix
-about: Report a wrong or awkward translation
-title: "[Translation] "
----
-
-
-
-- Language:
-- Screen or place in the app:
-- Current text:
-- Suggested text:
diff --git a/.gitea/PULL_REQUEST_TEMPLATE.md b/.gitea/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 8754706..0000000
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -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
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6499176..1a61385 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,7 +19,7 @@ title: "[Bug] "
**Environment**
- App version:
-- Installed from: Gitea / GitHub / F-Droid / Google Play
+- Installed from: GitHub / F-Droid / Google Play
- Device and Android version:
- DoH server in use:
- Network: Wi-Fi / mobile data
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c423be..b84a52d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,11 +32,19 @@
+
+
+
+
+
+
+
Unit) {
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-- }
Box(
@@ -129,7 +135,6 @@ fun OnboardingScreen(onDone: () -> Unit) {
value = keyInput,
valid = keyValid,
onChange = { keyInput = it },
- onGetKey = { openUrl(context, SkysparkleKey.SIGNUP_URL) },
)
}
}
diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt
index 159958b..74790bf 100644
--- a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt
+++ b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt
@@ -63,7 +63,6 @@ object Providers {
// keys; the server answers only /dns/, there is no shared public address.
object SkysparkleKey {
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 IN_URL = Regex("/dns/([A-Za-z0-9_-]{24})(?:[/?#].*)?$")
diff --git a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt
index 9b38788..8a72ca6 100644
--- a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt
+++ b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt
@@ -1,5 +1,6 @@
package cc.skysparkle.sparkledns
+import android.widget.Toast
import androidx.annotation.DrawableRes
import androidx.compose.animation.AnimatedVisibility
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.verticalScroll
import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -93,6 +97,13 @@ fun SettingsScreen(
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() {
val provider = prefs.resolve()
testing = true
@@ -136,7 +147,6 @@ fun SettingsScreen(
prefs.skysparkleKey = SkysparkleKey.parse(it) ?: it.trim()
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
-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
Column(
modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.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(
value = value,
onValueChange = onChange,
@@ -292,8 +318,26 @@ internal fun KeyField(value: String, valid: Boolean, onChange: (String) -> Unit,
color = if (showError) Palette.Blocked else Palette.Fg3,
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
}
}
}
diff --git a/app/src/main/java/cc/skysparkle/sparkledns/SkysparkleSignIn.kt b/app/src/main/java/cc/skysparkle/sparkledns/SkysparkleSignIn.kt
new file mode 100644
index 0000000..5261e98
--- /dev/null
+++ b/app/src/main/java/cc/skysparkle/sparkledns/SkysparkleSignIn.kt
@@ -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.Idle)
+ val state: StateFlow = _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"
+}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2efd2a4..798b299 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -141,20 +141,29 @@
Zugangsschlüssel
Füge den Schlüssel oder die ganze Adresse aus deinem Konto auf skysparkle.cc ein
Das sieht nicht wie ein Schlüssel aus. Kopiere ihn erneut auf der Seite „Schlüssel“.
- Kostenlosen Schlüssel holen
- 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.
+ Mit Skysparkle anmelden
+ Erneut anmelden
+ Anmeldung läuft…
+ Oder füge einen Schlüssel aus deinem Konto von Hand ein
+ Angemeldet. Der Schlüssel wurde hinzugefügt.
+ Anmeldung fehlgeschlagen. Bitte versuche es erneut.
+ Die Anmeldung hat zu lange gedauert. Bitte starte sie neu.
+ Bestätige zuerst deine E-Mail-Adresse und melde dich dann erneut an.
+ Dieses Skysparkle-Konto ist gesperrt.
+ Keine Verbindung zu skysparkle.cc. Prüfe das Internet und versuche es erneut.
+ 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.
Schlüssel hinzufügen
- Der SkySparkle-Server braucht einen Zugangsschlüssel. Öffne SparkleDNS und füge deinen Schlüssel unter Einstellungen hinzu.
+ Der SkySparkle-Server braucht einen Zugangsschlüssel. Öffne SparkleDNS und melde dich unter Einstellungen mit Skysparkle an.
Willkommen bei SparkleDNS
Privates DNS für dein ganzes Handy, ohne Server der großen Tech-Konzerne.
Verschlüsselt jede DNS-Anfrage mit DNS-over-HTTPS
Blockiert Werbung und Tracker in allen Apps
Nur unabhängige Server, nie Google oder Cloudflare
Hol dir deinen Zugangsschlüssel
- Der SkySparkle-Server arbeitet mit einem persönlichen Schlüssel. Der kostenlose Tarif hat Grenzen, die bezahlten nicht.
- Erstelle ein kostenloses Konto auf skysparkle.cc
- Öffne „Schlüssel“ und erstelle einen Schlüssel für dieses Handy
- Kopiere den Schlüssel oder die Adresse und füge sie unten ein
+ Der SkySparkle-Server arbeitet mit einem persönlichen Schlüssel. Er ist kostenlos: Melde dich an, und die App holt den Schlüssel selbst.
+ Tippe auf „Mit Skysparkle anmelden“ – die Seite öffnet sich im Browser
+ Melde dich an oder erstelle ein kostenloses Konto
+ Tippe auf „Connect“ – du kommst mit dem Schlüssel hierher zurück
Weiter
Starten
Überspringen, ich wähle einen anderen Server
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 00d004e..41945b0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -141,20 +141,29 @@
アクセスキー
skysparkle.cc のアカウントからキーまたはアドレス全体を貼り付けてください
キーの形式ではありません。「キー」ページからもう一度コピーしてください。
- 無料のキーを取得
- SkySparkle サーバーには個人用のアクセスキーが必要です。無料です:skysparkle.cc でアカウントを作成してキーを追加してください。
+ Skysparkle でサインイン
+ もう一度サインイン
+ サインイン中…
+ またはアカウントのキーを手動で貼り付け
+ サインインしました。キーを追加しました。
+ サインインに失敗しました。もう一度お試しください。
+ サインインに時間がかかりすぎました。最初からやり直してください。
+ 先にメールアドレスを確認してから、もう一度サインインしてください。
+ この Skysparkle アカウントは停止されています。
+ skysparkle.cc に接続できません。インターネット接続を確認して、もう一度お試しください。
+ SkySparkle サーバーには個人用のアクセスキーが必要です。無料です:Skysparkle でサインインすると、アプリが自動でキーを取得します。
キーを追加
- SkySparkle サーバーにはアクセスキーが必要です。SparkleDNS を開いて「設定」でキーを追加してください。
+ SkySparkle サーバーにはアクセスキーが必要です。SparkleDNS を開き、「設定」で Skysparkle にサインインしてください。
SparkleDNS へようこそ
大手 IT 企業のサーバーを使わない、スマホ全体のプライベート DNS。
DNS-over-HTTPS ですべての DNS 問い合わせを暗号化
すべてのアプリで広告とトラッカーをブロック
独立系サーバーのみ。Google や Cloudflare は使いません
アクセスキーを取得
- SkySparkle サーバーは個人用キーで動作します。無料プランには制限があり、有料プランにはありません。
- skysparkle.cc で無料アカウントを作成
- 「キー」を開き、このスマホ用のキーを作成
- キーまたはアドレスをコピーして下に貼り付け
+ SkySparkle サーバーは個人用キーで動作します。無料です:サインインすると、アプリが自動でキーを取得します。
+ 「Skysparkle でサインイン」をタップ — ブラウザでサイトが開きます
+ サインインするか、無料アカウントを作成
+ 「Connect」をタップ — キーを持ってここに戻ります
次へ
開始
スキップして別のサーバーを選ぶ
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 57e27a5..b6da462 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -141,20 +141,29 @@
Prieigos raktas
Įklijuokite raktą arba visą adresą iš savo paskyros skysparkle.cc
Tai nepanašu į raktą. Nukopijuokite jį dar kartą puslapyje „Raktai“.
- Gauti nemokamą raktą
- SkySparkle serveriui reikia asmeninio prieigos rakto. Tai nemokama: susikurkite paskyrą skysparkle.cc ir pridėkite raktą.
+ Prisijungti su Skysparkle
+ Prisijungti iš naujo
+ Jungiamasi…
+ Arba įklijuokite raktą iš savo paskyros ranka
+ Prisijungta. Raktas pridėtas.
+ Prisijungti nepavyko. Bandykite dar kartą.
+ Prisijungimas užtruko per ilgai. Pradėkite iš naujo.
+ Pirmiausia patvirtinkite el. paštą, tada prisijunkite dar kartą.
+ Ši Skysparkle paskyra sustabdyta.
+ Nėra ryšio su skysparkle.cc. Patikrinkite internetą ir bandykite dar kartą.
+ SkySparkle serveriui reikia asmeninio prieigos rakto. Tai nemokama: prisijunkite su Skysparkle, ir programėlė gaus raktą pati.
Pridėti raktą
- SkySparkle serveriui reikia prieigos rakto. Atidarykite SparkleDNS ir pridėkite raktą skiltyje „Nustatymai“.
+ SkySparkle serveriui reikia prieigos rakto. Atidarykite SparkleDNS ir skiltyje „Nustatymai“ prisijunkite su Skysparkle.
Sveiki atvykę į SparkleDNS
Privatus DNS visam telefonui, be didžiųjų technologijų įmonių serverių.
Šifruoja kiekvieną DNS užklausą per DNS-over-HTTPS
Blokuoja reklamas ir sekiklius visose programėlėse
Tik nepriklausomi serveriai, jokio Google ar Cloudflare
Gaukite prieigos raktą
- SkySparkle serveris veikia su asmeniniu raktu. Nemokamas planas turi apribojimų, mokami – ne.
- Susikurkite nemokamą paskyrą skysparkle.cc
- Atidarykite „Raktai“ ir sukurkite raktą šiam telefonui
- Nukopijuokite raktą arba adresą ir įklijuokite žemiau
+ SkySparkle serveris veikia su asmeniniu raktu. Tai nemokama: prisijunkite, ir programėlė gaus raktą pati.
+ Paspauskite „Prisijungti su Skysparkle“ – svetainė atsidarys naršyklėje
+ Prisijunkite arba susikurkite nemokamą paskyrą
+ Paspauskite „Prijungti“ – grįšite čia su raktu
Toliau
Pradėti
Praleisti, pasirinksiu kitą serverį
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 04dd05f..ff68703 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -141,20 +141,29 @@
Ключ доступа
Вставьте ключ или весь адрес из аккаунта на skysparkle.cc
Это не похоже на ключ. Скопируйте его ещё раз на странице «Ключи».
- Получить бесплатный ключ
- Серверу SkySparkle нужен личный ключ доступа. Это бесплатно: создайте аккаунт на skysparkle.cc и добавьте ключ.
+ Войти через Skysparkle
+ Войти заново
+ Выполняется вход…
+ Или вставьте ключ из аккаунта вручную
+ Вход выполнен. Ключ добавлен.
+ Не удалось войти. Попробуйте ещё раз.
+ Вход занял слишком много времени. Начните заново.
+ Сначала подтвердите e-mail, затем войдите ещё раз.
+ Этот аккаунт Skysparkle заблокирован.
+ Нет связи с skysparkle.cc. Проверьте интернет и попробуйте ещё раз.
+ Серверу SkySparkle нужен личный ключ доступа. Это бесплатно: войдите через Skysparkle, и приложение получит ключ само.
Добавить ключ
- Серверу SkySparkle нужен ключ доступа. Откройте SparkleDNS и добавьте ключ в разделе «Настройки».
+ Серверу SkySparkle нужен ключ доступа. Откройте SparkleDNS и войдите через Skysparkle в разделе «Настройки».
Добро пожаловать в SparkleDNS
Приватный DNS для всего телефона, без серверов крупных корпораций.
Шифрует каждый DNS-запрос через DNS-over-HTTPS
Блокирует рекламу и трекеры во всех приложениях
Только независимые серверы, без Google и Cloudflare
Получите ключ доступа
- Сервер SkySparkle работает по личному ключу. У бесплатного тарифа есть ограничения, у платных — нет.
- Создайте бесплатный аккаунт на skysparkle.cc
- Откройте «Ключи» и создайте ключ для этого телефона
- Скопируйте ключ или адрес и вставьте ниже
+ Сервер SkySparkle работает по личному ключу. Это бесплатно: войдите, и приложение получит ключ само.
+ Нажмите «Войти через Skysparkle» — сайт откроется в браузере
+ Войдите или создайте бесплатный аккаунт
+ Нажмите «Connect» — вы вернётесь сюда уже с ключом
Далее
Начать
Пропустить, выберу другой сервер
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index e1c5289..e84d0e2 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -141,20 +141,29 @@
访问密钥
粘贴 skysparkle.cc 账户中的密钥或完整地址
这看起来不像密钥。请在“密钥”页面重新复制。
- 获取免费密钥
- SkySparkle 服务器需要个人访问密钥。完全免费:在 skysparkle.cc 创建账户并添加密钥。
+ 使用 Skysparkle 登录
+ 重新登录
+ 正在登录…
+ 或手动粘贴账户中的密钥
+ 已登录,密钥已添加。
+ 登录失败,请重试。
+ 登录耗时过长,请重新开始。
+ 请先确认电子邮箱,然后重新登录。
+ 此 Skysparkle 账户已被暂停。
+ 无法连接 skysparkle.cc。请检查网络后重试。
+ SkySparkle 服务器需要个人访问密钥。完全免费:使用 Skysparkle 登录,应用会自动获取密钥。
添加密钥
- SkySparkle 服务器需要访问密钥。请打开 SparkleDNS,在“设置”中添加密钥。
+ SkySparkle 服务器需要访问密钥。请打开 SparkleDNS,在“设置”中使用 Skysparkle 登录。
欢迎使用 SparkleDNS
为整部手机提供私密 DNS,不使用大型科技公司的服务器。
通过 DNS-over-HTTPS 加密每一次 DNS 查询
在所有应用中拦截广告和跟踪器
只使用独立服务器,不用 Google 或 Cloudflare
获取访问密钥
- SkySparkle 服务器使用个人密钥。免费套餐有限制,付费套餐没有。
- 在 skysparkle.cc 创建免费账户
- 打开“密钥”,为这部手机创建密钥
- 复制密钥或地址,粘贴到下方
+ SkySparkle 服务器使用个人密钥。完全免费:登录后,应用会自动获取密钥。
+ 点击“使用 Skysparkle 登录”——网站将在浏览器中打开
+ 登录或创建免费账户
+ 点击“Connect”——带着密钥回到这里
下一步
开始
跳过,我选择其他服务器
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 002da78..4b90d4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -142,20 +142,29 @@
Access key
Paste the key or the whole address from your account at skysparkle.cc
This doesn\'t look like a key. Copy it again from the Keys page.
- Get a free key
- The SkySparkle server needs a personal access key. It is free: create an account at skysparkle.cc and add the key.
+ Sign in with Skysparkle
+ Sign in again
+ Signing in…
+ Or paste a key from your account by hand
+ Signed in. The key has been added.
+ Sign-in failed. Please try again.
+ The sign-in took too long. Please start again.
+ Confirm your e-mail first, then sign in again.
+ This Skysparkle account is suspended.
+ No connection to skysparkle.cc. Check the internet and try again.
+ The SkySparkle server needs a personal access key. It is free: sign in with Skysparkle and the app gets the key by itself.
Add key
- The SkySparkle server needs an access key. Open SparkleDNS and add your key in Settings.
+ The SkySparkle server needs an access key. Open SparkleDNS and sign in with Skysparkle in Settings.
Welcome to SparkleDNS
Private DNS for your whole phone, without big-tech servers.
Encrypts every DNS lookup with DNS-over-HTTPS
Blocks ads and trackers in all apps
Uses only independent servers, never Google or Cloudflare
Get your access key
- The SkySparkle server works with a personal key. The free plan has limits; paid plans have none.
- Create a free account at skysparkle.cc
- Open Keys and create a key for this phone
- Copy the key or the address and paste it below
+ The SkySparkle server works with a personal key. It is free: sign in, and the app gets the key by itself.
+ Tap “Sign in with Skysparkle” — the site opens in your browser
+ Sign in or create a free account
+ Tap “Connect” — you are back here with the key
Next
Start
Skip, I\'ll choose another server