mirror of
https://github.com/kalarina-bit/Sparkledns.git
synced 2026-11-22 07:36:09 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e039ab0d46 | ||
|
|
032a49f1f8 | ||
|
|
9ca55a4d40 | ||
|
|
00e30cb858 | ||
|
|
41a8f94f65 | ||
|
|
6bd72d3583 | ||
|
|
59194a7914 | ||
|
|
0f8bb8dc9d | ||
|
|
8bccbe597c | ||
|
|
73959b16b2 | ||
|
|
838507ec63 | ||
|
|
3de0f84aab | ||
|
|
9b40f7e7af | ||
|
|
eda2353cf4 | ||
|
|
728dbba49b | ||
|
|
91f7d99508 | ||
|
|
442aad40ac | ||
|
|
6dbe67e5c0 | ||
|
|
d036bbe93a | ||
|
|
42326e0933 | ||
|
|
9dda504172 | ||
|
|
44790eb68f | ||
|
|
149d08b082 | ||
|
|
25b6dc7d6c | ||
|
|
00d15bac74 | ||
|
|
f438d44e03 |
@@ -0,0 +1,2 @@
|
|||||||
|
* text=auto eol=lf
|
||||||
|
*.bat text eol=crlf
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
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)
|
||||||
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
---
|
||||||
|
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):
|
||||||
|
|
||||||
|
- [ ] DoH server: public and supports RFC 8484
|
||||||
|
- [ ] Blocklist: public and actively maintained
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
---
|
||||||
|
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:
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
## 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
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
# Contributing to SparkleDNS
|
||||||
|
|
||||||
|
Thanks for wanting to help! This guide explains where to contribute, what fits the project and how to send changes.
|
||||||
|
|
||||||
|
## Where to contribute
|
||||||
|
|
||||||
|
Issues and pull requests go to the repository on [Gitea](https://git.skysparkle.cc/kalarina/Sparkledns).
|
||||||
|
|
||||||
|
## Ways to help
|
||||||
|
|
||||||
|
- **Report a bug** — use the *Bug report* template.
|
||||||
|
- **Add a DoH server** — add one line to [`servers/servers.txt`](servers/servers.txt), see [Adding a DoH server](#adding-a-doh-server).
|
||||||
|
- **Suggest a blocklist** — use the *DoH server or blocklist* template.
|
||||||
|
- **Suggest a feature** — use the *Feature request* template; check [Out of scope](#out-of-scope) first.
|
||||||
|
- **Fix a translation** — use the *Translation fix* template or send a pull request.
|
||||||
|
- **Write code** — see [Pull requests](#pull-requests).
|
||||||
|
|
||||||
|
## Before you start
|
||||||
|
|
||||||
|
- **Small changes** (typos, obvious bugs, translation fixes): send a pull request directly.
|
||||||
|
- **Anything bigger** (new features, UI changes, new dependencies): open an issue first and wait for a go-ahead, so your work isn't wasted.
|
||||||
|
|
||||||
|
## Ground rules
|
||||||
|
|
||||||
|
- No ads, analytics, telemetry, trackers or accounts.
|
||||||
|
- DNS queries may only go to the DoH server the user selected — never anywhere else.
|
||||||
|
- No Google Play Services, Firebase or other proprietary libraries — the app must stay buildable for F-Droid.
|
||||||
|
- New dependencies must be open source and justified in the pull request.
|
||||||
|
- Be respectful in issues and reviews.
|
||||||
|
|
||||||
|
## Out of scope
|
||||||
|
|
||||||
|
These will not be accepted:
|
||||||
|
|
||||||
|
- Changing the default DoH server.
|
||||||
|
- Logging, uploading or sharing users' DNS queries.
|
||||||
|
- Features that require Google Play Services or a proprietary SDK.
|
||||||
|
|
||||||
|
## Adding a DoH server
|
||||||
|
|
||||||
|
The server list lives in [`servers/servers.txt`](servers/servers.txt). The app downloads it when the user taps **Update server list**, so a new server reaches users without a new release.
|
||||||
|
|
||||||
|
To add a server, open the file on Gitea, click **Edit**, add one line at the end and send it as a pull request:
|
||||||
|
|
||||||
|
```
|
||||||
|
Name | DoH URL | Privacy policy | h3
|
||||||
|
```
|
||||||
|
|
||||||
|
- **Name** — how the server appears in the app, up to 40 characters.
|
||||||
|
- **DoH URL** — the full `https://` address of the DoH endpoint.
|
||||||
|
- **Privacy policy** — an `https://` link to the operator's privacy policy. Lines without one are ignored.
|
||||||
|
- **h3** — optional. Add it only if the server supports HTTP/3.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
```
|
||||||
|
Example DNS | https://dns.example.org/dns-query | https://example.org/privacy | h3
|
||||||
|
```
|
||||||
|
|
||||||
|
The server must:
|
||||||
|
|
||||||
|
- be public and free, without an account;
|
||||||
|
- support RFC 8484;
|
||||||
|
- publish what it logs, and not sell or share query data;
|
||||||
|
- be run by a non-profit, a community or an individual rather than a large company.
|
||||||
|
|
||||||
|
Before sending, check that it works: in the app choose **Custom server**, enter the URL and tap **Test server**.
|
||||||
|
|
||||||
|
Please don't change the lines of the servers that ship with the app (SkySparkle, Quad9, Digitale Gesellschaft, UncensoredDNS, Freifunk München): the app always keeps their built-in addresses. If you are unsure whether a server fits, open an issue with the *DoH server or blocklist* template instead.
|
||||||
|
|
||||||
|
## Blocklists
|
||||||
|
|
||||||
|
Blocklist presets must be public, actively maintained and licensed for this kind of use. Use the *DoH server or blocklist* template and include a link to the list's homepage.
|
||||||
|
|
||||||
|
## Translations
|
||||||
|
|
||||||
|
SparkleDNS is available in exactly six languages: English, Russian, German, Japanese, Lithuanian and Chinese. Fixes to these are welcome; new languages are not accepted.
|
||||||
|
|
||||||
|
- App strings: `app/src/main/res/values-<lang>/strings.xml` (English is `values/`).
|
||||||
|
- Store listing: `fastlane/metadata/android/<locale>/`.
|
||||||
|
|
||||||
|
If your code adds new strings, add them to `values/strings.xml`. Translations for the other languages are welcome but not required — mention missing ones in the pull request.
|
||||||
|
|
||||||
|
## Pull requests
|
||||||
|
|
||||||
|
1. Fork the repository and create a branch from `main`.
|
||||||
|
2. Keep one topic per pull request.
|
||||||
|
3. Follow the existing Kotlin and Jetpack Compose style; keep comments short and in English; don't reformat unrelated code.
|
||||||
|
4. Make sure `./gradlew assembleDebug` builds, and test on a device or emulator.
|
||||||
|
5. Write short, plain commit messages in English (for example `Fix tunnel restart after server switch`).
|
||||||
|
6. Add screenshots for UI changes.
|
||||||
|
|
||||||
|
## Security
|
||||||
|
|
||||||
|
Please don't post details of security issues publicly. Open a short issue titled "Security contact" without any details, and the maintainer will reach out privately.
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
By contributing, you agree that your contribution is licensed under the [GNU General Public License v3.0 or later](LICENSE), the same as the rest of the project.
|
||||||
@@ -1,20 +1,21 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="assets/icon-rounded.png" width="128" alt="Sparkledns icon">
|
<img src="assets/icon-rounded.png" width="128" alt="SparkleDNS icon">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h1 align="center">SparkleDns</h1>
|
<h1 align="center">SparkleDNS</h1>
|
||||||
|
|
||||||
|
<p align="center"><b>A lightweight DNS-over-HTTPS client for Android.</b></p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://git.skysparkle.cc/kalarina/Sparkledns/releases"><img src="assets/get-it-on-gitea.png" height="60" alt="Get it on Gitea"></a>
|
<a href="https://git.skysparkle.cc/kalarina/Sparkledns/releases"><img src="assets/get-it-on-gitea.png" height="60" alt="Get it on Gitea"></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="https://img.shields.io/github/downloads/kalarina-bit/Sparkledns/latest/total?label=downloads&color=2e7d32&labelColor=1b1b1b" alt="downloads counter">
|
<img src="https://img.shields.io/badge/Android-8.0%2B-2e7d32?logo=android&logoColor=white&labelColor=1b1b1b" alt="Android 8.0+">
|
||||||
|
<img src="https://img.shields.io/badge/License-GPL--3.0--or--later-2e7d32?labelColor=1b1b1b" alt="GPL-3.0-or-later">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
**Lightweight DNS-over-HTTPS client for Android** (Kotlin, Jetpack Compose).
|
SparkleDNS starts a local VPN that captures only DNS traffic and sends every query to the DoH server you choose (RFC 8484). Everything else goes through your normal connection.
|
||||||
|
|
||||||
The app starts a local VPN that captures only DNS traffic and forwards every query to the selected DoH server (RFC 8484) — everything else goes through your normal connection.
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
@@ -40,48 +41,46 @@ The app starts a local VPN that captures only DNS traffic and forwards every que
|
|||||||
|
|
||||||
<img src="assets/icon-install.png" width="36" align="left">
|
<img src="assets/icon-install.png" width="36" align="left">
|
||||||
|
|
||||||
1. Download the APK for the version you want from the [Releases page](https://github.com/kalarina-bit/Sparkledns/releases).
|
1. Download the latest APK from the [Releases page](https://git.skysparkle.cc/kalarina/Sparkledns/releases).
|
||||||
2. On your Android device, allow installs from unknown sources for the app you use to open the file (Settings → Apps → Special access → Install unknown apps).
|
2. Allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps).
|
||||||
3. Open the downloaded `.apk` file and confirm the install.
|
3. Open the `.apk` file and confirm the install.
|
||||||
|
|
||||||
## Verifying a download
|
## Verifying a download
|
||||||
|
|
||||||
<img src="assets/icon-verify.png" width="36" align="left">
|
<img src="assets/icon-verify.png" width="36" align="left">
|
||||||
|
|
||||||
Compare the SHA-256 checksum of the downloaded APK against the value shown for that version on the [Releases page](https://github.com/kalarina-bit/Sparkledns/releases):
|
Every official APK is signed with the same key. Check it before installing:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sha256sum Sparkledns-vX.X.X.apk
|
apksigner verify --print-certs SparkleDNS-v<version>.apk
|
||||||
```
|
```
|
||||||
|
|
||||||
|
The SHA-256 fingerprint of the signing certificate must be:
|
||||||
|
|
||||||
|
```
|
||||||
|
42:F6:30:63:4B:D0:F8:7F:49:17:85:A8:84:87:70:E4:45:96:7B:36:F1:02:8E:FD:16:F8:F9:52:01:27:3A:29
|
||||||
|
```
|
||||||
|
|
||||||
|
`apksigner` prints the same value in lowercase without colons. On Android you can check it with [AppVerifier](https://github.com/soupslurpr/AppVerifier) (app ID `cc.skysparkle.sparkledns`).
|
||||||
|
|
||||||
## Building from source
|
## Building from source
|
||||||
|
|
||||||
|
Requires JDK 17+ and Android SDK 36.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
./gradlew assembleRelease
|
./gradlew assembleRelease
|
||||||
```
|
```
|
||||||
|
|
||||||
Or open the project in Android Studio and run the `app` configuration. Requires Android 8.0 (API 26) or newer; HTTP/3 requires Android 14.
|
### Releasing
|
||||||
|
|
||||||
The version lives in `app/build.gradle.kts` (`versionName`, `versionCode = major * 10000 + minor * 100 + patch`). For every release, add `fastlane/metadata/android/<locale>/changelogs/<versionCode>.txt` and tag the commit as `v<versionName>` (for example `v1.0.6`) — F-Droid detects new releases from these tags.
|
1. Bump `versionName` and `versionCode` in `app/build.gradle.kts` (`versionCode = major * 10000 + minor * 100 + patch`).
|
||||||
|
2. Add `fastlane/metadata/android/<locale>/changelogs/<versionCode>.txt`.
|
||||||
|
3. Tag the commit as `v<versionName>` (for example `v1.0.6`) — F-Droid detects new releases from these tags.
|
||||||
|
|
||||||
## Repository structure
|
## Contributing
|
||||||
|
|
||||||
<img src="assets/icon-structure.png" width="36" align="left">
|
Bug reports, DoH server and blocklist suggestions, translation fixes and pull requests are welcome in the [issue tracker](https://git.skysparkle.cc/kalarina/Sparkledns/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes. To open an issue or a pull request, [create an account](https://git.skysparkle.cc/user/sign_up) on this Gitea.
|
||||||
|
|
||||||
```
|
|
||||||
.
|
|
||||||
├── app/ # Android app source (Kotlin, Jetpack Compose)
|
|
||||||
├── assets/ # README images
|
|
||||||
│ └── screenshots/ # App screenshots
|
|
||||||
├── fastlane/ # F-Droid store listing, screenshots and changelogs
|
|
||||||
├── fdroid/ # Build recipe for fdroiddata
|
|
||||||
├── gradle/ # Gradle wrapper
|
|
||||||
├── LICENSE # GNU GPLv3
|
|
||||||
└── README.md
|
|
||||||
```
|
|
||||||
|
|
||||||
APK builds are published as assets on the [Releases page](https://github.com/kalarina-bit/Sparkledns/releases), not stored in this repository.
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
This project is licensed under the **GNU General Public License v3.0** — see the [LICENSE](LICENSE) file for details.
|
[GNU General Public License v3.0 or later](LICENSE).
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ android {
|
|||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
// Single source of truth: the About screen reads these through BuildConfig.
|
// Single source of truth: the About screen reads these through BuildConfig.
|
||||||
// Kept as plain literals so F-Droid can detect new versions. Code = major * 10000 + minor * 100 + patch.
|
// Kept as plain literals so F-Droid can detect new versions. Code = major * 10000 + minor * 100 + patch.
|
||||||
versionCode = 10006
|
versionCode = 10007
|
||||||
versionName = "1.0.6"
|
versionName = "1.0.7"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ import androidx.compose.ui.unit.dp
|
|||||||
|
|
||||||
private const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en"
|
private const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en"
|
||||||
private const val SOURCE_CODE = "https://git.skysparkle.cc/kalarina/Sparkledns"
|
private const val SOURCE_CODE = "https://git.skysparkle.cc/kalarina/Sparkledns"
|
||||||
private const val APP_LICENSE = "GPL-3.0-or-later"
|
|
||||||
|
|
||||||
private const val APACHE_2 = "Apache License 2.0"
|
private const val APACHE_2 = "Apache License 2.0"
|
||||||
private const val APACHE_2_URL = "https://www.apache.org/licenses/LICENSE-2.0"
|
private const val APACHE_2_URL = "https://www.apache.org/licenses/LICENSE-2.0"
|
||||||
@@ -149,7 +148,6 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) {
|
|||||||
InfoRow(stringResource(R.string.about_version), BuildConfig.VERSION_NAME)
|
InfoRow(stringResource(R.string.about_version), BuildConfig.VERSION_NAME)
|
||||||
InfoRow(stringResource(R.string.about_protocol), "DNS-over-HTTPS (RFC 8484)")
|
InfoRow(stringResource(R.string.about_protocol), "DNS-over-HTTPS (RFC 8484)")
|
||||||
InfoRow("HTTP/3", http3)
|
InfoRow("HTTP/3", http3)
|
||||||
InfoRow(stringResource(R.string.about_license), APP_LICENSE)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,7 +263,7 @@ private fun InfoRow(label: String, value: String) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun openUrl(context: Context, url: String) {
|
internal fun openUrl(context: Context, url: String) {
|
||||||
runCatching {
|
runCatching {
|
||||||
context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
|
context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,9 @@ fun AppsScreen(modifier: Modifier = Modifier) {
|
|||||||
var search by rememberSaveable { mutableStateOf("") }
|
var search by rememberSaveable { mutableStateOf("") }
|
||||||
var collapsed by remember { mutableStateOf(setOf(AppGroup.SYSTEM)) }
|
var collapsed by remember { mutableStateOf(setOf(AppGroup.SYSTEM)) }
|
||||||
val pending = active != null && excluded != activeExcluded
|
val pending = active != null && excluded != activeExcluded
|
||||||
|
var showAppsHint by remember { mutableStateOf(!prefs.isHintDismissed(HINT_APPS)) }
|
||||||
|
// Closing the "reconnect" card hides it until the selection changes again
|
||||||
|
var pendingDismissedFor by remember { mutableStateOf<Set<String>?>(null) }
|
||||||
// Uninstalled apps may still be in the saved set; count only the ones on the device
|
// Uninstalled apps may still be in the saved set; count only the ones on the device
|
||||||
val excludedCount = apps?.count { it.packageName in excluded } ?: excluded.size
|
val excludedCount = apps?.count { it.packageName in excluded } ?: excluded.size
|
||||||
val searching = search.isNotBlank()
|
val searching = search.isNotBlank()
|
||||||
@@ -122,8 +125,21 @@ fun AppsScreen(modifier: Modifier = Modifier) {
|
|||||||
) {
|
) {
|
||||||
item {
|
item {
|
||||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
HintCard(stringResource(R.string.apps_hint), icon = R.drawable.ic_tab_info)
|
AnimatedVisibility(visible = showAppsHint, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
||||||
AnimatedVisibility(visible = pending, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
HintCard(
|
||||||
|
stringResource(R.string.apps_hint),
|
||||||
|
icon = R.drawable.ic_tab_info,
|
||||||
|
onDismiss = {
|
||||||
|
showAppsHint = false
|
||||||
|
prefs.dismissHint(HINT_APPS)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
AnimatedVisibility(
|
||||||
|
visible = pending && excluded != pendingDismissedFor,
|
||||||
|
enter = Motion.expandIn,
|
||||||
|
exit = Motion.collapseOut,
|
||||||
|
) {
|
||||||
HintCard(
|
HintCard(
|
||||||
text = stringResource(R.string.apps_pending),
|
text = stringResource(R.string.apps_pending),
|
||||||
icon = R.drawable.ic_refresh,
|
icon = R.drawable.ic_refresh,
|
||||||
@@ -133,6 +149,7 @@ fun AppsScreen(modifier: Modifier = Modifier) {
|
|||||||
Text(stringResource(R.string.reconnect))
|
Text(stringResource(R.string.reconnect))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
onDismiss = { pendingDismissedFor = excluded },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -345,3 +362,5 @@ private fun Drawable.toImageBitmap(size: Int): ImageBitmap {
|
|||||||
draw(canvas)
|
draw(canvas)
|
||||||
return bitmap.asImageBitmap()
|
return bitmap.asImageBitmap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private const val HINT_APPS = "apps"
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ private val Presets = listOf(
|
|||||||
fun BlocklistScreen(modifier: Modifier = Modifier) {
|
fun BlocklistScreen(modifier: Modifier = Modifier) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
|
val prefs = remember { Prefs(context) }
|
||||||
|
var showNote by remember { mutableStateOf(!prefs.isHintDismissed(HINT_BLOCKLIST)) }
|
||||||
|
|
||||||
val enabled by Blocklist.enabled.collectAsState()
|
val enabled by Blocklist.enabled.collectAsState()
|
||||||
val total by Blocklist.total.collectAsState()
|
val total by Blocklist.total.collectAsState()
|
||||||
@@ -124,7 +126,16 @@ fun BlocklistScreen(modifier: Modifier = Modifier) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
HintCard(stringResource(R.string.bl_note), icon = R.drawable.ic_tab_info)
|
AnimatedVisibility(visible = showNote, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
||||||
|
HintCard(
|
||||||
|
stringResource(R.string.bl_note),
|
||||||
|
icon = R.drawable.ic_tab_info,
|
||||||
|
onDismiss = {
|
||||||
|
showNote = false
|
||||||
|
prefs.dismissHint(HINT_BLOCKLIST)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
SectionHeader(stringResource(R.string.bl_my), icon = R.drawable.ic_tab_block)
|
SectionHeader(stringResource(R.string.bl_my), icon = R.drawable.ic_tab_block)
|
||||||
|
|
||||||
@@ -346,3 +357,5 @@ private fun ListRow(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private const val HINT_BLOCKLIST = "blocklist"
|
||||||
|
|||||||
@@ -53,7 +53,9 @@ import androidx.compose.material3.Button
|
|||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
import androidx.compose.material3.HorizontalDivider
|
import androidx.compose.material3.HorizontalDivider
|
||||||
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.OutlinedButton
|
import androidx.compose.material3.OutlinedButton
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
@@ -63,6 +65,7 @@ import androidx.compose.material3.Text
|
|||||||
import androidx.compose.material3.TextButton
|
import androidx.compose.material3.TextButton
|
||||||
import androidx.compose.material3.darkColorScheme
|
import androidx.compose.material3.darkColorScheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
@@ -121,6 +124,10 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
val stats = rememberLiveStats()
|
val stats = rememberLiveStats()
|
||||||
|
|
||||||
var selected by remember { mutableStateOf(prefs.providerId) }
|
var selected by remember { mutableStateOf(prefs.providerId) }
|
||||||
|
val servers by ServerList.servers.collectAsState()
|
||||||
|
var syncing by remember { mutableStateOf(false) }
|
||||||
|
var syncResult by remember { mutableStateOf<TestResult?>(null) }
|
||||||
|
var shownSync by remember { mutableStateOf<TestResult?>(null) }
|
||||||
var customUrl by remember { mutableStateOf(prefs.customUrl) }
|
var customUrl by remember { mutableStateOf(prefs.customUrl) }
|
||||||
var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) }
|
var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) }
|
||||||
var customHttp3 by remember { mutableStateOf(prefs.customHttp3) }
|
var customHttp3 by remember { mutableStateOf(prefs.customHttp3) }
|
||||||
@@ -140,7 +147,7 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
val isCustom = selected == Providers.CUSTOM_ID
|
val isCustom = selected == Providers.CUSTOM_ID
|
||||||
val customValid = customUrl.trim().toHttpUrlOrNull()?.isHttps == true
|
val customValid = customUrl.trim().toHttpUrlOrNull()?.isHttps == true
|
||||||
val canConnect = !isCustom || customValid
|
val canConnect = !isCustom || customValid
|
||||||
val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3) { prefs.resolve() }
|
val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3, servers) { prefs.resolve() }
|
||||||
val customName = stringResource(R.string.custom)
|
val customName = stringResource(R.string.custom)
|
||||||
fun nameOf(p: DohProvider) = if (p.id == Providers.CUSTOM_ID) customName else p.name
|
fun nameOf(p: DohProvider) = if (p.id == Providers.CUSTOM_ID) customName else p.name
|
||||||
val shownProvider = active ?: selectedProvider
|
val shownProvider = active ?: selectedProvider
|
||||||
@@ -181,6 +188,30 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
testResult = null
|
testResult = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A server removed from the list falls back to the default one
|
||||||
|
LaunchedEffect(servers) {
|
||||||
|
if (selected != Providers.CUSTOM_ID && servers.none { it.id == selected }) select(Providers.default.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
val syncOk = stringResource(R.string.servers_updated)
|
||||||
|
val syncFail = stringResource(R.string.servers_update_failed)
|
||||||
|
fun syncServers() {
|
||||||
|
syncing = true
|
||||||
|
syncResult = null
|
||||||
|
scope.launch {
|
||||||
|
val result = withContext(Dispatchers.IO) {
|
||||||
|
runCatching { ServerList.sync(context) }
|
||||||
|
.fold(
|
||||||
|
onSuccess = { TestResult(true, syncOk) },
|
||||||
|
onFailure = { TestResult(false, syncFail.format(it.message ?: it.javaClass.simpleName)) },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
shownSync = result
|
||||||
|
syncResult = result
|
||||||
|
syncing = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun runTest() {
|
fun runTest() {
|
||||||
val provider = prefs.resolve()
|
val provider = prefs.resolve()
|
||||||
testing = true
|
testing = true
|
||||||
@@ -223,19 +254,48 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
onSwitch = { sendAction(context, DohVpnService.ACTION_START) },
|
onSwitch = { sendAction(context, DohVpnService.ACTION_START) },
|
||||||
)
|
)
|
||||||
|
|
||||||
SectionHeader(stringResource(R.string.servers))
|
SectionHeader(stringResource(R.string.servers)) {
|
||||||
|
if (syncing) {
|
||||||
|
Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) {
|
||||||
|
CircularProgressIndicator(Modifier.size(20.dp), strokeWidth = 2.dp)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
IconButton(onClick = ::syncServers) {
|
||||||
|
Icon(
|
||||||
|
painterResource(R.drawable.ic_refresh),
|
||||||
|
contentDescription = stringResource(R.string.servers_update),
|
||||||
|
modifier = Modifier.size(20.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AnimatedVisibility(visible = syncResult != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
||||||
|
shownSync?.let { result ->
|
||||||
|
HintCard(
|
||||||
|
text = result.text,
|
||||||
|
icon = if (result.ok) R.drawable.ic_check else R.drawable.ic_alert,
|
||||||
|
tint = if (result.ok) CachedColor else MaterialTheme.colorScheme.error,
|
||||||
|
onDismiss = { syncResult = null },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
Card(Modifier.fillMaxWidth()) {
|
||||||
Column(Modifier.padding(vertical = 6.dp)) {
|
Column(Modifier.padding(vertical = 6.dp)) {
|
||||||
Providers.list.forEachIndexed { index, p ->
|
servers.forEachIndexed { index, p ->
|
||||||
if (index > 0) RowDivider()
|
if (index > 0) RowDivider()
|
||||||
ProviderRow(p.name, hostOf(p.url), p.http3, selected == p.id) { select(p.id) }
|
ProviderRow(
|
||||||
|
title = p.name,
|
||||||
|
subtitle = hostOf(p.url),
|
||||||
|
selected = selected == p.id,
|
||||||
|
onPolicy = p.policy?.let { url -> { openUrl(context, url) } },
|
||||||
|
) { select(p.id) }
|
||||||
}
|
}
|
||||||
RowDivider()
|
RowDivider()
|
||||||
ProviderRow(
|
ProviderRow(
|
||||||
title = stringResource(R.string.custom),
|
title = stringResource(R.string.custom),
|
||||||
subtitle = hostOf(customUrl),
|
subtitle = hostOf(customUrl),
|
||||||
http3 = customHttp3,
|
|
||||||
selected = isCustom,
|
selected = isCustom,
|
||||||
) { select(Providers.CUSTOM_ID) }
|
) { select(Providers.CUSTOM_ID) }
|
||||||
}
|
}
|
||||||
@@ -308,13 +368,19 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
text = result.text,
|
text = result.text,
|
||||||
icon = if (result.ok) R.drawable.ic_check else R.drawable.ic_alert,
|
icon = if (result.ok) R.drawable.ic_check else R.drawable.ic_alert,
|
||||||
tint = if (result.ok) CachedColor else MaterialTheme.colorScheme.error,
|
tint = if (result.ok) CachedColor else MaterialTheme.colorScheme.error,
|
||||||
|
onDismiss = { testResult = null },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val lastHost = remember { arrayOf("") }
|
val lastHost = remember { arrayOf("") }
|
||||||
privateDnsHost?.let { lastHost[0] = it }
|
privateDnsHost?.let { lastHost[0] = it }
|
||||||
AnimatedVisibility(visible = privateDnsHost != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
var dismissedDnsHost by remember { mutableStateOf(prefs.dismissedPrivateDns) }
|
||||||
|
AnimatedVisibility(
|
||||||
|
visible = privateDnsHost != null && privateDnsHost != dismissedDnsHost,
|
||||||
|
enter = Motion.expandIn,
|
||||||
|
exit = Motion.collapseOut,
|
||||||
|
) {
|
||||||
HintCard(
|
HintCard(
|
||||||
text = stringResource(R.string.hint, lastHost[0]),
|
text = stringResource(R.string.hint, lastHost[0]),
|
||||||
icon = R.drawable.ic_alert,
|
icon = R.drawable.ic_alert,
|
||||||
@@ -322,6 +388,10 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
action = {
|
action = {
|
||||||
TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) }
|
TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) }
|
||||||
},
|
},
|
||||||
|
onDismiss = {
|
||||||
|
dismissedDnsHost = lastHost[0]
|
||||||
|
prefs.dismissedPrivateDns = lastHost[0]
|
||||||
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -496,7 +566,13 @@ private fun CrashCard(report: String, onCopy: () -> Unit, onDismiss: () -> Unit)
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun ProviderRow(title: String, subtitle: String, http3: Boolean, selected: Boolean, onClick: () -> Unit) {
|
private fun ProviderRow(
|
||||||
|
title: String,
|
||||||
|
subtitle: String,
|
||||||
|
selected: Boolean,
|
||||||
|
onPolicy: (() -> Unit)? = null,
|
||||||
|
onClick: () -> Unit,
|
||||||
|
) {
|
||||||
val highlight by animateColorAsState(
|
val highlight by animateColorAsState(
|
||||||
if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.08f) else Color.Transparent,
|
if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.08f) else Color.Transparent,
|
||||||
animationSpec = Motion.color,
|
animationSpec = Motion.color,
|
||||||
@@ -522,9 +598,15 @@ private fun ProviderRow(title: String, subtitle: String, http3: Boolean, selecte
|
|||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (http3) {
|
if (onPolicy != null) {
|
||||||
Spacer(Modifier.width(8.dp))
|
IconButton(onClick = onPolicy, modifier = Modifier.size(40.dp)) {
|
||||||
Pill("HTTP/3", MaterialTheme.colorScheme.primary)
|
Icon(
|
||||||
|
painterResource(R.drawable.ic_policy),
|
||||||
|
contentDescription = stringResource(R.string.about_privacy_policy),
|
||||||
|
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
modifier = Modifier.size(18.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ import android.content.Context
|
|||||||
class Prefs(context: Context) {
|
class Prefs(context: Context) {
|
||||||
private val sp = context.applicationContext.getSharedPreferences("doh", Context.MODE_PRIVATE)
|
private val sp = context.applicationContext.getSharedPreferences("doh", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
|
init {
|
||||||
|
ServerList.ensureLoaded(context.applicationContext)
|
||||||
|
}
|
||||||
|
|
||||||
var providerId: String
|
var providerId: String
|
||||||
get() = sp.getString(KEY_PROVIDER, null) ?: Providers.default.id
|
get() = sp.getString(KEY_PROVIDER, null) ?: Providers.default.id
|
||||||
set(value) = sp.edit().putString(KEY_PROVIDER, value).apply()
|
set(value) = sp.edit().putString(KEY_PROVIDER, value).apply()
|
||||||
@@ -25,6 +29,20 @@ class Prefs(context: Context) {
|
|||||||
get() = sp.getStringSet(KEY_EXCLUDED, null)?.toSet() ?: emptySet()
|
get() = sp.getStringSet(KEY_EXCLUDED, null)?.toSet() ?: emptySet()
|
||||||
set(value) = sp.edit().putStringSet(KEY_EXCLUDED, value).apply()
|
set(value) = sp.edit().putStringSet(KEY_EXCLUDED, value).apply()
|
||||||
|
|
||||||
|
// Hint cards the user closed with the X
|
||||||
|
fun isHintDismissed(key: String): Boolean =
|
||||||
|
sp.getStringSet(KEY_HINTS, null)?.contains(key) == true
|
||||||
|
|
||||||
|
fun dismissHint(key: String) {
|
||||||
|
val current = sp.getStringSet(KEY_HINTS, null)?.toSet() ?: emptySet()
|
||||||
|
sp.edit().putStringSet(KEY_HINTS, current + key).apply()
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Private DNS warning stays closed until the hostname changes
|
||||||
|
var dismissedPrivateDns: String
|
||||||
|
get() = sp.getString(KEY_PRIVATE_DNS, null) ?: ""
|
||||||
|
set(value) = sp.edit().putString(KEY_PRIVATE_DNS, value).apply()
|
||||||
|
|
||||||
fun resolve(): DohProvider =
|
fun resolve(): DohProvider =
|
||||||
if (providerId == Providers.CUSTOM_ID) {
|
if (providerId == Providers.CUSTOM_ID) {
|
||||||
DohProvider(Providers.CUSTOM_ID, "Custom", customUrl.trim(), parseIps(customBootstrap), customHttp3)
|
DohProvider(Providers.CUSTOM_ID, "Custom", customUrl.trim(), parseIps(customBootstrap), customHttp3)
|
||||||
@@ -38,5 +56,7 @@ class Prefs(context: Context) {
|
|||||||
const val KEY_BOOTSTRAP = "custom_bootstrap"
|
const val KEY_BOOTSTRAP = "custom_bootstrap"
|
||||||
const val KEY_HTTP3 = "custom_http3"
|
const val KEY_HTTP3 = "custom_http3"
|
||||||
const val KEY_EXCLUDED = "excluded_apps"
|
const val KEY_EXCLUDED = "excluded_apps"
|
||||||
|
const val KEY_HINTS = "dismissed_hints"
|
||||||
|
const val KEY_PRIVATE_DNS = "dismissed_private_dns"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,14 @@
|
|||||||
package cc.skysparkle.sparkledns
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
||||||
|
import okhttp3.OkHttpClient
|
||||||
|
import okhttp3.Request
|
||||||
|
import java.io.File
|
||||||
|
import java.io.IOException
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
data class DohProvider(
|
data class DohProvider(
|
||||||
val id: String,
|
val id: String,
|
||||||
@@ -8,25 +16,141 @@ data class DohProvider(
|
|||||||
val url: String,
|
val url: String,
|
||||||
val bootstrap: List<String> = emptyList(),
|
val bootstrap: List<String> = emptyList(),
|
||||||
val http3: Boolean = false,
|
val http3: Boolean = false,
|
||||||
|
val policy: String? = null,
|
||||||
)
|
)
|
||||||
|
|
||||||
object Providers {
|
object Providers {
|
||||||
const val CUSTOM_ID = "custom"
|
const val CUSTOM_ID = "custom"
|
||||||
|
const val DEFAULT_ID = "skysparkle"
|
||||||
|
|
||||||
val list = listOf(
|
// Shipped with the app and used until the list from the repository is downloaded
|
||||||
DohProvider("skysparkle", "SkySparkle", "https://blog.skysparkle.cc/dns-query", http3 = true),
|
val builtIn = listOf(
|
||||||
DohProvider("cloudflare", "Cloudflare", "https://cloudflare-dns.com/dns-query", listOf("1.1.1.1", "1.0.0.1")),
|
DohProvider(
|
||||||
DohProvider("google", "Google", "https://dns.google/dns-query", listOf("8.8.8.8", "8.8.4.4")),
|
"skysparkle", "SkySparkle", "https://blog.skysparkle.cc/dns-query",
|
||||||
DohProvider("quad9", "Quad9", "https://dns.quad9.net/dns-query", listOf("9.9.9.9", "149.112.112.112")),
|
http3 = true, policy = "https://skysparkle.cc/privacy?lang=en",
|
||||||
DohProvider("adguard", "AdGuard", "https://dns.adguard-dns.com/dns-query", listOf("94.140.14.14", "94.140.15.15")),
|
),
|
||||||
DohProvider("mullvad", "Mullvad", "https://dns.mullvad.net/dns-query", listOf("194.242.2.2")),
|
DohProvider(
|
||||||
|
"quad9", "Quad9", "https://dns.quad9.net/dns-query", listOf("9.9.9.9", "149.112.112.112"),
|
||||||
|
policy = "https://quad9.net/service/privacy/",
|
||||||
|
),
|
||||||
|
DohProvider(
|
||||||
|
"digitale-gesellschaft", "Digitale Gesellschaft", "https://dns.digitale-gesellschaft.ch/dns-query",
|
||||||
|
listOf("185.95.218.42", "185.95.218.43"), http3 = true,
|
||||||
|
policy = "https://www.digitale-gesellschaft.ch/dns/",
|
||||||
|
),
|
||||||
|
DohProvider(
|
||||||
|
"uncensoreddns", "UncensoredDNS", "https://anycast.uncensoreddns.org/dns-query", listOf("91.239.100.100"),
|
||||||
|
policy = "https://blog.uncensoreddns.org/faq/",
|
||||||
|
),
|
||||||
|
DohProvider(
|
||||||
|
"ffmuc", "Freifunk München", "https://doh.ffmuc.net/dns-query",
|
||||||
|
listOf("5.1.66.255", "185.150.99.255"), http3 = true,
|
||||||
|
policy = "https://ffmuc.net/dns-privacy/",
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
val default: DohProvider get() = list.first()
|
val list: List<DohProvider> get() = ServerList.servers.value
|
||||||
|
|
||||||
|
// The project's own server stays the default whatever order the list uses
|
||||||
|
val default: DohProvider get() = list.firstOrNull { it.id == DEFAULT_ID } ?: list.first()
|
||||||
|
|
||||||
fun byId(id: String): DohProvider = list.firstOrNull { it.id == id } ?: default
|
fun byId(id: String): DohProvider = list.firstOrNull { it.id == id } ?: default
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The server list kept in the project repository, so servers can change without an app update
|
||||||
|
object ServerList {
|
||||||
|
const val SOURCE = "https://git.skysparkle.cc/kalarina/Sparkledns/raw/branch/main/servers/servers.txt"
|
||||||
|
private const val FILE = "servers.txt"
|
||||||
|
private const val MAX_BYTES = 64 * 1024
|
||||||
|
private const val MAX_SERVERS = 50
|
||||||
|
|
||||||
|
private val _servers = MutableStateFlow(Providers.builtIn)
|
||||||
|
val servers: StateFlow<List<DohProvider>> = _servers
|
||||||
|
|
||||||
|
@Volatile private var loaded = false
|
||||||
|
|
||||||
|
private val client by lazy {
|
||||||
|
OkHttpClient.Builder()
|
||||||
|
.connectTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.readTimeout(30, TimeUnit.SECONDS)
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ensureLoaded(context: Context) {
|
||||||
|
if (loaded) return
|
||||||
|
synchronized(this) {
|
||||||
|
if (loaded) return
|
||||||
|
val cached = runCatching { File(context.filesDir, FILE).readText() }.getOrNull()
|
||||||
|
cached?.let(::parse)?.takeIf { it.isNotEmpty() }?.let { _servers.value = it }
|
||||||
|
loaded = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Blocking: call off the main thread. Returns the number of servers in the new list.
|
||||||
|
fun sync(context: Context): Int {
|
||||||
|
val request = Request.Builder().url(SOURCE).build()
|
||||||
|
val text = client.newCall(request).execute().use { response ->
|
||||||
|
if (!response.isSuccessful) throw IOException("HTTP ${response.code}")
|
||||||
|
val body = response.body ?: throw IOException("Empty response")
|
||||||
|
if (body.contentLength() > MAX_BYTES) throw IOException("List too large")
|
||||||
|
val bytes = body.byteStream().readNBytesCompat(MAX_BYTES + 1)
|
||||||
|
if (bytes.size > MAX_BYTES) throw IOException("List too large")
|
||||||
|
String(bytes, Charsets.UTF_8)
|
||||||
|
}
|
||||||
|
val parsed = parse(text)
|
||||||
|
if (parsed.isEmpty()) throw IOException("No servers found")
|
||||||
|
val file = File(context.filesDir, FILE)
|
||||||
|
val tmp = File(context.filesDir, "$FILE.tmp")
|
||||||
|
tmp.writeText(text)
|
||||||
|
if (!tmp.renameTo(file)) {
|
||||||
|
tmp.delete()
|
||||||
|
throw IOException("Cannot save list")
|
||||||
|
}
|
||||||
|
_servers.value = parsed
|
||||||
|
loaded = true
|
||||||
|
return parsed.size
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format per line: Name | DoH URL | privacy policy URL | h3 (optional). See CONTRIBUTING.md.
|
||||||
|
fun parse(text: String): List<DohProvider> {
|
||||||
|
val builtInByHost = Providers.builtIn.associateBy { it.url.toHttpUrlOrNull()?.host }
|
||||||
|
val seen = HashSet<String>()
|
||||||
|
val result = ArrayList<DohProvider>()
|
||||||
|
for (raw in text.lineSequence()) {
|
||||||
|
val line = raw.trim()
|
||||||
|
if (line.isEmpty() || line.startsWith("#")) continue
|
||||||
|
val cols = line.split('|').map { it.trim() }
|
||||||
|
if (cols.size < 3) continue
|
||||||
|
val name = cols[0].take(40)
|
||||||
|
val url = cols[1].toHttpUrlOrNull()
|
||||||
|
val policy = cols[2].takeIf { it.toHttpUrlOrNull()?.isHttps == true }
|
||||||
|
if (name.isEmpty() || url == null || !url.isHttps) continue
|
||||||
|
// Shipped servers keep their address and id, so an edited list cannot redirect them
|
||||||
|
val pinned = builtInByHost[url.host]
|
||||||
|
val server = pinned
|
||||||
|
?: if (policy == null) continue
|
||||||
|
else DohProvider(url.host, name, cols[1], http3 = cols.getOrElse(3) { "" }.equals("h3", ignoreCase = true), policy = policy)
|
||||||
|
if (!seen.add(server.id)) continue
|
||||||
|
result += server
|
||||||
|
if (result.size >= MAX_SERVERS) break
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun java.io.InputStream.readNBytesCompat(limit: Int): ByteArray {
|
||||||
|
val out = java.io.ByteArrayOutputStream()
|
||||||
|
val buffer = ByteArray(8192)
|
||||||
|
var total = 0
|
||||||
|
while (total < limit) {
|
||||||
|
val read = read(buffer, 0, minOf(buffer.size, limit - total))
|
||||||
|
if (read < 0) break
|
||||||
|
out.write(buffer, 0, read)
|
||||||
|
total += read
|
||||||
|
}
|
||||||
|
return out.toByteArray()
|
||||||
|
}
|
||||||
|
|
||||||
fun parseIps(raw: String): List<String> =
|
fun parseIps(raw: String): List<String> =
|
||||||
raw.split(',', ';', ' ').map { it.trim() }.filter { it.isNotEmpty() }
|
raw.split(',', ';', ' ').map { it.trim() }.filter { it.isNotEmpty() }
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
|
|||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
@@ -35,6 +36,7 @@ import androidx.compose.ui.Modifier
|
|||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
@@ -112,13 +114,23 @@ fun HintCard(
|
|||||||
@DrawableRes icon: Int = R.drawable.ic_tab_info,
|
@DrawableRes icon: Int = R.drawable.ic_tab_info,
|
||||||
tint: Color = MaterialTheme.colorScheme.onSurfaceVariant,
|
tint: Color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
action: (@Composable () -> Unit)? = null,
|
action: (@Composable () -> Unit)? = null,
|
||||||
|
onDismiss: (() -> Unit)? = null,
|
||||||
) {
|
) {
|
||||||
Card(
|
Card(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
colors = CardDefaults.cardColors(containerColor = tint.copy(alpha = 0.10f)),
|
colors = CardDefaults.cardColors(containerColor = tint.copy(alpha = 0.10f)),
|
||||||
) {
|
) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.padding(start = 14.dp, end = if (action != null) 6.dp else 14.dp, top = 12.dp, bottom = 12.dp),
|
modifier = Modifier.padding(
|
||||||
|
start = 14.dp,
|
||||||
|
end = when {
|
||||||
|
onDismiss != null -> 4.dp
|
||||||
|
action != null -> 6.dp
|
||||||
|
else -> 14.dp
|
||||||
|
},
|
||||||
|
top = if (onDismiss != null) 6.dp else 12.dp,
|
||||||
|
bottom = if (onDismiss != null) 6.dp else 12.dp,
|
||||||
|
),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
Icon(painterResource(icon), contentDescription = null, tint = tint, modifier = Modifier.size(20.dp))
|
Icon(painterResource(icon), contentDescription = null, tint = tint, modifier = Modifier.size(20.dp))
|
||||||
@@ -130,6 +142,16 @@ fun HintCard(
|
|||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
)
|
)
|
||||||
action?.invoke()
|
action?.invoke()
|
||||||
|
if (onDismiss != null) {
|
||||||
|
IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp)) {
|
||||||
|
Icon(
|
||||||
|
painterResource(R.drawable.ic_close),
|
||||||
|
contentDescription = stringResource(R.string.dismiss),
|
||||||
|
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
modifier = Modifier.size(18.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="256"
|
||||||
|
android:viewportHeight="256">
|
||||||
|
<path
|
||||||
|
android:strokeColor="#FFFFFFFF"
|
||||||
|
android:strokeWidth="14"
|
||||||
|
android:pathData="M64,64L192,192M192,64L64,192" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="256"
|
||||||
|
android:viewportHeight="256">
|
||||||
|
<path
|
||||||
|
android:pathData="M128,38 L58,67 L58,120 C58,165 90,200 128,217 C166,200 198,165 198,120 L198,67 Z"
|
||||||
|
android:strokeColor="#FFFFFFFF"
|
||||||
|
android:strokeWidth="11"
|
||||||
|
android:strokeLineJoin="round" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M127.5,86.0 L135.8,111.6 L162.7,111.6 L140.9,127.4 L149.2,152.9 L127.5,137.1 L105.8,152.9 L114.1,127.4 L92.3,111.6 L119.2,111.6 Z" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="status_on">Geschützt</string>
|
||||||
|
<string name="status_off">Getrennt</string>
|
||||||
|
<string name="via">über %1$s</string>
|
||||||
|
<string name="connect">Verbinden</string>
|
||||||
|
<string name="disconnect">Trennen</string>
|
||||||
|
<string name="servers">DNS-over-HTTPS-Server</string>
|
||||||
|
<string name="custom">Eigener Server</string>
|
||||||
|
<string name="custom_url">DoH-URL</string>
|
||||||
|
<string name="custom_bootstrap">Bootstrap-IP (optional, durch Kommas getrennt)</string>
|
||||||
|
<string name="invalid_url">Die URL muss mit https:// beginnen</string>
|
||||||
|
<string name="switch_to">Zu %1$s wechseln</string>
|
||||||
|
<string name="test">Server testen</string>
|
||||||
|
<string name="testing">Wird getestet…</string>
|
||||||
|
<string name="test_ok">Funktioniert über %1$s – erste Anfrage %2$d ms, Wiederholung %3$d ms</string>
|
||||||
|
<string name="http3">HTTP/3 (QUIC)</string>
|
||||||
|
<string name="http3_note">Android 14+. Mit HTTP/3 werden keine Bootstrap-IPs verwendet</string>
|
||||||
|
<string name="test_rcode">Server antwortete mit Fehlercode %1$d</string>
|
||||||
|
<string name="test_fail">Fehler: %1$s</string>
|
||||||
|
<string name="crash_title">Die App ist beim letzten Mal abgestürzt</string>
|
||||||
|
<string name="copy">Kopieren</string>
|
||||||
|
<string name="dismiss">Schließen</string>
|
||||||
|
<string name="hint">„Privates DNS“ ist in den Android-Einstellungen auf %1$s gesetzt. DNS geht deshalb dorthin und umgeht SparkleDNS. Stelle es auf „Automatisch“ oder „Aus“.</string>
|
||||||
|
<string name="notif_channel">VPN-Status</string>
|
||||||
|
<string name="notif_title">Geschützt über %1$s</string>
|
||||||
|
<string name="notif_text">DNS über HTTPS ist aktiv</string>
|
||||||
|
<string name="tab_home">Start</string>
|
||||||
|
<string name="tab_monitor">Monitor</string>
|
||||||
|
<string name="tab_apps">Apps</string>
|
||||||
|
<string name="tab_blocklist">Sperrliste</string>
|
||||||
|
<string name="tab_about">Info</string>
|
||||||
|
<string name="mon_queries">Anfragen</string>
|
||||||
|
<string name="mon_cached">Aus dem Cache</string>
|
||||||
|
<string name="mon_blocked">Blockiert</string>
|
||||||
|
<string name="mon_latency">Ø Latenz</string>
|
||||||
|
<string name="mon_ms">%1$d ms</string>
|
||||||
|
<string name="mon_all">Alle</string>
|
||||||
|
<string name="mon_errors">Fehler</string>
|
||||||
|
<string name="mon_search">Domain suchen</string>
|
||||||
|
<string name="mon_clear">Leeren</string>
|
||||||
|
<string name="mon_empty">Noch keine Anfragen. Verbinde dich und öffne eine beliebige Website.</string>
|
||||||
|
<string name="status_cached">Cache</string>
|
||||||
|
<string name="status_blocked">Blockiert</string>
|
||||||
|
<string name="status_failed">Fehler</string>
|
||||||
|
<string name="mon_block">Blockieren</string>
|
||||||
|
<string name="mon_unblock">Freigeben</string>
|
||||||
|
<string name="mon_blocked_added">%1$s zur Sperrliste hinzugefügt</string>
|
||||||
|
<string name="mon_unblocked">%1$s von der Sperrliste entfernt</string>
|
||||||
|
<string name="apps_hint">Ausgeschaltete Apps umgehen SparkleDNS und nutzen das normale DNS des Netzwerks.</string>
|
||||||
|
<string name="apps_search">Apps suchen</string>
|
||||||
|
<string name="apps_pending">Änderungen gelten nach dem erneuten Verbinden</string>
|
||||||
|
<string name="reconnect">Neu verbinden</string>
|
||||||
|
<string name="apps_loading">Wird geladen…</string>
|
||||||
|
<string name="apps_count">DNS umgehen: %1$d</string>
|
||||||
|
<string name="bl_note">Subdomains werden ebenfalls blockiert. Hosts-, reine Domain-, AdBlock- und dnsmasq-Listen werden unterstützt. Änderungen gelten sofort.</string>
|
||||||
|
<string name="bl_my">Meine Domains</string>
|
||||||
|
<string name="bl_domain_hint">example.com</string>
|
||||||
|
<string name="add">Hinzufügen</string>
|
||||||
|
<string name="bl_invalid">Ungültige Domain</string>
|
||||||
|
<string name="bl_empty_custom">Noch keine Domains</string>
|
||||||
|
<string name="delete">Löschen</string>
|
||||||
|
<string name="bl_lists">Listen</string>
|
||||||
|
<string name="bl_update_all">Alle aktualisieren</string>
|
||||||
|
<string name="bl_updating">Wird aktualisiert…</string>
|
||||||
|
<string name="bl_list_url">Listen-URL</string>
|
||||||
|
<string name="bl_list_info">%1$s Domains · %2$s</string>
|
||||||
|
<string name="bl_presets">Beliebte Listen</string>
|
||||||
|
<string name="bl_download_failed">Download fehlgeschlagen: %1$s</string>
|
||||||
|
<string name="about_desc">DNS-Anfragen verschlüsseln, ohne den gesamten Verkehr über ein VPN zu leiten.</string>
|
||||||
|
<string name="about_version">Version</string>
|
||||||
|
<string name="about_protocol">Protokoll</string>
|
||||||
|
<string name="about_http3_yes">Auf diesem Gerät unterstützt</string>
|
||||||
|
<string name="about_http3_no">Benötigt Android 14+, HTTP/2 wird verwendet</string>
|
||||||
|
<string name="group_social">Soziale Netzwerke & Messenger</string>
|
||||||
|
<string name="group_video">Video</string>
|
||||||
|
<string name="group_audio">Musik & Audio</string>
|
||||||
|
<string name="group_games">Spiele</string>
|
||||||
|
<string name="group_images">Fotos & Bilder</string>
|
||||||
|
<string name="group_news">Nachrichten</string>
|
||||||
|
<string name="group_maps">Karten & Navigation</string>
|
||||||
|
<string name="group_productivity">Produktivität</string>
|
||||||
|
<string name="group_other">Sonstiges</string>
|
||||||
|
<string name="group_system">System</string>
|
||||||
|
<string name="group_count">%1$d von %2$d über DNS</string>
|
||||||
|
<string name="about_privacy_policy">Datenschutzerklärung</string>
|
||||||
|
<string name="licenses_title">Open-Source-Lizenzen</string>
|
||||||
|
<string name="licenses_hint">SparkleDNS basiert auf diesen Open-Source-Projekten. Tippe auf ein Projekt, um seine Seite zu öffnen.</string>
|
||||||
|
<string name="licenses_data">Sperrlisten-Daten (bei Bedarf geladen, nicht enthalten)</string>
|
||||||
|
<string name="license_view">Lizenz ansehen</string>
|
||||||
|
<string name="back">Zurück</string>
|
||||||
|
<string name="bl_total_label">Domains blockiert</string>
|
||||||
|
<string name="about_source">Quellcode</string>
|
||||||
|
<string name="open_settings">Einstellungen</string>
|
||||||
|
<string name="mon_no_match">Nichts passt zum Filter</string>
|
||||||
|
<string name="bl_title">Blockierung</string>
|
||||||
|
<string name="servers_update">Serverliste aktualisieren</string>
|
||||||
|
<string name="servers_updated">Serverliste aktualisiert</string>
|
||||||
|
<string name="servers_update_failed">Serverliste konnte nicht aktualisiert werden: %1$s</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="status_on">保護中</string>
|
||||||
|
<string name="status_off">未接続</string>
|
||||||
|
<string name="via">%1$s 経由</string>
|
||||||
|
<string name="connect">接続</string>
|
||||||
|
<string name="disconnect">切断</string>
|
||||||
|
<string name="servers">DNS-over-HTTPS サーバー</string>
|
||||||
|
<string name="custom">カスタムサーバー</string>
|
||||||
|
<string name="custom_url">DoH URL</string>
|
||||||
|
<string name="custom_bootstrap">ブートストラップ IP(任意、カンマ区切り)</string>
|
||||||
|
<string name="invalid_url">URL は https:// で始まる必要があります</string>
|
||||||
|
<string name="switch_to">%1$s に切り替え</string>
|
||||||
|
<string name="test">サーバーをテスト</string>
|
||||||
|
<string name="testing">テスト中…</string>
|
||||||
|
<string name="test_ok">%1$s で動作中 — 初回 %2$d ms、2回目 %3$d ms</string>
|
||||||
|
<string name="http3">HTTP/3 (QUIC)</string>
|
||||||
|
<string name="http3_note">Android 14 以降。HTTP/3 ではブートストラップ IP は使われません</string>
|
||||||
|
<string name="test_rcode">サーバーがエラーコード %1$d を返しました</string>
|
||||||
|
<string name="test_fail">エラー: %1$s</string>
|
||||||
|
<string name="crash_title">前回アプリがクラッシュしました</string>
|
||||||
|
<string name="copy">コピー</string>
|
||||||
|
<string name="dismiss">閉じる</string>
|
||||||
|
<string name="hint">Android の設定で「プライベート DNS」が %1$s に設定されているため、DNS はそちらへ送られ SparkleDNS を経由しません。「自動」または「OFF」に切り替えてください。</string>
|
||||||
|
<string name="notif_channel">VPN の状態</string>
|
||||||
|
<string name="notif_title">%1$s 経由で保護中</string>
|
||||||
|
<string name="notif_text">DNS over HTTPS が有効です</string>
|
||||||
|
<string name="tab_home">ホーム</string>
|
||||||
|
<string name="tab_monitor">モニター</string>
|
||||||
|
<string name="tab_apps">アプリ</string>
|
||||||
|
<string name="tab_blocklist">ブロックリスト</string>
|
||||||
|
<string name="tab_about">情報</string>
|
||||||
|
<string name="mon_queries">クエリ</string>
|
||||||
|
<string name="mon_cached">キャッシュから</string>
|
||||||
|
<string name="mon_blocked">ブロック済み</string>
|
||||||
|
<string name="mon_latency">平均遅延</string>
|
||||||
|
<string name="mon_ms">%1$d ms</string>
|
||||||
|
<string name="mon_all">すべて</string>
|
||||||
|
<string name="mon_errors">エラー</string>
|
||||||
|
<string name="mon_search">ドメインを検索</string>
|
||||||
|
<string name="mon_clear">クリア</string>
|
||||||
|
<string name="mon_empty">まだクエリはありません。接続して、任意のウェブサイトを開いてください。</string>
|
||||||
|
<string name="status_cached">キャッシュ</string>
|
||||||
|
<string name="status_blocked">ブロック</string>
|
||||||
|
<string name="status_failed">エラー</string>
|
||||||
|
<string name="mon_block">ブロック</string>
|
||||||
|
<string name="mon_unblock">ブロック解除</string>
|
||||||
|
<string name="mon_blocked_added">%1$s をブロックリストに追加しました</string>
|
||||||
|
<string name="mon_unblocked">%1$s をブロックリストから削除しました</string>
|
||||||
|
<string name="apps_hint">オフにしたアプリは SparkleDNS を経由せず、ネットワークの通常の DNS を使います。</string>
|
||||||
|
<string name="apps_search">アプリを検索</string>
|
||||||
|
<string name="apps_pending">変更は再接続後に反映されます</string>
|
||||||
|
<string name="reconnect">再接続</string>
|
||||||
|
<string name="apps_loading">読み込み中…</string>
|
||||||
|
<string name="apps_count">DNS をバイパス: %1$d</string>
|
||||||
|
<string name="bl_note">サブドメインもブロックされます。hosts、ドメインのみ、AdBlock、dnsmasq 形式のリストに対応しています。変更はすぐに反映されます。</string>
|
||||||
|
<string name="bl_my">マイドメイン</string>
|
||||||
|
<string name="bl_domain_hint">example.com</string>
|
||||||
|
<string name="add">追加</string>
|
||||||
|
<string name="bl_invalid">無効なドメイン</string>
|
||||||
|
<string name="bl_empty_custom">まだドメインはありません</string>
|
||||||
|
<string name="delete">削除</string>
|
||||||
|
<string name="bl_lists">リスト</string>
|
||||||
|
<string name="bl_update_all">すべて更新</string>
|
||||||
|
<string name="bl_updating">更新中…</string>
|
||||||
|
<string name="bl_list_url">リストの URL</string>
|
||||||
|
<string name="bl_list_info">%1$s ドメイン · %2$s</string>
|
||||||
|
<string name="bl_presets">人気のリスト</string>
|
||||||
|
<string name="bl_download_failed">ダウンロードに失敗しました: %1$s</string>
|
||||||
|
<string name="about_desc">すべての通信をVPNに通さずに、DNSリクエストを暗号化します。</string>
|
||||||
|
<string name="about_version">バージョン</string>
|
||||||
|
<string name="about_protocol">プロトコル</string>
|
||||||
|
<string name="about_http3_yes">この端末で対応しています</string>
|
||||||
|
<string name="about_http3_no">Android 14 以降が必要です。HTTP/2 を使用します</string>
|
||||||
|
<string name="group_social">SNS とメッセージ</string>
|
||||||
|
<string name="group_video">動画</string>
|
||||||
|
<string name="group_audio">音楽とオーディオ</string>
|
||||||
|
<string name="group_games">ゲーム</string>
|
||||||
|
<string name="group_images">写真と画像</string>
|
||||||
|
<string name="group_news">ニュース</string>
|
||||||
|
<string name="group_maps">地図とナビ</string>
|
||||||
|
<string name="group_productivity">仕事効率化</string>
|
||||||
|
<string name="group_other">その他</string>
|
||||||
|
<string name="group_system">システム</string>
|
||||||
|
<string name="group_count">%2$d 件中 %1$d 件が DNS 経由</string>
|
||||||
|
<string name="about_privacy_policy">プライバシーポリシー</string>
|
||||||
|
<string name="licenses_title">オープンソースライセンス</string>
|
||||||
|
<string name="licenses_hint">SparkleDNS は以下のオープンソースプロジェクトで作られています。タップするとプロジェクトのページを開きます。</string>
|
||||||
|
<string name="licenses_data">ブロックリストのデータ(必要なときにダウンロード、同梱なし)</string>
|
||||||
|
<string name="license_view">ライセンスを見る</string>
|
||||||
|
<string name="back">戻る</string>
|
||||||
|
<string name="bl_total_label">件のドメインをブロック</string>
|
||||||
|
<string name="about_source">ソースコード</string>
|
||||||
|
<string name="open_settings">設定</string>
|
||||||
|
<string name="mon_no_match">フィルターに一致するものはありません</string>
|
||||||
|
<string name="bl_title">ブロック</string>
|
||||||
|
<string name="servers_update">サーバーリストを更新</string>
|
||||||
|
<string name="servers_updated">サーバーリストを更新しました</string>
|
||||||
|
<string name="servers_update_failed">サーバーリストを更新できませんでした: %1$s</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="status_on">Apsaugota</string>
|
||||||
|
<string name="status_off">Atsijungta</string>
|
||||||
|
<string name="via">per %1$s</string>
|
||||||
|
<string name="connect">Prisijungti</string>
|
||||||
|
<string name="disconnect">Atsijungti</string>
|
||||||
|
<string name="servers">DNS-over-HTTPS serveris</string>
|
||||||
|
<string name="custom">Savas serveris</string>
|
||||||
|
<string name="custom_url">DoH URL</string>
|
||||||
|
<string name="custom_bootstrap">Bootstrap IP (neprivaloma, atskirti kableliais)</string>
|
||||||
|
<string name="invalid_url">URL turi prasidėti https://</string>
|
||||||
|
<string name="switch_to">Perjungti į %1$s</string>
|
||||||
|
<string name="test">Tikrinti serverį</string>
|
||||||
|
<string name="testing">Tikrinama…</string>
|
||||||
|
<string name="test_ok">Veikia per %1$s – pirma užklausa %2$d ms, pakartotinė %3$d ms</string>
|
||||||
|
<string name="http3">HTTP/3 (QUIC)</string>
|
||||||
|
<string name="http3_note">Android 14+. Su HTTP/3 bootstrap IP nenaudojami</string>
|
||||||
|
<string name="test_rcode">Serveris grąžino klaidos kodą %1$d</string>
|
||||||
|
<string name="test_fail">Klaida: %1$s</string>
|
||||||
|
<string name="crash_title">Praėjusį kartą programėlė užstrigo</string>
|
||||||
|
<string name="copy">Kopijuoti</string>
|
||||||
|
<string name="dismiss">Uždaryti</string>
|
||||||
|
<string name="hint">Android nustatymuose „Privatus DNS“ nustatytas į %1$s, todėl DNS siunčiamas ten ir apeina SparkleDNS. Perjunkite į „Automatinis“ arba „Išjungta“.</string>
|
||||||
|
<string name="notif_channel">VPN būsena</string>
|
||||||
|
<string name="notif_title">Apsaugota per %1$s</string>
|
||||||
|
<string name="notif_text">DNS per HTTPS įjungtas</string>
|
||||||
|
<string name="tab_home">Pradžia</string>
|
||||||
|
<string name="tab_monitor">Stebėjimas</string>
|
||||||
|
<string name="tab_apps">Programėlės</string>
|
||||||
|
<string name="tab_blocklist">Blokavimo sąrašas</string>
|
||||||
|
<string name="tab_about">Apie</string>
|
||||||
|
<string name="mon_queries">Užklausos</string>
|
||||||
|
<string name="mon_cached">Iš talpyklos</string>
|
||||||
|
<string name="mon_blocked">Užblokuota</string>
|
||||||
|
<string name="mon_latency">Vid. delsa</string>
|
||||||
|
<string name="mon_ms">%1$d ms</string>
|
||||||
|
<string name="mon_all">Visos</string>
|
||||||
|
<string name="mon_errors">Klaidos</string>
|
||||||
|
<string name="mon_search">Ieškoti domeno</string>
|
||||||
|
<string name="mon_clear">Išvalyti</string>
|
||||||
|
<string name="mon_empty">Užklausų dar nėra. Prisijunkite ir atidarykite bet kurią svetainę.</string>
|
||||||
|
<string name="status_cached">Talpykla</string>
|
||||||
|
<string name="status_blocked">Užblokuota</string>
|
||||||
|
<string name="status_failed">Klaida</string>
|
||||||
|
<string name="mon_block">Blokuoti</string>
|
||||||
|
<string name="mon_unblock">Atblokuoti</string>
|
||||||
|
<string name="mon_blocked_added">%1$s pridėtas į blokavimo sąrašą</string>
|
||||||
|
<string name="mon_unblocked">%1$s pašalintas iš blokavimo sąrašo</string>
|
||||||
|
<string name="apps_hint">Išjungtos programėlės apeina SparkleDNS ir naudoja įprastą tinklo DNS.</string>
|
||||||
|
<string name="apps_search">Ieškoti programėlių</string>
|
||||||
|
<string name="apps_pending">Pakeitimai įsigalios prisijungus iš naujo</string>
|
||||||
|
<string name="reconnect">Prisijungti iš naujo</string>
|
||||||
|
<string name="apps_loading">Įkeliama…</string>
|
||||||
|
<string name="apps_count">Apeina DNS: %1$d</string>
|
||||||
|
<string name="bl_note">Blokuojami ir subdomenai. Palaikomi hosts, paprastų domenų, AdBlock ir dnsmasq sąrašai. Pakeitimai įsigalioja iš karto.</string>
|
||||||
|
<string name="bl_my">Mano domenai</string>
|
||||||
|
<string name="bl_domain_hint">example.com</string>
|
||||||
|
<string name="add">Pridėti</string>
|
||||||
|
<string name="bl_invalid">Netinkamas domenas</string>
|
||||||
|
<string name="bl_empty_custom">Domenų dar nėra</string>
|
||||||
|
<string name="delete">Ištrinti</string>
|
||||||
|
<string name="bl_lists">Sąrašai</string>
|
||||||
|
<string name="bl_update_all">Atnaujinti visus</string>
|
||||||
|
<string name="bl_updating">Atnaujinama…</string>
|
||||||
|
<string name="bl_list_url">Sąrašo URL</string>
|
||||||
|
<string name="bl_list_info">%1$s domenų · %2$s</string>
|
||||||
|
<string name="bl_presets">Populiarūs sąrašai</string>
|
||||||
|
<string name="bl_download_failed">Atsisiųsti nepavyko: %1$s</string>
|
||||||
|
<string name="about_desc">Šifruokite DNS užklausas, nenukreipdami viso srauto per VPN.</string>
|
||||||
|
<string name="about_version">Versija</string>
|
||||||
|
<string name="about_protocol">Protokolas</string>
|
||||||
|
<string name="about_http3_yes">Palaikoma šiame įrenginyje</string>
|
||||||
|
<string name="about_http3_no">Reikia Android 14+, naudojamas HTTP/2</string>
|
||||||
|
<string name="group_social">Socialiniai tinklai ir žinutės</string>
|
||||||
|
<string name="group_video">Vaizdo įrašai</string>
|
||||||
|
<string name="group_audio">Muzika ir garsas</string>
|
||||||
|
<string name="group_games">Žaidimai</string>
|
||||||
|
<string name="group_images">Nuotraukos ir vaizdai</string>
|
||||||
|
<string name="group_news">Naujienos</string>
|
||||||
|
<string name="group_maps">Žemėlapiai ir navigacija</string>
|
||||||
|
<string name="group_productivity">Produktyvumas</string>
|
||||||
|
<string name="group_other">Kita</string>
|
||||||
|
<string name="group_system">Sistema</string>
|
||||||
|
<string name="group_count">%1$d iš %2$d per DNS</string>
|
||||||
|
<string name="about_privacy_policy">Privatumo politika</string>
|
||||||
|
<string name="licenses_title">Atvirojo kodo licencijos</string>
|
||||||
|
<string name="licenses_hint">SparkleDNS sukurta naudojant šiuos atvirojo kodo projektus. Palieskite projektą, kad atidarytumėte jo puslapį.</string>
|
||||||
|
<string name="licenses_data">Blokavimo sąrašų duomenys (atsisiunčiami pagal poreikį, neįtraukti)</string>
|
||||||
|
<string name="license_view">Peržiūrėti licenciją</string>
|
||||||
|
<string name="back">Atgal</string>
|
||||||
|
<string name="bl_total_label">užblokuotų domenų</string>
|
||||||
|
<string name="about_source">Šaltinio kodas</string>
|
||||||
|
<string name="open_settings">Nustatymai</string>
|
||||||
|
<string name="mon_no_match">Filtro neatitinka niekas</string>
|
||||||
|
<string name="bl_title">Blokavimas</string>
|
||||||
|
<string name="servers_update">Atnaujinti serverių sąrašą</string>
|
||||||
|
<string name="servers_updated">Serverių sąrašas atnaujintas</string>
|
||||||
|
<string name="servers_update_failed">Nepavyko atnaujinti serverių sąrašo: %1$s</string>
|
||||||
|
</resources>
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
<string name="bl_list_info">%1$s доменов · %2$s</string>
|
<string name="bl_list_info">%1$s доменов · %2$s</string>
|
||||||
<string name="bl_presets">Популярные списки</string>
|
<string name="bl_presets">Популярные списки</string>
|
||||||
<string name="bl_download_failed">Ошибка загрузки: %1$s</string>
|
<string name="bl_download_failed">Ошибка загрузки: %1$s</string>
|
||||||
<string name="about_desc">Шифрованный DNS через HTTPS и HTTP/3 для всего устройства. Через локальный VPN идёт только DNS, остальной трафик не затрагивается.</string>
|
<string name="about_desc">Шифруйте DNS-запросы, не пропуская весь трафик через VPN.</string>
|
||||||
<string name="about_version">Версия</string>
|
<string name="about_version">Версия</string>
|
||||||
<string name="about_protocol">Протокол</string>
|
<string name="about_protocol">Протокол</string>
|
||||||
<string name="about_http3_yes">Поддерживается на этом устройстве</string>
|
<string name="about_http3_yes">Поддерживается на этом устройстве</string>
|
||||||
@@ -94,5 +94,7 @@
|
|||||||
<string name="open_settings">Настройки</string>
|
<string name="open_settings">Настройки</string>
|
||||||
<string name="mon_no_match">Ничего не найдено</string>
|
<string name="mon_no_match">Ничего не найдено</string>
|
||||||
<string name="bl_title">Блокировка</string>
|
<string name="bl_title">Блокировка</string>
|
||||||
<string name="about_license">Лицензия</string>
|
<string name="servers_update">Обновить список серверов</string>
|
||||||
|
<string name="servers_updated">Список серверов обновлён</string>
|
||||||
|
<string name="servers_update_failed">Не удалось обновить список серверов: %1$s</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="status_on">已保护</string>
|
||||||
|
<string name="status_off">未连接</string>
|
||||||
|
<string name="via">通过 %1$s</string>
|
||||||
|
<string name="connect">连接</string>
|
||||||
|
<string name="disconnect">断开</string>
|
||||||
|
<string name="servers">DNS-over-HTTPS 服务器</string>
|
||||||
|
<string name="custom">自定义服务器</string>
|
||||||
|
<string name="custom_url">DoH URL</string>
|
||||||
|
<string name="custom_bootstrap">引导 IP(可选,用逗号分隔)</string>
|
||||||
|
<string name="invalid_url">URL 必须以 https:// 开头</string>
|
||||||
|
<string name="switch_to">切换到 %1$s</string>
|
||||||
|
<string name="test">测试服务器</string>
|
||||||
|
<string name="testing">正在测试…</string>
|
||||||
|
<string name="test_ok">可通过 %1$s 使用——首次请求 %2$d 毫秒,重复请求 %3$d 毫秒</string>
|
||||||
|
<string name="http3">HTTP/3 (QUIC)</string>
|
||||||
|
<string name="http3_note">需要 Android 14 及以上。使用 HTTP/3 时不使用引导 IP</string>
|
||||||
|
<string name="test_rcode">服务器返回错误代码 %1$d</string>
|
||||||
|
<string name="test_fail">错误:%1$s</string>
|
||||||
|
<string name="crash_title">应用上次崩溃了</string>
|
||||||
|
<string name="copy">复制</string>
|
||||||
|
<string name="dismiss">关闭</string>
|
||||||
|
<string name="hint">Android 设置中的“私人 DNS”被设为 %1$s,因此 DNS 会发往那里并绕过 SparkleDNS。请将其切换为“自动”或“关闭”。</string>
|
||||||
|
<string name="notif_channel">VPN 状态</string>
|
||||||
|
<string name="notif_title">已通过 %1$s 保护</string>
|
||||||
|
<string name="notif_text">DNS over HTTPS 已启用</string>
|
||||||
|
<string name="tab_home">首页</string>
|
||||||
|
<string name="tab_monitor">监控</string>
|
||||||
|
<string name="tab_apps">应用</string>
|
||||||
|
<string name="tab_blocklist">屏蔽列表</string>
|
||||||
|
<string name="tab_about">关于</string>
|
||||||
|
<string name="mon_queries">查询</string>
|
||||||
|
<string name="mon_cached">来自缓存</string>
|
||||||
|
<string name="mon_blocked">已屏蔽</string>
|
||||||
|
<string name="mon_latency">平均延迟</string>
|
||||||
|
<string name="mon_ms">%1$d 毫秒</string>
|
||||||
|
<string name="mon_all">全部</string>
|
||||||
|
<string name="mon_errors">错误</string>
|
||||||
|
<string name="mon_search">搜索域名</string>
|
||||||
|
<string name="mon_clear">清除</string>
|
||||||
|
<string name="mon_empty">还没有查询。连接后打开任意网站即可。</string>
|
||||||
|
<string name="status_cached">缓存</string>
|
||||||
|
<string name="status_blocked">已屏蔽</string>
|
||||||
|
<string name="status_failed">错误</string>
|
||||||
|
<string name="mon_block">屏蔽</string>
|
||||||
|
<string name="mon_unblock">取消屏蔽</string>
|
||||||
|
<string name="mon_blocked_added">已将 %1$s 加入屏蔽列表</string>
|
||||||
|
<string name="mon_unblocked">已将 %1$s 从屏蔽列表移除</string>
|
||||||
|
<string name="apps_hint">关闭的应用会绕过 SparkleDNS,使用网络的常规 DNS。</string>
|
||||||
|
<string name="apps_search">搜索应用</string>
|
||||||
|
<string name="apps_pending">更改将在重新连接后生效</string>
|
||||||
|
<string name="reconnect">重新连接</string>
|
||||||
|
<string name="apps_loading">正在加载…</string>
|
||||||
|
<string name="apps_count">绕过 DNS:%1$d</string>
|
||||||
|
<string name="bl_note">子域名也会被屏蔽。支持 hosts、纯域名、AdBlock 和 dnsmasq 格式的列表。更改立即生效。</string>
|
||||||
|
<string name="bl_my">我的域名</string>
|
||||||
|
<string name="bl_domain_hint">example.com</string>
|
||||||
|
<string name="add">添加</string>
|
||||||
|
<string name="bl_invalid">域名无效</string>
|
||||||
|
<string name="bl_empty_custom">还没有域名</string>
|
||||||
|
<string name="delete">删除</string>
|
||||||
|
<string name="bl_lists">列表</string>
|
||||||
|
<string name="bl_update_all">全部更新</string>
|
||||||
|
<string name="bl_updating">正在更新…</string>
|
||||||
|
<string name="bl_list_url">列表 URL</string>
|
||||||
|
<string name="bl_list_info">%1$s 个域名 · %2$s</string>
|
||||||
|
<string name="bl_presets">热门列表</string>
|
||||||
|
<string name="bl_download_failed">下载失败:%1$s</string>
|
||||||
|
<string name="about_desc">加密 DNS 请求,无需让全部流量经过 VPN。</string>
|
||||||
|
<string name="about_version">版本</string>
|
||||||
|
<string name="about_protocol">协议</string>
|
||||||
|
<string name="about_http3_yes">此设备支持</string>
|
||||||
|
<string name="about_http3_no">需要 Android 14 及以上,当前使用 HTTP/2</string>
|
||||||
|
<string name="group_social">社交与通讯</string>
|
||||||
|
<string name="group_video">视频</string>
|
||||||
|
<string name="group_audio">音乐与音频</string>
|
||||||
|
<string name="group_games">游戏</string>
|
||||||
|
<string name="group_images">照片与图片</string>
|
||||||
|
<string name="group_news">新闻</string>
|
||||||
|
<string name="group_maps">地图与导航</string>
|
||||||
|
<string name="group_productivity">效率</string>
|
||||||
|
<string name="group_other">其他</string>
|
||||||
|
<string name="group_system">系统</string>
|
||||||
|
<string name="group_count">%2$d 个中有 %1$d 个经过 DNS</string>
|
||||||
|
<string name="about_privacy_policy">隐私政策</string>
|
||||||
|
<string name="licenses_title">开源许可</string>
|
||||||
|
<string name="licenses_hint">SparkleDNS 使用了以下开源项目。点按项目可打开其页面。</string>
|
||||||
|
<string name="licenses_data">屏蔽列表数据(按需下载,未内置)</string>
|
||||||
|
<string name="license_view">查看许可</string>
|
||||||
|
<string name="back">返回</string>
|
||||||
|
<string name="bl_total_label">个域名已屏蔽</string>
|
||||||
|
<string name="about_source">源代码</string>
|
||||||
|
<string name="open_settings">设置</string>
|
||||||
|
<string name="mon_no_match">没有符合筛选条件的内容</string>
|
||||||
|
<string name="bl_title">屏蔽</string>
|
||||||
|
<string name="servers_update">更新服务器列表</string>
|
||||||
|
<string name="servers_updated">服务器列表已更新</string>
|
||||||
|
<string name="servers_update_failed">无法更新服务器列表:%1$s</string>
|
||||||
|
</resources>
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
<string name="bl_list_info">%1$s domains · %2$s</string>
|
<string name="bl_list_info">%1$s domains · %2$s</string>
|
||||||
<string name="bl_presets">Popular lists</string>
|
<string name="bl_presets">Popular lists</string>
|
||||||
<string name="bl_download_failed">Download failed: %1$s</string>
|
<string name="bl_download_failed">Download failed: %1$s</string>
|
||||||
<string name="about_desc">Encrypted DNS over HTTPS and HTTP/3 for the whole device. Only DNS goes through the local VPN, all other traffic is untouched.</string>
|
<string name="about_desc">Encrypt DNS requests without routing all your traffic through a VPN.</string>
|
||||||
<string name="about_version">Version</string>
|
<string name="about_version">Version</string>
|
||||||
<string name="about_protocol">Protocol</string>
|
<string name="about_protocol">Protocol</string>
|
||||||
<string name="about_http3_yes">Supported on this device</string>
|
<string name="about_http3_yes">Supported on this device</string>
|
||||||
@@ -95,5 +95,7 @@
|
|||||||
<string name="open_settings">Settings</string>
|
<string name="open_settings">Settings</string>
|
||||||
<string name="mon_no_match">Nothing matches the filter</string>
|
<string name="mon_no_match">Nothing matches the filter</string>
|
||||||
<string name="bl_title">Blocking</string>
|
<string name="bl_title">Blocking</string>
|
||||||
<string name="about_license">License</string>
|
<string name="servers_update">Update server list</string>
|
||||||
|
<string name="servers_updated">Server list updated</string>
|
||||||
|
<string name="servers_update_failed">Couldn\'t update the server list: %1$s</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Jetzt auch auf Deutsch, Japanisch, Litauisch und Chinesisch
|
||||||
|
• Unabhängige Server: Digitale Gesellschaft, UncensoredDNS, Freifunk München. Cloudflare, Google, AdGuard und Mullvad entfernt
|
||||||
|
• Serverliste lässt sich aus dem Projekt-Repository aktualisieren, jeder Server verlinkt seine Datenschutzerklärung
|
||||||
|
• Hinweise und Warnungen lassen sich mit ✕ schließen
|
||||||
|
• Aufgeräumter Info-Bildschirm
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<p>Schütze deine DNS-Anfragen mit verschlüsseltem DNS-over-HTTPS, während dein übriger Internetverkehr über die normale Verbindung läuft. SparkleDNS gibt dir die Kontrolle über DNS, ohne dein ganzes Gerät über einen VPN-Server zu leiten.</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>Sende DNS-Anfragen per RFC 8484 an den DoH-Server deiner Wahl.</li>
|
||||||
|
<li>Prüfe Protokoll und Latenz eines Servers, bevor du dich verbindest.</li>
|
||||||
|
<li>Sieh Anfragen und Statistiken live, filtere die Aktivität und blockiere Domains mit einem Tippen.</li>
|
||||||
|
<li>Füge eigene Domainregeln oder Blocklisten per URL hinzu, inklusive der Vorlagen HaGeZi Pro++ und TIF.</li>
|
||||||
|
<li>Lass ausgewählte Apps den DNS-Tunnel umgehen.</li>
|
||||||
|
<li>Verbinde oder trenne mit einem Tippen oder über die Kachel in den Schnelleinstellungen.</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p>SparkleDNS erstellt einen lokalen VPN-Tunnel, der nur den DNS-Verkehr erfasst. DNS-Anfragen gehen an den gewählten DoH-Server, alles andere nutzt deine normale Verbindung. Wechselst du den Server während der Verbindung, startet der Tunnel automatisch neu. Keine Analysedienste und keine Google-Play-Dienste.</p>
|
||||||
|
|
||||||
|
<p>SparkleDNS ist ein schlanker DNS-Client für Android mit klarer Kontrolle über verschlüsseltes DNS und Domain-Blockierung. Installiere SparkleDNS und behalte deine DNS-Anfragen im Griff.</p>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DNS-Anfragen verschlüsseln, ohne den gesamten Verkehr über ein VPN zu leiten.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
SparkleDNS
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Now in German, Japanese, Lithuanian and Chinese
|
||||||
|
• Independent servers: Digitale Gesellschaft, UncensoredDNS, Freifunk München. Cloudflare, Google, AdGuard and Mullvad removed
|
||||||
|
• Update the server list from the project repository; each server links to its privacy policy
|
||||||
|
• Hints and warnings can be closed with ✕
|
||||||
|
• Cleaner About screen
|
||||||
@@ -1,31 +1,14 @@
|
|||||||
SparkleDNS encrypts every DNS lookup on your device with DNS-over-HTTPS (RFC 8484) and HTTP/3. It uses Android's VPN API only locally: just DNS requests go into the tunnel, all other traffic takes your normal connection, so speed and battery stay the same.
|
<p>Protect your DNS requests with encrypted DNS-over-HTTPS, while your other internet traffic stays on its normal connection. SparkleDNS gives you control over DNS without routing your whole device through a VPN server.</p>
|
||||||
|
|
||||||
<b>Servers</b>
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>SkySparkle (default) with HTTP/3, run by the developer</li>
|
<li>Send DNS queries to your chosen DoH server using RFC 8484.</li>
|
||||||
<li>Cloudflare, Google, Quad9, AdGuard, Mullvad</li>
|
<li>Check server protocol and latency before you connect.</li>
|
||||||
<li>Any custom DoH server, with optional bootstrap IPs and HTTP/3</li>
|
<li>See live queries and stats, filter activity, and block domains with a tap.</li>
|
||||||
|
<li>Add custom domain rules or blocklists by URL, including HaGeZi Pro++ and TIF presets.</li>
|
||||||
|
<li>Let selected apps bypass the DNS tunnel.</li>
|
||||||
|
<li>Connect or disconnect in one tap, or use the Quick Settings tile.</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<b>Features</b>
|
<p>SparkleDNS creates a local VPN tunnel to capture DNS traffic only. DNS requests go to your selected DoH server; everything else uses your regular connection. Switch servers while connected and the tunnel restarts automatically. No analytics or Google Play Services are included.</p>
|
||||||
<ul>
|
|
||||||
<li>One-tap connect, Quick Settings tile, Always-on VPN support</li>
|
|
||||||
<li>Live monitor: every query with its status and latency, filters, search and one-tap blocking</li>
|
|
||||||
<li>Per-app rules: apps grouped by category, chosen ones bypass SparkleDNS</li>
|
|
||||||
<li>Blocklists: your own domains plus hosts, plain domain, AdBlock and dnsmasq lists by URL, HaGeZi Pro++ and TIF one tap away. Subdomains are blocked too, changes apply instantly</li>
|
|
||||||
<li>Local DNS cache that honours TTLs</li>
|
|
||||||
<li>Server test showing the protocol (h3 or h2) and latency</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<b>Privacy</b>
|
<p>Choose SparkleDNS for a lightweight Android DNS client with clear controls over encrypted DNS and domain blocking. Install SparkleDNS and take control of your DNS requests.</p>
|
||||||
No analytics, no ads, no Google Play Services. The query log lives only in memory and never leaves the device. DNS requests go to the server you choose. The default SkySparkle server is run by the developer under this privacy policy: https://skysparkle.cc/privacy?lang=en
|
|
||||||
|
|
||||||
<b>Permissions</b>
|
|
||||||
<ul>
|
|
||||||
<li>VPN: a local tunnel that carries DNS only, nothing is routed to a remote VPN</li>
|
|
||||||
<li>Notifications: connection status with a Disconnect button</li>
|
|
||||||
<li>Network state: needed by Android's HTTP/3 engine and to detect Private DNS</li>
|
|
||||||
<li>Installed apps (launcher entries only): to list apps for per-app rules</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
HTTP/3 needs Android 14 or newer; older versions use HTTP/2. If Private DNS in Android settings is set to a specific hostname, Android sends DNS there instead; SparkleDNS shows a warning when that happens.
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Encrypted DNS over HTTPS and HTTP/3 with blocklists and per-app rules
|
Encrypt DNS requests without routing all your traffic through a VPN.
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• ドイツ語・日本語・リトアニア語・中国語に対応
|
||||||
|
• 独立系サーバー:Digitale Gesellschaft、UncensoredDNS、Freifunk München。Cloudflare、Google、AdGuard、Mullvad を削除
|
||||||
|
• サーバーリストをプロジェクトのリポジトリから更新できるように。各サーバーにプライバシーポリシーのリンク
|
||||||
|
• ヒントと警告を ✕ で閉じられるように
|
||||||
|
• 「情報」画面を整理
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<p>暗号化されたDNS-over-HTTPSでDNSリクエストを保護し、その他のインターネット通信は通常の接続のまま。SparkleDNSなら、端末全体をVPNサーバー経由にすることなくDNSをコントロールできます。</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>選んだDoHサーバーへRFC 8484でDNSクエリを送信。</li>
|
||||||
|
<li>接続前にサーバーのプロトコルと遅延を確認。</li>
|
||||||
|
<li>クエリと統計をリアルタイムで表示し、アクティビティを絞り込み、ワンタップでドメインをブロック。</li>
|
||||||
|
<li>独自のドメインルールやURL指定のブロックリストを追加。HaGeZi Pro++やTIFのプリセットも利用可能。</li>
|
||||||
|
<li>選んだアプリだけDNSトンネルを経由しないよう設定。</li>
|
||||||
|
<li>ワンタップ、またはクイック設定タイルで接続・切断。</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p>SparkleDNSはローカルVPNトンネルを作成し、DNS通信だけを取り込みます。DNSリクエストは選んだDoHサーバーへ送られ、それ以外の通信は通常の接続を使います。接続中にサーバーを切り替えると、トンネルは自動で再起動します。アナリティクスやGoogle Playサービスは含まれていません。</p>
|
||||||
|
|
||||||
|
<p>暗号化DNSとドメインブロックをわかりやすく管理できる、軽量なAndroid向けDNSクライアントならSparkleDNS。インストールして、DNSリクエストを自分の手でコントロールしましょう。</p>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
すべての通信をVPNに通さずに、DNSリクエストを暗号化します。
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
SparkleDNS
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Dabar ir vokiečių, japonų, lietuvių bei kinų kalbomis
|
||||||
|
• Nepriklausomi serveriai: Digitale Gesellschaft, UncensoredDNS, Freifunk München. Cloudflare, Google, AdGuard ir Mullvad pašalinti
|
||||||
|
• Serverių sąrašą galima atnaujinti iš projekto saugyklos, prie kiekvieno serverio – nuoroda į privatumo politiką
|
||||||
|
• Patarimus ir įspėjimus galima uždaryti ✕
|
||||||
|
• Tvarkingesnis ekranas „Apie“
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<p>Apsaugokite savo DNS užklausas šifruotu DNS-over-HTTPS, o likęs interneto srautas tegul eina įprastu ryšiu. SparkleDNS leidžia valdyti DNS, nenukreipiant viso įrenginio per VPN serverį.</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>Siųskite DNS užklausas pasirinktam DoH serveriui pagal RFC 8484.</li>
|
||||||
|
<li>Prieš jungdamiesi patikrinkite serverio protokolą ir delsą.</li>
|
||||||
|
<li>Stebėkite užklausas ir statistiką realiuoju laiku, filtruokite veiklą ir blokuokite domenus vienu palietimu.</li>
|
||||||
|
<li>Pridėkite savo domenų taisykles arba blokavimo sąrašus pagal URL, įskaitant HaGeZi Pro++ ir TIF šablonus.</li>
|
||||||
|
<li>Leiskite pasirinktoms programėlėms apeiti DNS tunelį.</li>
|
||||||
|
<li>Prisijunkite ar atsijunkite vienu palietimu arba per sparčiųjų nustatymų plytelę.</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p>SparkleDNS sukuria vietinį VPN tunelį, kuris perima tik DNS srautą. DNS užklausos keliauja į pasirinktą DoH serverį, visa kita naudoja įprastą ryšį. Pakeitus serverį prisijungus, tunelis automatiškai paleidžiamas iš naujo. Jokios analitikos ir jokių Google Play paslaugų.</p>
|
||||||
|
|
||||||
|
<p>SparkleDNS – lengvas DNS klientas Android įrenginiams su aiškiu šifruoto DNS ir domenų blokavimo valdymu. Įdiekite SparkleDNS ir perimkite savo DNS užklausų kontrolę.</p>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
Šifruokite DNS užklausas, nenukreipdami viso srauto per VPN.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
SparkleDNS
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Теперь на немецком, японском, литовском и китайском
|
||||||
|
• Независимые серверы: Digitale Gesellschaft, UncensoredDNS, Freifunk München. Cloudflare, Google, AdGuard и Mullvad убраны
|
||||||
|
• Список серверов обновляется из репозитория проекта, у каждого сервера есть ссылка на политику конфиденциальности
|
||||||
|
• Подсказки и предупреждения закрываются крестиком
|
||||||
|
• Обновлён экран «О приложении»
|
||||||
@@ -1,31 +1,14 @@
|
|||||||
SparkleDNS шифрует каждый DNS-запрос на устройстве с помощью DNS-over-HTTPS (RFC 8484) и HTTP/3. VPN Android используется только локально: в туннель попадают лишь DNS-запросы, весь остальной трафик идёт обычным путём, поэтому скорость и батарея не страдают.
|
<p>Защитите свои DNS-запросы с помощью зашифрованного DNS-over-HTTPS, а остальной интернет-трафик пусть идёт по обычному соединению. SparkleDNS даёт контроль над DNS, не пропуская всё устройство через VPN-сервер.</p>
|
||||||
|
|
||||||
<b>Серверы</b>
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>SkySparkle (по умолчанию) с HTTP/3, работает у разработчика</li>
|
<li>Отправляйте DNS-запросы на выбранный DoH-сервер по RFC 8484.</li>
|
||||||
<li>Cloudflare, Google, Quad9, AdGuard, Mullvad</li>
|
<li>Проверяйте протокол и задержку сервера перед подключением.</li>
|
||||||
<li>Любой свой DoH-сервер, с bootstrap IP и HTTP/3 по желанию</li>
|
<li>Смотрите запросы и статистику в реальном времени, фильтруйте активность и блокируйте домены одним касанием.</li>
|
||||||
|
<li>Добавляйте свои правила для доменов или блок-листы по URL, включая пресеты HaGeZi Pro++ и TIF.</li>
|
||||||
|
<li>Разрешайте выбранным приложениям обходить DNS-туннель.</li>
|
||||||
|
<li>Подключайтесь и отключайтесь одним касанием или через плитку быстрых настроек.</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<b>Возможности</b>
|
<p>SparkleDNS создаёт локальный VPN-туннель, который перехватывает только DNS-трафик. DNS-запросы уходят на выбранный DoH-сервер, всё остальное идёт по обычному соединению. Если сменить сервер во время подключения, туннель перезапустится автоматически. Никакой аналитики и сервисов Google Play.</p>
|
||||||
<ul>
|
|
||||||
<li>Подключение одним касанием, плитка в шторке, поддержка постоянного VPN</li>
|
|
||||||
<li>Монитор: каждый запрос со статусом и задержкой, фильтры, поиск и блокировка одним касанием</li>
|
|
||||||
<li>Правила для приложений: группы по категориям, выбранные приложения идут мимо SparkleDNS</li>
|
|
||||||
<li>Блоклисты: свои домены и списки hosts, доменов, AdBlock и dnsmasq по ссылке, HaGeZi Pro++ и TIF в одно касание. Поддомены блокируются тоже, изменения применяются сразу</li>
|
|
||||||
<li>Локальный DNS-кэш с учётом TTL</li>
|
|
||||||
<li>Проверка сервера с протоколом (h3 или h2) и задержкой</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<b>Приватность</b>
|
<p>SparkleDNS — лёгкий DNS-клиент для Android с понятным управлением зашифрованным DNS и блокировкой доменов. Установите SparkleDNS и возьмите свои DNS-запросы под контроль.</p>
|
||||||
Никакой аналитики, рекламы и сервисов Google Play. Журнал запросов хранится только в памяти и никуда не отправляется. DNS-запросы уходят на выбранный вами сервер. Сервер SkySparkle по умолчанию работает у разработчика по этой политике конфиденциальности: https://skysparkle.cc/privacy?lang=en
|
|
||||||
|
|
||||||
<b>Разрешения</b>
|
|
||||||
<ul>
|
|
||||||
<li>VPN: локальный туннель только для DNS, ничего не уходит на удалённый VPN</li>
|
|
||||||
<li>Уведомления: статус подключения и кнопка «Отключить»</li>
|
|
||||||
<li>Состояние сети: нужно движку HTTP/3 Android и для проверки частного DNS</li>
|
|
||||||
<li>Установленные приложения (только ярлыки лаунчера): для правил по приложениям</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
Для HTTP/3 нужен Android 14 или новее, на более старых используется HTTP/2. Если в настройках Android «Частный DNS» задан конкретным хостом, Android отправляет DNS туда; SparkleDNS предупреждает об этом.
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Шифрованный DNS через HTTPS и HTTP/3 с блоклистами и правилами для приложений
|
Шифруйте DNS-запросы, не пропуская весь трафик через VPN.
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• 新增德语、日语、立陶宛语和中文
|
||||||
|
• 独立服务器:Digitale Gesellschaft、UncensoredDNS、Freifunk München;移除 Cloudflare、Google、AdGuard 和 Mullvad
|
||||||
|
• 可从项目仓库更新服务器列表,每个服务器都附有隐私政策链接
|
||||||
|
• 提示和警告可点 ✕ 关闭
|
||||||
|
• “关于”页面更简洁
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<p>使用加密的 DNS-over-HTTPS 保护你的 DNS 请求,其他网络流量仍走普通连接。SparkleDNS 让你掌控 DNS,而无需让整台设备经过 VPN 服务器。</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>按照 RFC 8484 将 DNS 查询发送到你选择的 DoH 服务器。</li>
|
||||||
|
<li>连接前检查服务器的协议和延迟。</li>
|
||||||
|
<li>实时查看查询和统计信息,筛选活动,一键屏蔽域名。</li>
|
||||||
|
<li>添加自定义域名规则,或通过 URL 添加屏蔽列表,包括 HaGeZi Pro++ 和 TIF 预设。</li>
|
||||||
|
<li>允许指定应用绕过 DNS 隧道。</li>
|
||||||
|
<li>一键连接或断开,也可使用快捷设置磁贴。</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p>SparkleDNS 创建本地 VPN 隧道,仅捕获 DNS 流量。DNS 请求发送到你选择的 DoH 服务器,其他流量使用常规连接。连接时切换服务器,隧道会自动重启。不含任何分析服务或 Google Play 服务。</p>
|
||||||
|
|
||||||
|
<p>SparkleDNS 是一款轻量的 Android DNS 客户端,让你清晰掌控加密 DNS 与域名屏蔽。安装 SparkleDNS,掌控你的 DNS 请求。</p>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
加密 DNS 请求,无需让全部流量经过 VPN。
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
SparkleDNS
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
# Build recipe for the F-Droid main repository.
|
|
||||||
# Submit it as metadata/cc.skysparkle.sparkledns.yml in a merge request to https://gitlab.com/fdroid/fdroiddata
|
|
||||||
Categories:
|
|
||||||
- Connectivity
|
|
||||||
- Security
|
|
||||||
License: GPL-3.0-or-later
|
|
||||||
WebSite: https://skysparkle.cc
|
|
||||||
SourceCode: https://git.skysparkle.cc/kalarina/Sparkledns
|
|
||||||
IssueTracker: https://git.skysparkle.cc/kalarina/Sparkledns/issues
|
|
||||||
|
|
||||||
AutoName: SparkleDNS
|
|
||||||
|
|
||||||
RepoType: git
|
|
||||||
Repo: https://git.skysparkle.cc/kalarina/Sparkledns.git
|
|
||||||
|
|
||||||
Builds:
|
|
||||||
- versionName: 1.0.6
|
|
||||||
versionCode: 10006
|
|
||||||
commit: v1.0.6
|
|
||||||
subdir: app
|
|
||||||
gradle:
|
|
||||||
- yes
|
|
||||||
|
|
||||||
AutoUpdateMode: Version
|
|
||||||
UpdateCheckMode: Tags ^v[0-9.]+$
|
|
||||||
CurrentVersion: 1.0.6
|
|
||||||
CurrentVersionCode: 10006
|
|
||||||
Vendored
+94
-94
@@ -1,94 +1,94 @@
|
|||||||
@rem
|
@rem
|
||||||
@rem Copyright 2015 the original author or authors.
|
@rem Copyright 2015 the original author or authors.
|
||||||
@rem
|
@rem
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
@rem you may not use this file except in compliance with the License.
|
@rem you may not use this file except in compliance with the License.
|
||||||
@rem You may obtain a copy of the License at
|
@rem You may obtain a copy of the License at
|
||||||
@rem
|
@rem
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
@rem
|
@rem
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
@rem
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
@rem Set local scope for the variables with windows NT shell
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@rem This is normally unused
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
@rem Find java.exe
|
@rem Find java.exe
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo. 1>&2
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo. 1>&2
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo. 1>&2
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo. 1>&2
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
exit /b %EXIT_CODE%
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
:omega
|
:omega
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# SparkleDNS server list. How to add a server: see CONTRIBUTING.md
|
||||||
|
# Name | DoH URL | Privacy policy | h3 (optional)
|
||||||
|
|
||||||
|
SkySparkle | https://blog.skysparkle.cc/dns-query | https://skysparkle.cc/privacy?lang=en | h3
|
||||||
|
Quad9 | https://dns.quad9.net/dns-query | https://quad9.net/service/privacy/
|
||||||
|
Digitale Gesellschaft | https://dns.digitale-gesellschaft.ch/dns-query | https://www.digitale-gesellschaft.ch/dns/ | h3
|
||||||
|
UncensoredDNS | https://anycast.uncensoreddns.org/dns-query | https://blog.uncensoreddns.org/faq/
|
||||||
|
Freifunk München | https://doh.ffmuc.net/dns-query | https://ffmuc.net/dns-privacy/ | h3
|
||||||
Reference in New Issue
Block a user