mirror of
https://github.com/kalarina-bit/Sparkledns.git
synced 2026-11-22 15:46:09 +00:00
Compare commits
18
Commits
399fc5ea36
...
v1.1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c331c317ce | ||
|
|
8f4cd6d7f2 | ||
|
|
c929a827c5 | ||
|
|
caf498d783 | ||
|
|
87723f0a8f | ||
|
|
e3f5906924 | ||
|
|
d58e9cb5f9 | ||
|
|
6444a81f95 | ||
|
|
60c43df3c5 | ||
|
|
3d45f54360 | ||
|
|
d583b73d74 | ||
|
|
b53aa34516 | ||
|
|
6c26cb99a6 | ||
|
|
907c3aaa46 | ||
|
|
ee430fa7c0 | ||
|
|
509c0b9a86 | ||
|
|
03ee32b8b0 | ||
|
|
343cbfadb6 |
@@ -49,6 +49,21 @@ android {
|
|||||||
includeInBundle = false
|
includeInBundle = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
packaging {
|
||||||
|
resources {
|
||||||
|
// Library files the app never reads: Kotlin metadata for reflection, the coroutines debug
|
||||||
|
// agent, version markers for tooling and OkHttp's public suffix list, which only cookies use
|
||||||
|
excludes += listOf(
|
||||||
|
"/META-INF/*.version",
|
||||||
|
"/META-INF/*.kotlin_module",
|
||||||
|
"/kotlin/**",
|
||||||
|
"/kotlin-tooling-metadata.json",
|
||||||
|
"/DebugProbesKt.bin",
|
||||||
|
"/okhttp3/internal/publicsuffix/**",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
testOptions {
|
testOptions {
|
||||||
// android.util.Log and friends are no-ops in JVM unit tests
|
// android.util.Log and friends are no-ops in JVM unit tests
|
||||||
unitTests.isReturnDefaultValues = true
|
unitTests.isReturnDefaultValues = true
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import androidx.compose.material3.TextButton
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@@ -126,7 +127,7 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) {
|
|||||||
verticalArrangement = Arrangement.spacedBy(12.dp),
|
verticalArrangement = Arrangement.spacedBy(12.dp),
|
||||||
) {
|
) {
|
||||||
Image(
|
Image(
|
||||||
painterResource(R.drawable.app_logo),
|
remember { AppLogo.get(context) },
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(104.dp)
|
.size(104.dp)
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ import android.content.ClipboardManager
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.annotation.DrawableRes
|
import androidx.annotation.DrawableRes
|
||||||
import androidx.annotation.StringRes
|
import androidx.annotation.StringRes
|
||||||
import androidx.compose.foundation.Canvas
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
@@ -15,32 +13,39 @@ import androidx.compose.foundation.layout.Column
|
|||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.heightIn
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.lazy.LazyListScope
|
||||||
import androidx.compose.foundation.lazy.itemsIndexed
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.material3.DropdownMenu
|
import androidx.compose.material3.DropdownMenu
|
||||||
import androidx.compose.material3.DropdownMenuItem
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
import androidx.compose.material3.HorizontalDivider
|
import androidx.compose.material3.HorizontalDivider
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
|
import androidx.compose.material3.LinearProgressIndicator
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
|
import androidx.compose.runtime.derivedStateOf
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.runtime.structuralEqualityPolicy
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.draw.drawWithCache
|
||||||
import androidx.compose.ui.geometry.Offset
|
import androidx.compose.ui.geometry.Offset
|
||||||
import androidx.compose.ui.geometry.Size
|
import androidx.compose.ui.geometry.Size
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
@@ -54,12 +59,12 @@ import androidx.compose.ui.unit.Dp
|
|||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
|
||||||
private enum class ActivityFilter(@StringRes val label: Int) {
|
private enum class ActivityFilter(@StringRes val label: Int) {
|
||||||
ALL(R.string.mon_all),
|
ALL(R.string.mon_all),
|
||||||
@@ -68,11 +73,6 @@ private enum class ActivityFilter(@StringRes val label: Int) {
|
|||||||
ERRORS(R.string.mon_errors),
|
ERRORS(R.string.mon_errors),
|
||||||
}
|
}
|
||||||
|
|
||||||
private enum class Period(val hours: Int, @StringRes val label: Int) {
|
|
||||||
DAY(24, R.string.period_24h),
|
|
||||||
WEEK(24 * 7, R.string.period_7d),
|
|
||||||
}
|
|
||||||
|
|
||||||
private val TimeFormat = SimpleDateFormat("HH:mm:ss", Locale.ROOT)
|
private val TimeFormat = SimpleDateFormat("HH:mm:ss", Locale.ROOT)
|
||||||
|
|
||||||
// Colors of the company slices, then the rest
|
// Colors of the company slices, then the rest
|
||||||
@@ -88,12 +88,11 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
|||||||
val custom by Blocklist.custom.collectAsStateWithLifecycle()
|
val custom by Blocklist.custom.collectAsStateWithLifecycle()
|
||||||
val customSet = remember(custom) { custom.toHashSet() }
|
val customSet = remember(custom) { custom.toHashSet() }
|
||||||
|
|
||||||
var period by rememberSaveable { mutableStateOf(Period.DAY) }
|
var period by rememberSaveable { mutableStateOf(StatsPeriod.DAY) }
|
||||||
var entries by remember { mutableStateOf(QueryLog.snapshot()) }
|
var entries by remember { mutableStateOf(QueryLog.snapshot()) }
|
||||||
var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) }
|
var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) }
|
||||||
var filter by rememberSaveable { mutableStateOf(ActivityFilter.ALL) }
|
var filter by rememberSaveable { mutableStateOf(ActivityFilter.ALL) }
|
||||||
var search by rememberSaveable { mutableStateOf("") }
|
var search by rememberSaveable { mutableStateOf("") }
|
||||||
var filterMenu by remember { mutableStateOf(false) }
|
|
||||||
|
|
||||||
OnQueryLogChange {
|
OnQueryLogChange {
|
||||||
entries = QueryLog.snapshot()
|
entries = QueryLog.snapshot()
|
||||||
@@ -102,7 +101,10 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
|||||||
val statsVersion by StatsStore.version.collectAsStateWithLifecycle()
|
val statsVersion by StatsStore.version.collectAsStateWithLifecycle()
|
||||||
LaunchedEffect(period, statsVersion) { summary = StatsStore.summary(period.hours) }
|
LaunchedEffect(period, statsVersion) { summary = StatsStore.summary(period.hours) }
|
||||||
|
|
||||||
val visible = remember(entries, filter, search) {
|
// Filtered again only when the log, the filter or the search changes, and the list below is
|
||||||
|
// updated only when the result differs: new entries that the filter hides change nothing
|
||||||
|
val visible by remember {
|
||||||
|
derivedStateOf(structuralEqualityPolicy()) {
|
||||||
val term = search.trim()
|
val term = search.trim()
|
||||||
entries.filter { e ->
|
entries.filter { e ->
|
||||||
val matchesFilter = when (filter) {
|
val matchesFilter = when (filter) {
|
||||||
@@ -114,6 +116,8 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
|||||||
matchesFilter && (term.isEmpty() || e.domain.contains(term, ignoreCase = true))
|
matchesFilter && (term.isEmpty() || e.domain.contains(term, ignoreCase = true))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
val canClear by remember { derivedStateOf { entries.isNotEmpty() } }
|
||||||
|
|
||||||
fun toggleBlock(domain: String, unblock: Boolean) {
|
fun toggleBlock(domain: String, unblock: Boolean) {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
@@ -145,112 +149,27 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
|||||||
.setPrimaryClip(ClipData.newPlainText("domain", domain))
|
.setPrimaryClip(ClipData.newPlainText("domain", domain))
|
||||||
}
|
}
|
||||||
|
|
||||||
LazyColumn(
|
val wide = windowWidth() >= WideLayoutWidth
|
||||||
modifier = modifier,
|
val side = sidePadding(windowWidth(), if (wide) MaxWideContentWidth else MaxContentWidth)
|
||||||
contentPadding = PaddingValues(start = 20.dp, end = 20.dp, top = 16.dp, bottom = bottomPadding),
|
val clear = {
|
||||||
) {
|
|
||||||
item(key = "header") {
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.heightIn(min = 44.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
) {
|
|
||||||
ScreenTitle(stringResource(R.string.tab_activity), Modifier.weight(1f))
|
|
||||||
PeriodChip(stringResource(period.label)) {
|
|
||||||
period = if (period == Period.DAY) Period.WEEK else Period.DAY
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
item(key = "stats") {
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 4.dp, end = 4.dp),
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
|
||||||
) {
|
|
||||||
StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f))
|
|
||||||
StatBlock(formatCompact(summary.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f))
|
|
||||||
StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f))
|
|
||||||
val cache = if (summary.total == 0L) 0 else summary.cached * 100 / summary.total
|
|
||||||
StatBlock("$cache%", stringResource(R.string.mon_cached), Modifier.weight(1f))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
item(key = "companies") {
|
|
||||||
CompanyCard(summary, Modifier.padding(top = 20.dp))
|
|
||||||
}
|
|
||||||
|
|
||||||
item(key = "recent") {
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 24.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
stringResource(R.string.recent_title),
|
|
||||||
color = Palette.Fg,
|
|
||||||
fontSize = 17.sp,
|
|
||||||
fontWeight = FontWeight.ExtraBold,
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
IconButton(
|
|
||||||
onClick = {
|
|
||||||
QueryLog.clear()
|
QueryLog.clear()
|
||||||
entries = emptyList()
|
entries = emptyList()
|
||||||
},
|
|
||||||
enabled = entries.isNotEmpty(),
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
painterResource(R.drawable.ic_delete_sweep),
|
|
||||||
contentDescription = stringResource(R.string.mon_clear),
|
|
||||||
tint = Palette.Fg2,
|
|
||||||
modifier = Modifier.size(20.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The log rows, shared by the one- and two-column layouts
|
||||||
|
val log: LazyListScope.() -> Unit = {
|
||||||
|
item(key = "recent") {
|
||||||
|
RecentHeader(canClear, clear, Modifier.padding(top = if (wide) 0.dp else 24.dp))
|
||||||
|
}
|
||||||
item(key = "search") {
|
item(key = "search") {
|
||||||
SearchField(
|
LogSearch(
|
||||||
value = search,
|
search = search,
|
||||||
onValueChange = { search = it },
|
onSearch = { search = it },
|
||||||
placeholder = stringResource(R.string.mon_search),
|
filter = filter,
|
||||||
|
onFilter = { filter = it },
|
||||||
modifier = Modifier.padding(top = 6.dp, bottom = 4.dp),
|
modifier = Modifier.padding(top = 6.dp, bottom = 4.dp),
|
||||||
trailing = {
|
|
||||||
Box {
|
|
||||||
IconButton(onClick = { filterMenu = true }) {
|
|
||||||
Icon(
|
|
||||||
painterResource(R.drawable.ic_filter),
|
|
||||||
contentDescription = stringResource(R.string.filter),
|
|
||||||
tint = if (filter == ActivityFilter.ALL) Palette.Fg2 else Palette.Accent,
|
|
||||||
modifier = Modifier.size(18.dp),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
DropdownMenu(expanded = filterMenu, onDismissRequest = { filterMenu = false }) {
|
|
||||||
ActivityFilter.entries.forEach { option ->
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = {
|
|
||||||
Text(
|
|
||||||
stringResource(option.label),
|
|
||||||
color = if (option == filter) Palette.Accent else Palette.Fg,
|
|
||||||
fontWeight = if (option == filter) FontWeight.Bold else FontWeight.Normal,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
onClick = {
|
|
||||||
filter = option
|
|
||||||
filterMenu = false
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (visible.isEmpty()) {
|
if (visible.isEmpty()) {
|
||||||
item(key = "empty") {
|
item(key = "empty") {
|
||||||
EmptyState(
|
EmptyState(
|
||||||
@@ -259,7 +178,6 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
itemsIndexed(visible, key = { _, entry -> entry.id }, contentType = { _, _ -> "query" }) { index, entry ->
|
itemsIndexed(visible, key = { _, entry -> entry.id }, contentType = { _, _ -> "query" }) { index, entry ->
|
||||||
val blockedByMe = entry.domain in customSet
|
val blockedByMe = entry.domain in customSet
|
||||||
QueryRow(
|
QueryRow(
|
||||||
@@ -273,24 +191,148 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (wide) {
|
||||||
|
Row(
|
||||||
|
modifier = modifier.padding(horizontal = side),
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(24.dp),
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
Modifier
|
||||||
|
.weight(1f)
|
||||||
|
.fillMaxHeight()
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
|
.padding(top = 16.dp, bottom = bottomPadding),
|
||||||
|
) {
|
||||||
|
ActivityHeader(period) { period = it }
|
||||||
|
ActivityStats(summary, Modifier.padding(top = 20.dp))
|
||||||
|
CompanyCard(summary, Modifier.padding(top = 20.dp))
|
||||||
|
}
|
||||||
|
LazyColumn(
|
||||||
|
modifier = Modifier
|
||||||
|
.weight(1f)
|
||||||
|
.fillMaxHeight(),
|
||||||
|
contentPadding = PaddingValues(top = 16.dp, bottom = bottomPadding),
|
||||||
|
content = log,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
LazyColumn(
|
||||||
|
modifier = modifier,
|
||||||
|
contentPadding = PaddingValues(start = side, end = side, top = 16.dp, bottom = bottomPadding),
|
||||||
|
) {
|
||||||
|
item(key = "header") { ActivityHeader(period) { period = it } }
|
||||||
|
item(key = "stats") { ActivityStats(summary, Modifier.padding(top = 20.dp)) }
|
||||||
|
item(key = "companies") { CompanyCard(summary, Modifier.padding(top = 20.dp)) }
|
||||||
|
log()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun PeriodChip(text: String, onClick: () -> Unit) {
|
private fun ActivityHeader(period: StatsPeriod, onPeriod: (StatsPeriod) -> Unit) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.clip(RoundedCornerShape(18.dp))
|
.fillMaxWidth()
|
||||||
.border(1.dp, Palette.Track, RoundedCornerShape(18.dp))
|
.heightIn(min = 44.dp),
|
||||||
.clickable(onClick = onClick)
|
|
||||||
.padding(start = 14.dp, end = 10.dp, top = 8.dp, bottom = 8.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
Text(text, color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold)
|
ScreenTitle(stringResource(R.string.tab_activity), Modifier.weight(1f))
|
||||||
Spacer(Modifier.width(4.dp))
|
PeriodChip(period, onPeriod)
|
||||||
Icon(painterResource(R.drawable.ic_expand), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(14.dp))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun ActivityStats(summary: StatsSummary, modifier: Modifier = Modifier) {
|
||||||
|
Row(
|
||||||
|
modifier = modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(horizontal = 4.dp),
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
||||||
|
) {
|
||||||
|
StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f))
|
||||||
|
StatBlock(formatCompact(summary.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f))
|
||||||
|
StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f))
|
||||||
|
val cache = if (summary.total == 0L) 0 else summary.cached * 100 / summary.total
|
||||||
|
StatBlock("$cache%", stringResource(R.string.mon_cached), Modifier.weight(1f))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun RecentHeader(canClear: Boolean, onClear: () -> Unit, modifier: Modifier = Modifier) {
|
||||||
|
Row(
|
||||||
|
modifier = modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.heightIn(min = 44.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
stringResource(R.string.recent_title),
|
||||||
|
color = Palette.Fg,
|
||||||
|
fontSize = 17.sp,
|
||||||
|
fontWeight = FontWeight.ExtraBold,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
IconButton(onClick = onClear, enabled = canClear) {
|
||||||
|
Icon(
|
||||||
|
painterResource(R.drawable.ic_delete_sweep),
|
||||||
|
contentDescription = stringResource(R.string.mon_clear),
|
||||||
|
tint = Palette.Fg2,
|
||||||
|
modifier = Modifier.size(20.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun LogSearch(
|
||||||
|
search: String,
|
||||||
|
onSearch: (String) -> Unit,
|
||||||
|
filter: ActivityFilter,
|
||||||
|
onFilter: (ActivityFilter) -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
|
var menu by remember { mutableStateOf(false) }
|
||||||
|
SearchField(
|
||||||
|
value = search,
|
||||||
|
onValueChange = onSearch,
|
||||||
|
placeholder = stringResource(R.string.mon_search),
|
||||||
|
modifier = modifier,
|
||||||
|
trailing = {
|
||||||
|
Box {
|
||||||
|
IconButton(onClick = { menu = true }) {
|
||||||
|
Icon(
|
||||||
|
painterResource(R.drawable.ic_filter),
|
||||||
|
contentDescription = stringResource(R.string.filter),
|
||||||
|
tint = if (filter == ActivityFilter.ALL) Palette.Fg2 else Palette.Accent,
|
||||||
|
modifier = Modifier.size(18.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
DropdownMenu(expanded = menu, onDismissRequest = { menu = false }) {
|
||||||
|
ActivityFilter.entries.forEach { option ->
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = {
|
||||||
|
Text(
|
||||||
|
stringResource(option.label),
|
||||||
|
color = if (option == filter) Palette.Accent else Palette.Fg,
|
||||||
|
fontWeight = if (option == filter) FontWeight.Bold else FontWeight.Normal,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
onClick = {
|
||||||
|
onFilter(option)
|
||||||
|
menu = false
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Below this many requests the shares say more about chance than about habits
|
||||||
|
private const val MIN_COMPANY_REQUESTS = 50L
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) {
|
private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) {
|
||||||
val other = stringResource(R.string.companies_other)
|
val other = stringResource(R.string.companies_other)
|
||||||
@@ -305,12 +347,19 @@ private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) {
|
|||||||
Text(stringResource(R.string.companies_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
|
Text(stringResource(R.string.companies_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
|
||||||
Text(stringResource(R.string.companies_desc), color = Palette.Fg2, fontSize = 12.sp, lineHeight = 17.sp)
|
Text(stringResource(R.string.companies_desc), color = Palette.Fg2, fontSize = 12.sp, lineHeight = 17.sp)
|
||||||
Spacer(Modifier.size(10.dp))
|
Spacer(Modifier.size(10.dp))
|
||||||
if (summary.total == 0L) {
|
if (summary.total < MIN_COMPANY_REQUESTS) {
|
||||||
Text(
|
Text(
|
||||||
stringResource(R.string.no_data),
|
stringResource(R.string.companies_wait, summary.total, MIN_COMPANY_REQUESTS),
|
||||||
color = Palette.Fg3,
|
color = Palette.Fg3,
|
||||||
fontSize = 13.sp,
|
fontSize = 13.sp,
|
||||||
modifier = Modifier.padding(vertical = 12.dp),
|
)
|
||||||
|
LinearProgressIndicator(
|
||||||
|
progress = { summary.total.toFloat() / MIN_COMPANY_REQUESTS },
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(top = 10.dp, bottom = 4.dp),
|
||||||
|
color = Palette.Accent,
|
||||||
|
trackColor = Palette.Track,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
@@ -334,12 +383,7 @@ private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) {
|
|||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
)
|
)
|
||||||
Text(
|
Text(percentLabel(slice.share), color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold)
|
||||||
String.format(Locale.getDefault(), "%.1f%%", slice.share * 100f),
|
|
||||||
color = Palette.Fg,
|
|
||||||
fontSize = 12.sp,
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -348,7 +392,13 @@ private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The four companies with most requests, then everything else
|
// Whole percents; a sliver above zero shows as "<1%" rather than "0%"
|
||||||
|
private fun percentLabel(share: Float): String {
|
||||||
|
val percent = share * 100f
|
||||||
|
return if (percent < 1f) "<1%" else "${Math.round(percent)}%"
|
||||||
|
}
|
||||||
|
|
||||||
|
// The four companies with most requests, then everything else; empty slices are left out
|
||||||
private fun companySlices(summary: StatsSummary, otherLabel: String): List<Slice> {
|
private fun companySlices(summary: StatsSummary, otherLabel: String): List<Slice> {
|
||||||
if (summary.total == 0L) return emptyList()
|
if (summary.total == 0L) return emptyList()
|
||||||
val top = Company.entries
|
val top = Company.entries
|
||||||
@@ -360,26 +410,32 @@ private fun companySlices(summary: StatsSummary, otherLabel: String): List<Slice
|
|||||||
Slice(company.label, count.toFloat() / summary.total, SliceColors[index])
|
Slice(company.label, count.toFloat() / summary.total, SliceColors[index])
|
||||||
}
|
}
|
||||||
val rest = (1f - slices.sumOf { it.share.toDouble() }.toFloat()).coerceAtLeast(0f)
|
val rest = (1f - slices.sumOf { it.share.toDouble() }.toFloat()).coerceAtLeast(0f)
|
||||||
return slices + Slice(otherLabel, rest, OtherColor)
|
return if (rest >= 0.005f) slices + Slice(otherLabel, rest, OtherColor) else slices
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun Donut(slices: List<Slice>, modifier: Modifier = Modifier) {
|
private fun Donut(slices: List<Slice>, modifier: Modifier = Modifier) {
|
||||||
Canvas(modifier) {
|
// The ring's geometry is worked out when the size changes, not every frame
|
||||||
val stroke = 14.dp.toPx()
|
Spacer(
|
||||||
val diameter = size.minDimension - stroke
|
modifier.drawWithCache {
|
||||||
|
val width = 14.dp.toPx()
|
||||||
|
val stroke = Stroke(width = width)
|
||||||
|
val diameter = size.minDimension - width
|
||||||
val topLeft = Offset((size.width - diameter) / 2f, (size.height - diameter) / 2f)
|
val topLeft = Offset((size.width - diameter) / 2f, (size.height - diameter) / 2f)
|
||||||
val arcSize = Size(diameter, diameter)
|
val arcSize = Size(diameter, diameter)
|
||||||
drawArc(OtherColor, 0f, 360f, useCenter = false, topLeft = topLeft, size = arcSize, style = Stroke(width = stroke))
|
onDrawBehind {
|
||||||
|
drawArc(OtherColor, 0f, 360f, useCenter = false, topLeft = topLeft, size = arcSize, style = stroke)
|
||||||
var start = -90f
|
var start = -90f
|
||||||
slices.forEach { slice ->
|
slices.forEach { slice ->
|
||||||
val sweep = slice.share * 360f
|
val sweep = slice.share * 360f
|
||||||
if (sweep > 0f) {
|
if (sweep > 0f) {
|
||||||
drawArc(slice.color, start, sweep, useCenter = false, topLeft = topLeft, size = arcSize, style = Stroke(width = stroke))
|
drawArc(slice.color, start, sweep, useCenter = false, topLeft = topLeft, size = arcSize, style = stroke)
|
||||||
}
|
}
|
||||||
start += sweep
|
start += sweep
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ import androidx.compose.runtime.setValue
|
|||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.draw.drawBehind
|
||||||
import androidx.compose.ui.draw.shadow
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.graphics.Brush
|
import androidx.compose.ui.graphics.Brush
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
@@ -59,6 +60,8 @@ private enum class Screen(@StringRes val label: Int, @DrawableRes val icon: Int,
|
|||||||
ABOUT(R.string.tab_about, R.drawable.ic_tab_info, false),
|
ABOUT(R.string.tab_about, R.drawable.ic_tab_info, false),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val Tabs = Screen.entries.filter { it.isTab }
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun AppShell() {
|
fun AppShell() {
|
||||||
var tab by rememberSaveable { mutableStateOf(Screen.HOME) }
|
var tab by rememberSaveable { mutableStateOf(Screen.HOME) }
|
||||||
@@ -101,6 +104,7 @@ fun AppShell() {
|
|||||||
Screen.HOME -> HomeScreen(
|
Screen.HOME -> HomeScreen(
|
||||||
bottomPadding = tabBottom,
|
bottomPadding = tabBottom,
|
||||||
onOpenBlocklist = { page = Screen.BLOCKLIST },
|
onOpenBlocklist = { page = Screen.BLOCKLIST },
|
||||||
|
onOpenServers = { tab = Screen.SETTINGS },
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
)
|
)
|
||||||
Screen.ACTIVITY -> ActivityScreen(bottomPadding = tabBottom, modifier = modifier)
|
Screen.ACTIVITY -> ActivityScreen(bottomPadding = tabBottom, modifier = modifier)
|
||||||
@@ -160,8 +164,14 @@ private fun NavPill(current: Screen, onSelect: (Screen) -> Unit, modifier: Modif
|
|||||||
.selectableGroup(),
|
.selectableGroup(),
|
||||||
horizontalArrangement = Arrangement.spacedBy(4.dp),
|
horizontalArrangement = Arrangement.spacedBy(4.dp),
|
||||||
) {
|
) {
|
||||||
Screen.entries.filter { it.isTab }.forEach { item ->
|
Tabs.forEach { item -> NavItem(item, selected = item == current, onSelect = onSelect) }
|
||||||
val selected = item == current
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One tab of the panel. Its own composable, so a color animation recomposes only the tabs that
|
||||||
|
// change instead of the whole panel; the background is read only when drawing.
|
||||||
|
@Composable
|
||||||
|
private fun NavItem(item: Screen, selected: Boolean, onSelect: (Screen) -> Unit) {
|
||||||
val background by animateColorAsState(
|
val background by animateColorAsState(
|
||||||
if (selected) Palette.AccentSoft else Color.Transparent,
|
if (selected) Palette.AccentSoft else Color.Transparent,
|
||||||
animationSpec = Motion.color,
|
animationSpec = Motion.color,
|
||||||
@@ -177,13 +187,11 @@ private fun NavPill(current: Screen, onSelect: (Screen) -> Unit, modifier: Modif
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(width = 58.dp, height = 44.dp)
|
.size(width = 58.dp, height = 44.dp)
|
||||||
.clip(RoundedCornerShape(22.dp))
|
.clip(RoundedCornerShape(22.dp))
|
||||||
.background(background)
|
.drawBehind { drawRect(background) }
|
||||||
.selectable(selected = selected, onClick = { onSelect(item) }, role = Role.Tab)
|
.selectable(selected = selected, onClick = { onSelect(item) }, role = Role.Tab)
|
||||||
.semantics { contentDescription = label },
|
.semantics { contentDescription = label },
|
||||||
contentAlignment = Alignment.Center,
|
contentAlignment = Alignment.Center,
|
||||||
) {
|
) {
|
||||||
Icon(painterResource(item.icon), contentDescription = null, tint = tint, modifier = Modifier.size(22.dp))
|
Icon(painterResource(item.icon), contentDescription = null, tint = tint, modifier = Modifier.size(22.dp))
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ import androidx.compose.material3.HorizontalDivider
|
|||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.Switch
|
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TextButton
|
import androidx.compose.material3.TextButton
|
||||||
import androidx.compose.material3.TriStateCheckbox
|
import androidx.compose.material3.TriStateCheckbox
|
||||||
@@ -338,7 +337,7 @@ private fun AppRow(modifier: Modifier, app: AppItem, enabled: Boolean, last: Boo
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
Spacer(Modifier.width(12.dp))
|
Spacer(Modifier.width(12.dp))
|
||||||
Switch(checked = enabled, onCheckedChange = null, colors = appSwitchColors())
|
AppSwitch(checked = enabled, onCheckedChange = null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,9 +66,16 @@ object Blocklist {
|
|||||||
private var customHashes = LongArray(0)
|
private var customHashes = LongArray(0)
|
||||||
private var loaded = false
|
private var loaded = false
|
||||||
|
|
||||||
|
// False until the saved lists have been read at start-up
|
||||||
|
private val _ready = MutableStateFlow(false)
|
||||||
|
val ready: StateFlow<Boolean> = _ready
|
||||||
|
|
||||||
fun isBlocked(name: String): Boolean = _enabled.value && isBlockedIn(name, listHashes, customHashes)
|
fun isBlocked(name: String): Boolean = _enabled.value && isBlockedIn(name, listHashes, customHashes)
|
||||||
|
|
||||||
fun reload(context: Context) = synchronized(lock) { load(BlocklistStore(context)) }
|
// Reads the saved lists unless something did already, such as the background update job
|
||||||
|
fun ensureLoaded(context: Context) {
|
||||||
|
synchronized(lock) { ensureLoaded(BlocklistStore(context)) }
|
||||||
|
}
|
||||||
|
|
||||||
fun setEnabled(context: Context, value: Boolean) {
|
fun setEnabled(context: Context, value: Boolean) {
|
||||||
BlocklistStore(context).enabled = value
|
BlocklistStore(context).enabled = value
|
||||||
@@ -212,6 +219,7 @@ object Blocklist {
|
|||||||
customHashes = LongArray(custom.size) { DomainHash.of(custom[it]) }.sortUnique()
|
customHashes = LongArray(custom.size) { DomainHash.of(custom[it]) }.sortUnique()
|
||||||
reloadListHashes(store)
|
reloadListHashes(store)
|
||||||
loaded = true
|
loaded = true
|
||||||
|
_ready.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun reloadListHashes(store: BlocklistStore) {
|
private fun reloadListHashes(store: BlocklistStore) {
|
||||||
@@ -226,20 +234,28 @@ object Blocklist {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// True when the name or one of its parent domains is in either sorted hash set
|
// True when the name or one of its parent domains is in either sorted hash set. Runs for every
|
||||||
|
// query, so trailing dots are skipped by index rather than trimmed off a copy of the name.
|
||||||
internal fun isBlockedIn(name: String, lists: LongArray, custom: LongArray): Boolean {
|
internal fun isBlockedIn(name: String, lists: LongArray, custom: LongArray): Boolean {
|
||||||
if (lists.isEmpty() && custom.isEmpty()) return false
|
if (lists.isEmpty() && custom.isEmpty()) return false
|
||||||
val domain = name.trimEnd('.')
|
val end = nameEnd(name)
|
||||||
var start = 0
|
var start = 0
|
||||||
while (true) {
|
while (true) {
|
||||||
val hash = DomainHash.of(domain, start)
|
val hash = DomainHash.of(name, start, end)
|
||||||
if (lists.binarySearch(hash) >= 0 || custom.binarySearch(hash) >= 0) return true
|
if (lists.binarySearch(hash) >= 0 || custom.binarySearch(hash) >= 0) return true
|
||||||
val dot = domain.indexOf('.', start)
|
val dot = name.indexOf('.', start)
|
||||||
if (dot < 0) return false
|
if (dot < 0 || dot >= end) return false
|
||||||
start = dot + 1
|
start = dot + 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Length of the name without trailing dots
|
||||||
|
internal fun nameEnd(name: String): Int {
|
||||||
|
var end = name.length
|
||||||
|
while (end > 0 && name[end - 1] == '.') end--
|
||||||
|
return end
|
||||||
|
}
|
||||||
|
|
||||||
// Number of distinct entries in both sorted sets; the custom set is small
|
// Number of distinct entries in both sorted sets; the custom set is small
|
||||||
internal fun unionSize(lists: LongArray, custom: LongArray): Int =
|
internal fun unionSize(lists: LongArray, custom: LongArray): Int =
|
||||||
lists.size + custom.count { lists.binarySearch(it) < 0 }
|
lists.size + custom.count { lists.binarySearch(it) < 0 }
|
||||||
@@ -282,10 +298,10 @@ internal object DomainHash {
|
|||||||
private const val FNV_OFFSET = -3750763034362895579L // 0xcbf29ce484222325
|
private const val FNV_OFFSET = -3750763034362895579L // 0xcbf29ce484222325
|
||||||
private const val FNV_PRIME = 1099511628211L
|
private const val FNV_PRIME = 1099511628211L
|
||||||
|
|
||||||
// FNV-1a over the domain starting at [start], so parent domains are hashed without substrings
|
// FNV-1a over the characters from [start] to [end], so parent domains are hashed without substrings
|
||||||
fun of(s: String, start: Int = 0): Long {
|
fun of(s: String, start: Int = 0, end: Int = s.length): Long {
|
||||||
var h = FNV_OFFSET
|
var h = FNV_OFFSET
|
||||||
for (i in start until s.length) {
|
for (i in start until end) {
|
||||||
h = h xor s[i].code.toLong()
|
h = h xor s[i].code.toLong()
|
||||||
h *= FNV_PRIME
|
h *= FNV_PRIME
|
||||||
}
|
}
|
||||||
@@ -316,8 +332,12 @@ private fun LongArray.sortUnique(): LongArray {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private class BlocklistStore(context: Context) {
|
private class BlocklistStore(context: Context) {
|
||||||
private val dir = File(context.filesDir, "blocklist").apply { mkdirs() }
|
private val appContext = context.applicationContext
|
||||||
private val sp = context.getSharedPreferences("blocklist", Context.MODE_PRIVATE)
|
|
||||||
|
// Created on first use: switching blocking on or off, which happens on the main thread,
|
||||||
|
// touches only the settings
|
||||||
|
private val dir by lazy { File(appContext.filesDir, "blocklist").apply { mkdirs() } }
|
||||||
|
private val sp = appContext.getSharedPreferences("blocklist", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
var enabled: Boolean
|
var enabled: Boolean
|
||||||
get() = sp.getBoolean("enabled", true)
|
get() = sp.getBoolean("enabled", true)
|
||||||
@@ -340,7 +360,7 @@ private class BlocklistStore(context: Context) {
|
|||||||
val array = JSONArray(raw)
|
val array = JSONArray(raw)
|
||||||
(0 until array.length()).map {
|
(0 until array.length()).map {
|
||||||
val o = array.getJSONObject(it)
|
val o = array.getJSONObject(it)
|
||||||
RemoteList(o.getString("url"), o.getInt("count"), o.getLong("updated"), o.optBoolean("enabled", true))
|
RemoteList(o.getString("url"), o.getInt("count"), o.getLong("updated"), o.getBoolean("enabled"))
|
||||||
}
|
}
|
||||||
}.getOrDefault(emptyList())
|
}.getOrDefault(emptyList())
|
||||||
}
|
}
|
||||||
@@ -357,7 +377,6 @@ private class BlocklistStore(context: Context) {
|
|||||||
|
|
||||||
fun loadListHashes(url: String): LongArray {
|
fun loadListHashes(url: String): LongArray {
|
||||||
val file = binFile(url)
|
val file = binFile(url)
|
||||||
if (!file.exists()) migrateText(url)?.let { return it }
|
|
||||||
if (!file.exists()) return LongArray(0)
|
if (!file.exists()) return LongArray(0)
|
||||||
return runCatching {
|
return runCatching {
|
||||||
FileInputStream(file).use { stream ->
|
FileInputStream(file).use { stream ->
|
||||||
@@ -371,7 +390,6 @@ private class BlocklistStore(context: Context) {
|
|||||||
|
|
||||||
fun deleteListFile(url: String) {
|
fun deleteListFile(url: String) {
|
||||||
binFile(url).delete()
|
binFile(url).delete()
|
||||||
textFile(url).delete()
|
|
||||||
sp.edit().remove(etagKey(url)).remove(modifiedKey(url)).apply()
|
sp.edit().remove(etagKey(url)).remove(modifiedKey(url)).apply()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -420,16 +438,6 @@ private class BlocklistStore(context: Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lists saved by older versions as plain text are converted once
|
|
||||||
private fun migrateText(url: String): LongArray? {
|
|
||||||
val text = textFile(url)
|
|
||||||
if (!text.exists()) return null
|
|
||||||
val result = text.readLines().map { DomainHash.of(it) }.toLongArray().sortUnique()
|
|
||||||
runCatching { write(url, result) }
|
|
||||||
text.delete()
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun etagKey(url: String) = "etag_${hash(url)}"
|
private fun etagKey(url: String) = "etag_${hash(url)}"
|
||||||
private fun modifiedKey(url: String) = "modified_${hash(url)}"
|
private fun modifiedKey(url: String) = "modified_${hash(url)}"
|
||||||
|
|
||||||
@@ -437,7 +445,6 @@ private class BlocklistStore(context: Context) {
|
|||||||
if (value == null) remove(key) else putString(key, value)
|
if (value == null) remove(key) else putString(key, value)
|
||||||
|
|
||||||
private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin")
|
private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin")
|
||||||
private fun textFile(url: String) = File(dir, "list_${hash(url)}.txt")
|
|
||||||
|
|
||||||
private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray())
|
private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray())
|
||||||
.take(8).joinToString("") { "%02x".format(it) }
|
.take(8).joinToString("") { "%02x".format(it) }
|
||||||
|
|||||||
@@ -75,8 +75,11 @@ private class Preset(val name: String, val url: String, @StringRes val descripti
|
|||||||
|
|
||||||
private const val HAGEZI_HOME = "https://github.com/hagezi/dns-blocklists"
|
private const val HAGEZI_HOME = "https://github.com/hagezi/dns-blocklists"
|
||||||
|
|
||||||
|
// Offered on Home when no list is switched on
|
||||||
|
internal const val HAGEZI_PRO_URL = "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt"
|
||||||
|
|
||||||
private val Presets = listOf(
|
private val Presets = listOf(
|
||||||
Preset("HaGeZi Pro", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt", R.string.preset_pro_desc),
|
Preset("HaGeZi Pro", HAGEZI_PRO_URL, R.string.preset_pro_desc),
|
||||||
Preset("HaGeZi Pro++", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.plus.txt", R.string.preset_proplus_desc),
|
Preset("HaGeZi Pro++", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.plus.txt", R.string.preset_proplus_desc),
|
||||||
Preset("HaGeZi TIF", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt", R.string.preset_tif_desc),
|
Preset("HaGeZi TIF", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt", R.string.preset_tif_desc),
|
||||||
)
|
)
|
||||||
@@ -89,6 +92,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier =
|
|||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
val prefs = remember { Prefs(context) }
|
val prefs = remember { Prefs(context) }
|
||||||
|
val side = sidePadding(windowWidth())
|
||||||
|
|
||||||
val enabled by Blocklist.enabled.collectAsStateWithLifecycle()
|
val enabled by Blocklist.enabled.collectAsStateWithLifecycle()
|
||||||
val custom by Blocklist.custom.collectAsStateWithLifecycle()
|
val custom by Blocklist.custom.collectAsStateWithLifecycle()
|
||||||
@@ -96,8 +100,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier =
|
|||||||
// Downloads live in Blocklist, so they keep running and stay visible when the page is closed
|
// Downloads live in Blocklist, so they keep running and stay visible when the page is closed
|
||||||
val busy by Blocklist.busy.collectAsStateWithLifecycle()
|
val busy by Blocklist.busy.collectAsStateWithLifecycle()
|
||||||
val error by Blocklist.error.collectAsStateWithLifecycle()
|
val error by Blocklist.error.collectAsStateWithLifecycle()
|
||||||
val lastError = remember { arrayOf("") } // kept while the card animates out
|
val shownError = rememberLast(error).orEmpty()
|
||||||
error?.let { lastError[0] = it }
|
|
||||||
|
|
||||||
var search by rememberSaveable { mutableStateOf("") }
|
var search by rememberSaveable { mutableStateOf("") }
|
||||||
var domainsOpen by rememberSaveable { mutableStateOf(false) }
|
var domainsOpen by rememberSaveable { mutableStateOf(false) }
|
||||||
@@ -129,7 +132,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier =
|
|||||||
|
|
||||||
LazyColumn(
|
LazyColumn(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
contentPadding = PaddingValues(start = 20.dp, end = 20.dp, bottom = bottomPadding),
|
contentPadding = PaddingValues(start = side, end = side, bottom = bottomPadding),
|
||||||
) {
|
) {
|
||||||
item(key = "header") {
|
item(key = "header") {
|
||||||
PageHeader(
|
PageHeader(
|
||||||
@@ -163,7 +166,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier =
|
|||||||
AnimatedVisibility(visible = error != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
AnimatedVisibility(visible = error != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
||||||
Box(Modifier.padding(top = 12.dp)) {
|
Box(Modifier.padding(top = 12.dp)) {
|
||||||
HintCard(
|
HintCard(
|
||||||
stringResource(R.string.bl_download_failed, lastError[0]),
|
stringResource(R.string.bl_download_failed, shownError),
|
||||||
icon = R.drawable.ic_alert,
|
icon = R.drawable.ic_alert,
|
||||||
tint = Palette.Blocked,
|
tint = Palette.Blocked,
|
||||||
)
|
)
|
||||||
@@ -430,16 +433,7 @@ private fun BlocklistCard(
|
|||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
)
|
)
|
||||||
if (onDelete != null) {
|
if (onDelete != null) DeleteButton(onDelete)
|
||||||
IconButton(onClick = onDelete) {
|
|
||||||
Icon(
|
|
||||||
painterResource(R.drawable.ic_delete),
|
|
||||||
contentDescription = stringResource(R.string.delete),
|
|
||||||
tint = Palette.Fg3,
|
|
||||||
modifier = Modifier.size(20.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
AppSwitch(checked = checked, onCheckedChange = onCheckedChange, enabled = switchEnabled)
|
AppSwitch(checked = checked, onCheckedChange = onCheckedChange, enabled = switchEnabled)
|
||||||
}
|
}
|
||||||
Text(
|
Text(
|
||||||
@@ -547,7 +541,7 @@ private fun DomainRow(domain: String, shape: Shape, onDelete: () -> Unit, modifi
|
|||||||
.clip(shape)
|
.clip(shape)
|
||||||
.background(Palette.Card)
|
.background(Palette.Card)
|
||||||
) {
|
) {
|
||||||
HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp), color = Palette.Line)
|
ListDivider()
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.padding(start = 16.dp, end = 4.dp),
|
modifier = Modifier.padding(start = 16.dp, end = 4.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
@@ -560,7 +554,14 @@ private fun DomainRow(domain: String, shape: Shape, onDelete: () -> Unit, modifi
|
|||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
)
|
)
|
||||||
IconButton(onClick = onDelete) {
|
DeleteButton(onDelete)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun DeleteButton(onClick: () -> Unit) {
|
||||||
|
IconButton(onClick = onClick) {
|
||||||
Icon(
|
Icon(
|
||||||
painterResource(R.drawable.ic_delete),
|
painterResource(R.drawable.ic_delete),
|
||||||
contentDescription = stringResource(R.string.delete),
|
contentDescription = stringResource(R.string.delete),
|
||||||
@@ -568,8 +569,6 @@ private fun DomainRow(domain: String, shape: Shape, onDelete: () -> Unit, modifi
|
|||||||
modifier = Modifier.size(20.dp),
|
modifier = Modifier.size(20.dp),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package cc.skysparkle.sparkledns
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
|
import java.util.TreeMap
|
||||||
|
|
||||||
// The position of each company is saved in StatsStore: add new ones at the end only
|
// The position of each company is saved in StatsStore: add new ones at the end only
|
||||||
enum class Company(val label: String) {
|
enum class Company(val label: String) {
|
||||||
GOOGLE("Google"),
|
GOOGLE("Google"),
|
||||||
@@ -17,8 +19,16 @@ enum class Company(val label: String) {
|
|||||||
// Tells which big company a domain belongs to, for the Company dominance card.
|
// Tells which big company a domain belongs to, for the Company dominance card.
|
||||||
// Matches the domain and every parent of it against a small built-in table.
|
// Matches the domain and every parent of it against a small built-in table.
|
||||||
object Companies {
|
object Companies {
|
||||||
private val bySuffix = HashMap<String, Company>().apply {
|
private const val GOOGLE_PREFIX = "google."
|
||||||
fun add(company: Company, vararg domains: String) = domains.forEach { put(it, company) }
|
|
||||||
|
// Hashes of the domains, sorted, with the company of each at the same index: this runs for
|
||||||
|
// every query, and parent domains are looked up by hash without copying the name
|
||||||
|
private val hashes: LongArray
|
||||||
|
private val owners: Array<Company>
|
||||||
|
|
||||||
|
init {
|
||||||
|
val table = TreeMap<Long, Company>()
|
||||||
|
fun add(company: Company, vararg domains: String) = domains.forEach { table[DomainHash.of(it)] = company }
|
||||||
|
|
||||||
add(
|
add(
|
||||||
Company.GOOGLE,
|
Company.GOOGLE,
|
||||||
@@ -62,17 +72,24 @@ object Companies {
|
|||||||
add(Company.YANDEX, "yandex.ru", "yandex.net", "yandex.com", "ya.ru", "yastatic.net", "yandex.by", "yandex.kz")
|
add(Company.YANDEX, "yandex.ru", "yandex.net", "yandex.com", "ya.ru", "yastatic.net", "yandex.by", "yandex.kz")
|
||||||
add(Company.SAMSUNG, "samsung.com", "samsungapps.com", "samsungcloud.com", "samsungqbe.com", "samsungosp.com")
|
add(Company.SAMSUNG, "samsung.com", "samsungapps.com", "samsungcloud.com", "samsungqbe.com", "samsungosp.com")
|
||||||
add(Company.XIAOMI, "xiaomi.com", "xiaomi.net", "mi.com", "miui.com", "mi-img.com")
|
add(Company.XIAOMI, "xiaomi.com", "xiaomi.net", "mi.com", "miui.com", "mi-img.com")
|
||||||
|
|
||||||
|
hashes = table.keys.toLongArray()
|
||||||
|
owners = table.values.toTypedArray()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun of(name: String): Company? {
|
fun of(name: String): Company? {
|
||||||
var domain = name.lowercase().trimEnd('.')
|
// Names from the tunnel are lowercase already; anything else is lowercased once
|
||||||
while (domain.isNotEmpty()) {
|
val domain = if (name.any { it.isUpperCase() }) name.lowercase() else name
|
||||||
bySuffix[domain]?.let { return it }
|
val end = nameEnd(domain)
|
||||||
|
var start = 0
|
||||||
|
while (start < end) {
|
||||||
|
val index = hashes.binarySearch(DomainHash.of(domain, start, end))
|
||||||
|
if (index >= 0) return owners[index]
|
||||||
// Google's country sites: google.de, google.co.uk, google.com.br
|
// Google's country sites: google.de, google.co.uk, google.com.br
|
||||||
if (domain.startsWith("google.") && domain.length - "google.".length <= 6) return Company.GOOGLE
|
if (end - start - GOOGLE_PREFIX.length in 1..6 && domain.startsWith(GOOGLE_PREFIX, start)) return Company.GOOGLE
|
||||||
val dot = domain.indexOf('.')
|
val dot = domain.indexOf('.', start)
|
||||||
if (dot < 0) return null
|
if (dot < 0 || dot >= end) return null
|
||||||
domain = domain.substring(dot + 1)
|
start = dot + 1
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import android.content.Context
|
|||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Process
|
import android.os.Process
|
||||||
import android.os.StrictMode
|
import android.os.StrictMode
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.PrintWriter
|
import java.io.PrintWriter
|
||||||
import java.io.StringWriter
|
import java.io.StringWriter
|
||||||
@@ -17,22 +19,23 @@ class SparkleApp : Application() {
|
|||||||
Thread({
|
Thread({
|
||||||
// Reads what the first screen needs before it asks, so its first frame does not wait on storage
|
// Reads what the first screen needs before it asks, so its first frame does not wait on storage
|
||||||
Prefs(this).providerId
|
Prefs(this).providerId
|
||||||
CrashLog.preload(this)
|
CrashLog.load(this)
|
||||||
StatsStore.init(this)
|
StatsStore.init(this)
|
||||||
// Older versions cached a server list downloaded from the repository
|
|
||||||
File(filesDir, "servers.txt").delete()
|
|
||||||
AutoUpdate.apply(this)
|
AutoUpdate.apply(this)
|
||||||
// Lists can hold millions of entries; loading them should not take CPU from the first frames
|
// Lists can hold millions of entries; loading them should not take CPU from the first frames
|
||||||
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND)
|
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND)
|
||||||
runCatching { Blocklist.reload(this) }
|
runCatching { Blocklist.ensureLoaded(this) }
|
||||||
}, "startup-load").start()
|
}, "startup-load").start()
|
||||||
}
|
}
|
||||||
|
|
||||||
// The VPN keeps the process running long after the screens are gone; decoded app icons
|
// The VPN keeps the process running long after the screens are gone; decoded app icons
|
||||||
// (up to 10 MB) can be rendered again the next time the Apps tab opens
|
// (up to 10 MB) and the logo can be rendered again the next time they are shown
|
||||||
override fun onTrimMemory(level: Int) {
|
override fun onTrimMemory(level: Int) {
|
||||||
super.onTrimMemory(level)
|
super.onTrimMemory(level)
|
||||||
if (level >= TRIM_MEMORY_UI_HIDDEN) clearAppIconCache()
|
if (level >= TRIM_MEMORY_UI_HIDDEN) {
|
||||||
|
clearAppIconCache()
|
||||||
|
AppLogo.clear()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug builds only: logs disk and network access on the main thread, leaked closeables and the like
|
// Debug builds only: logs disk and network access on the main thread, leaked closeables and the like
|
||||||
@@ -46,13 +49,18 @@ class SparkleApp : Application() {
|
|||||||
object CrashLog {
|
object CrashLog {
|
||||||
private const val FILE_NAME = "last_crash.txt"
|
private const val FILE_NAME = "last_crash.txt"
|
||||||
|
|
||||||
|
// Null when there is no report, and until the startup thread has read it
|
||||||
|
private val _report = MutableStateFlow<String?>(null)
|
||||||
|
val report: StateFlow<String?> = _report
|
||||||
|
|
||||||
fun install(context: Context) {
|
fun install(context: Context) {
|
||||||
val file = File(context.filesDir, FILE_NAME)
|
val appContext = context.applicationContext
|
||||||
val previous = Thread.getDefaultUncaughtExceptionHandler()
|
val previous = Thread.getDefaultUncaughtExceptionHandler()
|
||||||
Thread.setDefaultUncaughtExceptionHandler { thread, error ->
|
Thread.setDefaultUncaughtExceptionHandler { thread, error ->
|
||||||
runCatching {
|
runCatching {
|
||||||
val trace = StringWriter().also { error.printStackTrace(PrintWriter(it)) }.toString()
|
val trace = StringWriter().also { error.printStackTrace(PrintWriter(it)) }.toString()
|
||||||
file.writeText(
|
// Looked up only now: install() runs on the main thread at start-up
|
||||||
|
File(appContext.filesDir, FILE_NAME).writeText(
|
||||||
"Thread: ${thread.name}\n" +
|
"Thread: ${thread.name}\n" +
|
||||||
"Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT}), " +
|
"Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT}), " +
|
||||||
"${Build.MANUFACTURER} ${Build.MODEL}\n\n$trace"
|
"${Build.MANUFACTURER} ${Build.MODEL}\n\n$trace"
|
||||||
@@ -62,24 +70,14 @@ object CrashLog {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Volatile
|
// Runs on the startup thread, so the main thread never reads the file
|
||||||
private var preloaded = false
|
fun load(context: Context) {
|
||||||
|
_report.value = runCatching { File(context.filesDir, FILE_NAME).takeIf { it.exists() }?.readText() }.getOrNull()
|
||||||
@Volatile
|
|
||||||
private var report: String? = null
|
|
||||||
|
|
||||||
fun preload(context: Context) {
|
|
||||||
report = load(context)
|
|
||||||
preloaded = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun read(context: Context): String? = if (preloaded) report else load(context)
|
|
||||||
|
|
||||||
fun clear(context: Context) {
|
fun clear(context: Context) {
|
||||||
report = null
|
_report.value = null
|
||||||
File(context.filesDir, FILE_NAME).delete()
|
val appContext = context.applicationContext
|
||||||
|
Thread({ File(appContext.filesDir, FILE_NAME).delete() }, "crash-clear").start()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun load(context: Context): String? =
|
|
||||||
runCatching { File(context.filesDir, FILE_NAME).takeIf { it.exists() }?.readText() }.getOrNull()
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class DnsCache(
|
|||||||
|
|
||||||
private class Entry(
|
private class Entry(
|
||||||
val response: ByteArray,
|
val response: ByteArray,
|
||||||
val ttlOffsets: IntArray,
|
// Offset and value of each TTL field, one pair after another
|
||||||
val ttls: IntArray,
|
val ttls: IntArray,
|
||||||
val storedAt: Long,
|
val storedAt: Long,
|
||||||
val expiresAt: Long,
|
val expiresAt: Long,
|
||||||
@@ -35,7 +35,12 @@ class DnsCache(
|
|||||||
out[0] = query[0]
|
out[0] = query[0]
|
||||||
out[1] = query[1]
|
out[1] = query[1]
|
||||||
val elapsed = ((now - entry.storedAt) / 1000).toInt()
|
val elapsed = ((now - entry.storedAt) / 1000).toInt()
|
||||||
entry.ttlOffsets.forEachIndexed { i, off -> put32(out, off, maxOf(entry.ttls[i] - elapsed, 0)) }
|
val ttls = entry.ttls
|
||||||
|
var i = 0
|
||||||
|
while (i < ttls.size) {
|
||||||
|
put32(out, ttls[i], maxOf(ttls[i + 1] - elapsed, 0))
|
||||||
|
i += 2
|
||||||
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,26 +50,32 @@ class DnsCache(
|
|||||||
val rcode = response[3].toInt() and 0x0F
|
val rcode = response[3].toInt() and 0x0F
|
||||||
if (rcode != 0 && rcode != 3) return // only NOERROR and NXDOMAIN
|
if (rcode != 0 && rcode != 3) return // only NOERROR and NXDOMAIN
|
||||||
|
|
||||||
val records = parseTtls(response) ?: return
|
val ttls = parseTtls(response) ?: return
|
||||||
val minTtl = if (records.first.isEmpty()) NO_RECORDS_TTL else records.second.min()
|
var minTtl = if (ttls.isEmpty()) NO_RECORDS_TTL else Int.MAX_VALUE
|
||||||
|
var i = 1
|
||||||
|
while (i < ttls.size) {
|
||||||
|
minTtl = minOf(minTtl, ttls[i])
|
||||||
|
i += 2
|
||||||
|
}
|
||||||
val ttl = minOf(minTtl, MAX_TTL)
|
val ttl = minOf(minTtl, MAX_TTL)
|
||||||
if (ttl <= 0) return
|
if (ttl <= 0) return
|
||||||
|
|
||||||
val now = clock()
|
val now = clock()
|
||||||
val entry = Entry(response.copyOf(), records.first, records.second, now, now + ttl * 1000L)
|
val entry = Entry(response.copyOf(), ttls, now, now + ttl * 1000L)
|
||||||
synchronized(map) { map[key] = entry }
|
synchronized(map) { map[key] = entry }
|
||||||
}
|
}
|
||||||
|
|
||||||
// Offsets and values of every TTL field except the EDNS OPT pseudo-record
|
// Offset and value of every TTL field except the EDNS OPT pseudo-record, as pairs in one array
|
||||||
private fun parseTtls(msg: ByteArray): Pair<IntArray, IntArray>? {
|
private fun parseTtls(msg: ByteArray): IntArray? {
|
||||||
var pos = 12
|
var pos = 12
|
||||||
repeat(u16(msg, 4)) {
|
repeat(u16(msg, 4)) {
|
||||||
pos = skipName(msg, pos) ?: return null
|
pos = skipName(msg, pos) ?: return null
|
||||||
pos += 4
|
pos += 4
|
||||||
}
|
}
|
||||||
val total = u16(msg, 6) + u16(msg, 8) + u16(msg, 10)
|
val total = u16(msg, 6) + u16(msg, 8) + u16(msg, 10)
|
||||||
val offsets = ArrayList<Int>(total)
|
// The counts come from the server; the array grows only if a message really has that many
|
||||||
val values = ArrayList<Int>(total)
|
var ttls = IntArray(2 * minOf(total, 16))
|
||||||
|
var n = 0
|
||||||
repeat(total) {
|
repeat(total) {
|
||||||
pos = skipName(msg, pos) ?: return null
|
pos = skipName(msg, pos) ?: return null
|
||||||
if (pos + 10 > msg.size) return null
|
if (pos + 10 > msg.size) return null
|
||||||
@@ -72,13 +83,14 @@ class DnsCache(
|
|||||||
val ttlOffset = pos + 4
|
val ttlOffset = pos + 4
|
||||||
val rdLength = u16(msg, pos + 8)
|
val rdLength = u16(msg, pos + 8)
|
||||||
if (type != TYPE_OPT) {
|
if (type != TYPE_OPT) {
|
||||||
offsets += ttlOffset
|
if (n == ttls.size) ttls = ttls.copyOf(n * 2)
|
||||||
values += minOf(u32(msg, ttlOffset), Int.MAX_VALUE.toLong()).toInt()
|
ttls[n++] = ttlOffset
|
||||||
|
ttls[n++] = minOf(u32(msg, ttlOffset), Int.MAX_VALUE.toLong()).toInt()
|
||||||
}
|
}
|
||||||
pos += 10 + rdLength
|
pos += 10 + rdLength
|
||||||
if (pos > msg.size) return null
|
if (pos > msg.size) return null
|
||||||
}
|
}
|
||||||
return offsets.toIntArray() to values.toIntArray()
|
return if (n == ttls.size) ttls else ttls.copyOf(n)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun keyOf(query: ByteArray): String? {
|
private fun keyOf(query: ByteArray): String? {
|
||||||
|
|||||||
@@ -124,7 +124,14 @@ class DohVpnService : VpnService() {
|
|||||||
stopSelf()
|
stopSelf()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
session = Session(tun, DohClient(this, provider), ::onSessionFailed).also { it.start() }
|
val next = try {
|
||||||
|
Session(tun, DohClient(this, provider), ::onSessionFailed)
|
||||||
|
} catch (e: IOException) {
|
||||||
|
// A tunnel nobody reads would swallow every DNS lookup on the device
|
||||||
|
runCatching { tun.close() }
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
session = next.also { it.start() }
|
||||||
runCatching { previous?.stop() }
|
runCatching { previous?.stop() }
|
||||||
|
|
||||||
_active.value = provider
|
_active.value = provider
|
||||||
@@ -210,6 +217,10 @@ private class Session(
|
|||||||
private val pool = Executors.newFixedThreadPool(WORKERS)
|
private val pool = Executors.newFixedThreadPool(WORKERS)
|
||||||
private val cache = DnsCache()
|
private val cache = DnsCache()
|
||||||
private val output = FileOutputStream(tun.fileDescriptor)
|
private val output = FileOutputStream(tun.fileDescriptor)
|
||||||
|
|
||||||
|
// stop() closes the write end, which wakes the reader at once. Otherwise the reader would have
|
||||||
|
// to wake up on a timer to notice that the session ended, also while the device sleeps.
|
||||||
|
private val wakeup = ParcelFileDescriptor.createPipe()
|
||||||
private val reader = Thread(::readLoop, "tun-reader")
|
private val reader = Thread(::readLoop, "tun-reader")
|
||||||
|
|
||||||
fun start() = reader.start()
|
fun start() = reader.start()
|
||||||
@@ -217,6 +228,7 @@ private class Session(
|
|||||||
fun stop() {
|
fun stop() {
|
||||||
if (!alive.getAndSet(false)) return
|
if (!alive.getAndSet(false)) return
|
||||||
pool.shutdownNow()
|
pool.shutdownNow()
|
||||||
|
runCatching { wakeup[1].close() }
|
||||||
runCatching { tun.close() }
|
runCatching { tun.close() }
|
||||||
closer.execute {
|
closer.execute {
|
||||||
try {
|
try {
|
||||||
@@ -230,16 +242,28 @@ private class Session(
|
|||||||
private fun readLoop() {
|
private fun readLoop() {
|
||||||
val input = FileInputStream(tun.fileDescriptor)
|
val input = FileInputStream(tun.fileDescriptor)
|
||||||
val buf = ByteArray(MTU)
|
val buf = ByteArray(MTU)
|
||||||
val pollFd = StructPollfd().apply {
|
val tunFd = StructPollfd().apply {
|
||||||
fd = tun.fileDescriptor
|
fd = tun.fileDescriptor
|
||||||
events = OsConstants.POLLIN.toShort()
|
events = OsConstants.POLLIN.toShort()
|
||||||
}
|
}
|
||||||
|
val wakeupFd = StructPollfd().apply {
|
||||||
|
fd = wakeup[0].fileDescriptor
|
||||||
|
events = OsConstants.POLLIN.toShort()
|
||||||
|
}
|
||||||
|
val fds = arrayOf(tunFd, wakeupFd)
|
||||||
|
|
||||||
var badPackets = 0
|
var badPackets = 0
|
||||||
|
|
||||||
|
try {
|
||||||
while (alive.get()) {
|
while (alive.get()) {
|
||||||
val n = try {
|
val n = try {
|
||||||
if (Os.poll(arrayOf(pollFd), 500) <= 0) continue
|
// Sleeps until a packet arrives or stop() closes the pipe
|
||||||
|
if (Os.poll(fds, -1) <= 0) continue
|
||||||
|
if (wakeupFd.revents.toInt() != 0) {
|
||||||
|
// Only stop() touches the pipe, so this ends the loop
|
||||||
|
readerFailed(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
input.read(buf)
|
input.read(buf)
|
||||||
} catch (e: ErrnoException) {
|
} catch (e: ErrnoException) {
|
||||||
if (e.errno == OsConstants.EINTR) continue
|
if (e.errno == OsConstants.EINTR) continue
|
||||||
@@ -268,6 +292,9 @@ private class Session(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
runCatching { wakeup[0].close() }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// stop() closes the tunnel, which also ends the loop; only an unexpected end is a failure
|
// stop() closes the tunnel, which also ends the loop; only an unexpected end is a failure
|
||||||
|
|||||||
@@ -25,11 +25,12 @@ import androidx.compose.foundation.clickable
|
|||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.offset
|
import androidx.compose.foundation.layout.offset
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
@@ -39,6 +40,8 @@ import androidx.compose.foundation.selection.toggleable
|
|||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.foundation.verticalScroll
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TextButton
|
import androidx.compose.material3.TextButton
|
||||||
@@ -47,63 +50,96 @@ import androidx.compose.runtime.LaunchedEffect
|
|||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.draw.drawBehind
|
import androidx.compose.ui.draw.drawBehind
|
||||||
|
import androidx.compose.ui.draw.drawWithCache
|
||||||
|
import androidx.compose.ui.geometry.CornerRadius
|
||||||
import androidx.compose.ui.geometry.Offset
|
import androidx.compose.ui.geometry.Offset
|
||||||
|
import androidx.compose.ui.geometry.Size
|
||||||
import androidx.compose.ui.graphics.Brush
|
import androidx.compose.ui.graphics.Brush
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.Path
|
|
||||||
import androidx.compose.ui.graphics.PathEffect
|
import androidx.compose.ui.graphics.PathEffect
|
||||||
import androidx.compose.ui.graphics.StrokeCap
|
import androidx.compose.ui.graphics.StrokeCap
|
||||||
import androidx.compose.ui.graphics.StrokeJoin
|
|
||||||
import androidx.compose.ui.graphics.drawscope.Stroke
|
|
||||||
import androidx.compose.ui.graphics.graphicsLayer
|
import androidx.compose.ui.graphics.graphicsLayer
|
||||||
|
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.semantics.Role
|
import androidx.compose.ui.semantics.Role
|
||||||
import androidx.compose.ui.semantics.contentDescription
|
import androidx.compose.ui.semantics.contentDescription
|
||||||
import androidx.compose.ui.semantics.semantics
|
import androidx.compose.ui.semantics.semantics
|
||||||
|
import androidx.compose.ui.text.TextLayoutResult
|
||||||
import androidx.compose.ui.text.TextStyle
|
import androidx.compose.ui.text.TextStyle
|
||||||
import androidx.compose.ui.text.drawText
|
import androidx.compose.ui.text.drawText
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.rememberTextMeasurer
|
import androidx.compose.ui.text.rememberTextMeasurer
|
||||||
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
|
||||||
|
import androidx.compose.ui.unit.Constraints
|
||||||
import androidx.compose.ui.unit.Dp
|
import androidx.compose.ui.unit.Dp
|
||||||
|
import androidx.compose.ui.unit.IntOffset
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import kotlinx.coroutines.delay
|
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Calendar
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
import java.util.TimeZone
|
||||||
|
import kotlin.math.ceil
|
||||||
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
private const val CHART_HOURS = 24
|
private const val HOUR_MS = 3_600_000L
|
||||||
|
|
||||||
|
// One bar of the chart: an hour, or a day in the 7-day view
|
||||||
|
private data class Bar(val total: Long, val blocked: Long)
|
||||||
|
|
||||||
|
// Bars with the labels under them: the first hour of the day view, or every day of the week.
|
||||||
|
// A refresh that brings equal data leaves the chart alone.
|
||||||
|
private data class Chart(val period: StatsPeriod, val bars: List<Bar>, val labels: List<String>)
|
||||||
|
|
||||||
|
private val ChartLabelStyle = TextStyle(color = Palette.Fg3, fontSize = 10.sp)
|
||||||
|
|
||||||
|
// Where the three grip lines on the knob of the power switch sit, as fractions of its width
|
||||||
|
private val KnobLines = floatArrayOf(0.29f, 0.5f, 0.71f)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifier = Modifier) {
|
fun HomeScreen(
|
||||||
|
bottomPadding: Dp,
|
||||||
|
onOpenBlocklist: () -> Unit,
|
||||||
|
onOpenServers: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val prefs = remember { Prefs(context) }
|
val prefs = remember { Prefs(context) }
|
||||||
|
val haptics = LocalHapticFeedback.current
|
||||||
|
val scope = rememberCoroutineScope()
|
||||||
val active by DohVpnService.active.collectAsStateWithLifecycle()
|
val active by DohVpnService.active.collectAsStateWithLifecycle()
|
||||||
val running = active != null
|
val running = active != null
|
||||||
val lists by Blocklist.lists.collectAsStateWithLifecycle()
|
val lists by Blocklist.lists.collectAsStateWithLifecycle()
|
||||||
val total by Blocklist.total.collectAsStateWithLifecycle()
|
val total by Blocklist.total.collectAsStateWithLifecycle()
|
||||||
val blocking by Blocklist.enabled.collectAsStateWithLifecycle()
|
val blocking by Blocklist.enabled.collectAsStateWithLifecycle()
|
||||||
|
val listsReady by Blocklist.ready.collectAsStateWithLifecycle()
|
||||||
|
val download by Blocklist.busy.collectAsStateWithLifecycle()
|
||||||
|
val downloadError by Blocklist.error.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
var summary by remember { mutableStateOf(StatsStore.summary(CHART_HOURS)) }
|
var period by rememberSaveable { mutableStateOf(StatsPeriod.DAY) }
|
||||||
var points by remember { mutableStateOf(StatsStore.hourly(CHART_HOURS)) }
|
var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) }
|
||||||
|
var chartData by remember { mutableStateOf(buildChart(period)) }
|
||||||
fun refreshStats() {
|
fun refreshStats() {
|
||||||
summary = StatsStore.summary(CHART_HOURS)
|
summary = StatsStore.summary(period.hours)
|
||||||
points = StatsStore.hourly(CHART_HOURS)
|
chartData = buildChart(period)
|
||||||
}
|
}
|
||||||
OnQueryLogChange { refreshStats() }
|
OnQueryLogChange { refreshStats() }
|
||||||
val statsVersion by StatsStore.version.collectAsStateWithLifecycle()
|
val statsVersion by StatsStore.version.collectAsStateWithLifecycle()
|
||||||
LaunchedEffect(statsVersion) { refreshStats() }
|
LaunchedEffect(statsVersion, period) { refreshStats() }
|
||||||
|
|
||||||
// The server is picked in Settings; this screen is composed anew each time it is shown
|
// The server is picked in Settings; this screen is composed anew each time it is shown
|
||||||
val selected = remember { prefs.resolve() }
|
val selected = remember { prefs.resolve() }
|
||||||
@@ -111,21 +147,12 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie
|
|||||||
val shown = active ?: selected
|
val shown = active ?: selected
|
||||||
val usesHttp3 = shown.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
|
val usesHttp3 = shown.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
|
||||||
|
|
||||||
val crashReport = remember { CrashLog.read(context) }
|
val crashReport by CrashLog.report.collectAsStateWithLifecycle()
|
||||||
var crashVisible by remember { mutableStateOf(crashReport != null) }
|
val shownReport = rememberLast(crashReport).orEmpty() // kept while the card animates out
|
||||||
// Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible
|
// Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible
|
||||||
val privateDnsHost by remember { privateDnsHosts(context) }.collectAsStateWithLifecycle(initialValue = null)
|
val privateDnsHost by remember { privateDnsHosts(context) }.collectAsStateWithLifecycle(initialValue = null)
|
||||||
|
|
||||||
// Set by a tap until the VPN state changes or the attempt gives up, so a double tap neither
|
var busy by rememberVpnBusy(active)
|
||||||
// starts two connections nor switches the VPN back on right after turning it off
|
|
||||||
var busy by remember { mutableStateOf(false) }
|
|
||||||
LaunchedEffect(active) { busy = false }
|
|
||||||
LaunchedEffect(busy) {
|
|
||||||
if (busy) {
|
|
||||||
delay(BUSY_TIMEOUT_MS)
|
|
||||||
busy = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val vpnPermission = rememberLauncherForActivityResult(
|
val vpnPermission = rememberLauncherForActivityResult(
|
||||||
ActivityResultContracts.StartActivityForResult()
|
ActivityResultContracts.StartActivityForResult()
|
||||||
@@ -148,6 +175,7 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie
|
|||||||
fun toggle() {
|
fun toggle() {
|
||||||
if (busy) return
|
if (busy) return
|
||||||
busy = true
|
busy = true
|
||||||
|
haptics.performHapticFeedback(if (running) HapticFeedbackType.ToggleOff else HapticFeedbackType.ToggleOn)
|
||||||
if (running) {
|
if (running) {
|
||||||
sendAction(context, DohVpnService.ACTION_STOP)
|
sendAction(context, DohVpnService.ACTION_STOP)
|
||||||
return
|
return
|
||||||
@@ -158,65 +186,50 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie
|
|||||||
else connectVpn()
|
else connectVpn()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// What the blocklist card offers: nothing, switching blocking back on, or a first list
|
||||||
|
val proList = lists.firstOrNull { it.url == HAGEZI_PRO_URL }
|
||||||
|
val offer = when {
|
||||||
|
!listsReady -> BlocklistOffer.NONE
|
||||||
|
!blocking -> BlocklistOffer.SWITCH_ON
|
||||||
|
total == 0 && lists.none { it.enabled } -> BlocklistOffer.FIRST_LIST
|
||||||
|
else -> BlocklistOffer.NONE
|
||||||
|
}
|
||||||
|
fun acceptOffer() {
|
||||||
|
when (offer) {
|
||||||
|
BlocklistOffer.SWITCH_ON -> Blocklist.setEnabled(context, true)
|
||||||
|
BlocklistOffer.FIRST_LIST ->
|
||||||
|
if (proList != null) scope.editBlocklist(context) { Blocklist.setListEnabled(context, HAGEZI_PRO_URL, true) }
|
||||||
|
else Blocklist.download(context, HAGEZI_PRO_URL)
|
||||||
|
BlocklistOffer.NONE -> Unit
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
val glow by animateFloatAsState(if (running) 1f else 0f, tween(600), label = "glow")
|
val glow by animateFloatAsState(if (running) 1f else 0f, tween(600), label = "glow")
|
||||||
|
val wide = windowWidth() >= WideLayoutWidth
|
||||||
Column(
|
val side = sidePadding(windowWidth(), if (wide) MaxWideContentWidth else MaxContentWidth)
|
||||||
modifier = modifier
|
// A tall screen gets a taller chart instead of empty space under the content
|
||||||
.verticalScroll(rememberScrollState())
|
val chartHeight = if (wide) {
|
||||||
.drawBehind {
|
(windowHeight() - 420.dp).coerceIn(160.dp, 360.dp)
|
||||||
// Soft light behind the logo while protected
|
} else {
|
||||||
if (glow > 0f) {
|
(windowHeight() - 700.dp).coerceIn(150.dp, 320.dp)
|
||||||
drawCircle(
|
|
||||||
brush = Brush.radialGradient(
|
|
||||||
colors = listOf(Palette.Accent.copy(alpha = 0.22f * glow), Color.Transparent),
|
|
||||||
center = Offset(size.width / 2f, 0f),
|
|
||||||
radius = size.width * 0.65f,
|
|
||||||
),
|
|
||||||
radius = size.width * 0.65f,
|
|
||||||
center = Offset(size.width / 2f, 0f),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.padding(top = 16.dp, bottom = bottomPadding),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(20.dp),
|
|
||||||
) {
|
|
||||||
Image(
|
|
||||||
painterResource(R.drawable.app_logo),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(44.dp)
|
|
||||||
.align(Alignment.CenterHorizontally),
|
|
||||||
)
|
|
||||||
|
|
||||||
AnimatedVisibility(visible = crashVisible, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
|
||||||
val report = crashReport.orEmpty()
|
|
||||||
Box(Modifier.padding(horizontal = 20.dp)) {
|
|
||||||
CrashCard(
|
|
||||||
report = report,
|
|
||||||
onCopy = {
|
|
||||||
context.getSystemService(ClipboardManager::class.java)
|
|
||||||
.setPrimaryClip(ClipData.newPlainText("SparkleDNS crash", report))
|
|
||||||
},
|
|
||||||
onDismiss = { CrashLog.clear(context); crashVisible = false },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val status: @Composable () -> Unit = {
|
||||||
StatusCard(
|
StatusCard(
|
||||||
running = running,
|
running = running,
|
||||||
providerName = shown.displayName(context),
|
providerName = shown.displayName(context),
|
||||||
http3 = usesHttp3,
|
http3 = usesHttp3,
|
||||||
enabled = !busy && (running || canConnect),
|
enabled = !busy && (running || canConnect),
|
||||||
onToggle = ::toggle,
|
onToggle = ::toggle,
|
||||||
modifier = Modifier.padding(horizontal = 20.dp),
|
onOpenServers = onOpenServers,
|
||||||
)
|
)
|
||||||
|
PrivateDnsWarning(privateDnsHost, prefs)
|
||||||
PrivateDnsWarning(privateDnsHost, prefs, Modifier.padding(horizontal = 20.dp))
|
}
|
||||||
|
val stats: @Composable () -> Unit = {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(horizontal = 24.dp),
|
.padding(horizontal = 4.dp),
|
||||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
) {
|
) {
|
||||||
StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f))
|
StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f))
|
||||||
@@ -228,64 +241,79 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie
|
|||||||
)
|
)
|
||||||
StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f))
|
StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f))
|
||||||
}
|
}
|
||||||
|
|
||||||
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(horizontal = 20.dp),
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.End),
|
|
||||||
) {
|
|
||||||
LegendItem(stringResource(R.string.stat_requests), Palette.Accent)
|
|
||||||
LegendItem(stringResource(R.string.mon_blocked), Palette.Muted)
|
|
||||||
}
|
}
|
||||||
TrafficChart(
|
val chart: @Composable () -> Unit = {
|
||||||
points,
|
ChartSection(chartData, period, chartHeight, onPeriod = { period = it })
|
||||||
Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.height(150.dp),
|
|
||||||
)
|
|
||||||
val startLabel = remember(points) {
|
|
||||||
val start = System.currentTimeMillis() - (CHART_HOURS - 1) * 3_600_000L
|
|
||||||
SimpleDateFormat("HH:00", Locale.getDefault()).format(Date(start))
|
|
||||||
}
|
}
|
||||||
Row(
|
val blocklist: @Composable () -> Unit = {
|
||||||
modifier = Modifier
|
BlocklistCard(
|
||||||
.fillMaxWidth()
|
info = stringResource(R.string.home_lists_info, lists.count { it.enabled }, formatCount(total.toLong())),
|
||||||
.padding(horizontal = 20.dp),
|
offer = offer,
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
downloading = download == HAGEZI_PRO_URL,
|
||||||
) {
|
error = if (offer == BlocklistOffer.FIRST_LIST) downloadError else null,
|
||||||
Text(startLabel, color = Palette.Fg3, fontSize = 11.sp, modifier = Modifier.weight(1f))
|
canAccept = download == null,
|
||||||
Text(
|
onAccept = ::acceptOffer,
|
||||||
stringResource(R.string.period_24h),
|
|
||||||
color = Palette.Fg2,
|
|
||||||
fontSize = 12.sp,
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
modifier = Modifier
|
|
||||||
.clip(RoundedCornerShape(16.dp))
|
|
||||||
.background(Palette.Card)
|
|
||||||
.padding(horizontal = 12.dp, vertical = 6.dp),
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
stringResource(R.string.chart_now),
|
|
||||||
color = Palette.Fg3,
|
|
||||||
fontSize = 11.sp,
|
|
||||||
textAlign = TextAlign.End,
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BlocklistRow(
|
|
||||||
info = if (blocking) {
|
|
||||||
stringResource(R.string.home_lists_info, lists.count { it.enabled }, formatCount(total.toLong()))
|
|
||||||
} else {
|
|
||||||
stringResource(R.string.blocking_off)
|
|
||||||
},
|
|
||||||
onClick = onOpenBlocklist,
|
onClick = onOpenBlocklist,
|
||||||
modifier = Modifier.padding(horizontal = 20.dp),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Column(
|
||||||
|
modifier = modifier
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
|
.drawWithCache {
|
||||||
|
// Soft light behind the logo while protected. The gradient depends on the size only;
|
||||||
|
// the fade is applied as alpha when drawing.
|
||||||
|
val center = Offset(size.width / 2f, 0f)
|
||||||
|
val radius = size.width * 0.65f
|
||||||
|
val light = Brush.radialGradient(
|
||||||
|
colors = listOf(Palette.Accent.copy(alpha = 0.22f), Color.Transparent),
|
||||||
|
center = center,
|
||||||
|
radius = radius,
|
||||||
|
)
|
||||||
|
onDrawBehind {
|
||||||
|
if (glow > 0f) drawCircle(brush = light, radius = radius, center = center, alpha = glow)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(start = side, end = side, top = 16.dp, bottom = bottomPadding),
|
||||||
|
verticalArrangement = Arrangement.spacedBy(20.dp),
|
||||||
|
) {
|
||||||
|
Image(
|
||||||
|
remember { AppLogo.get(context) },
|
||||||
|
contentDescription = null,
|
||||||
|
modifier = Modifier
|
||||||
|
.size(44.dp)
|
||||||
|
.align(Alignment.CenterHorizontally),
|
||||||
|
)
|
||||||
|
|
||||||
|
AnimatedVisibility(visible = crashReport != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
|
||||||
|
CrashCard(
|
||||||
|
report = shownReport,
|
||||||
|
onCopy = {
|
||||||
|
context.getSystemService(ClipboardManager::class.java)
|
||||||
|
.setPrimaryClip(ClipData.newPlainText("SparkleDNS crash", shownReport))
|
||||||
|
},
|
||||||
|
onDismiss = { CrashLog.clear(context) },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wide) {
|
||||||
|
Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) {
|
||||||
|
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(20.dp)) {
|
||||||
|
status()
|
||||||
|
blocklist()
|
||||||
|
}
|
||||||
|
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(20.dp)) {
|
||||||
|
stats()
|
||||||
|
chart()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
status()
|
||||||
|
stats()
|
||||||
|
chart()
|
||||||
|
blocklist()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
@@ -295,15 +323,15 @@ private fun StatusCard(
|
|||||||
http3: Boolean,
|
http3: Boolean,
|
||||||
enabled: Boolean,
|
enabled: Boolean,
|
||||||
onToggle: () -> Unit,
|
onToggle: () -> Unit,
|
||||||
modifier: Modifier = Modifier,
|
onOpenServers: () -> Unit,
|
||||||
) {
|
) {
|
||||||
Column(
|
Column(
|
||||||
modifier = modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.appCard()
|
.appCard()
|
||||||
.padding(horizontal = 20.dp, vertical = 24.dp),
|
.padding(horizontal = 20.dp, vertical = 24.dp),
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
verticalArrangement = Arrangement.spacedBy(6.dp),
|
||||||
) {
|
) {
|
||||||
AnimatedContent(
|
AnimatedContent(
|
||||||
targetState = running,
|
targetState = running,
|
||||||
@@ -319,13 +347,21 @@ private fun StatusCard(
|
|||||||
textAlign = TextAlign.Center,
|
textAlign = TextAlign.Center,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
// Tapping the server opens the server list in Settings
|
||||||
val dot by animateColorAsState(if (running) Palette.Accent else Palette.Track, Motion.color, label = "dot")
|
val dot by animateColorAsState(if (running) Palette.Accent else Palette.Track, Motion.color, label = "dot")
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(
|
||||||
|
modifier = Modifier
|
||||||
|
.clip(RoundedCornerShape(12.dp))
|
||||||
|
.clickable(onClickLabel = stringResource(R.string.change_server), onClick = onOpenServers)
|
||||||
|
.heightIn(min = 40.dp)
|
||||||
|
.padding(start = 10.dp, end = 4.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
) {
|
||||||
Box(
|
Box(
|
||||||
Modifier
|
Modifier
|
||||||
.size(7.dp)
|
.size(7.dp)
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
.background(dot)
|
.drawBehind { drawRect(dot) }
|
||||||
)
|
)
|
||||||
Spacer(Modifier.width(8.dp))
|
Spacer(Modifier.width(8.dp))
|
||||||
val via = stringResource(R.string.home_via, providerName) + if (http3) " · HTTP/3" else ""
|
val via = stringResource(R.string.home_via, providerName) + if (http3) " · HTTP/3" else ""
|
||||||
@@ -336,14 +372,18 @@ private fun StatusCard(
|
|||||||
maxLines = 2,
|
maxLines = 2,
|
||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
textAlign = TextAlign.Center,
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.weight(1f, fill = false),
|
||||||
)
|
)
|
||||||
|
Spacer(Modifier.width(2.dp))
|
||||||
|
Chevron(Modifier.size(16.dp))
|
||||||
}
|
}
|
||||||
Spacer(Modifier.height(10.dp))
|
Spacer(Modifier.height(8.dp))
|
||||||
PowerToggle(on = running, enabled = enabled, onToggle = onToggle)
|
PowerToggle(on = running, enabled = enabled, onToggle = onToggle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The big ON / OFF switch; the white knob slides across
|
// The big ON / OFF switch; the white knob slides across. The animated color and position are
|
||||||
|
// read only when drawing and placing, so the animation does not recompose the switch every frame.
|
||||||
@Composable
|
@Composable
|
||||||
private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
|
private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
|
||||||
val track by animateColorAsState(if (on) Palette.Accent else Palette.Track, Motion.color, label = "track")
|
val track by animateColorAsState(if (on) Palette.Accent else Palette.Track, Motion.color, label = "track")
|
||||||
@@ -354,7 +394,7 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
|
|||||||
.size(width = 120.dp, height = 50.dp)
|
.size(width = 120.dp, height = 50.dp)
|
||||||
.graphicsLayer { alpha = if (enabled) 1f else 0.5f }
|
.graphicsLayer { alpha = if (enabled) 1f else 0.5f }
|
||||||
.clip(RoundedCornerShape(25.dp))
|
.clip(RoundedCornerShape(25.dp))
|
||||||
.background(track)
|
.drawBehind { drawRect(track) }
|
||||||
.toggleable(value = on, enabled = enabled, role = Role.Switch, onValueChange = { onToggle() })
|
.toggleable(value = on, enabled = enabled, role = Role.Switch, onValueChange = { onToggle() })
|
||||||
.semantics { contentDescription = description }
|
.semantics { contentDescription = description }
|
||||||
.padding(5.dp),
|
.padding(5.dp),
|
||||||
@@ -371,7 +411,7 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
|
|||||||
)
|
)
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.offset(x = knob)
|
.offset { IntOffset(knob.roundToPx(), 0) }
|
||||||
.size(40.dp)
|
.size(40.dp)
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
.background(Color.White),
|
.background(Color.White),
|
||||||
@@ -379,7 +419,7 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
|
|||||||
) {
|
) {
|
||||||
Canvas(Modifier.size(14.dp)) {
|
Canvas(Modifier.size(14.dp)) {
|
||||||
val stroke = 1.6.dp.toPx()
|
val stroke = 1.6.dp.toPx()
|
||||||
listOf(0.29f, 0.5f, 0.71f).forEach { fraction ->
|
KnobLines.forEach { fraction ->
|
||||||
drawLine(
|
drawLine(
|
||||||
color = Palette.Fg3,
|
color = Palette.Fg3,
|
||||||
start = Offset(size.width * fraction, size.height * 0.21f),
|
start = Offset(size.width * fraction, size.height * 0.21f),
|
||||||
@@ -394,27 +434,25 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun PrivateDnsWarning(privateDnsHost: String?, prefs: Prefs, modifier: Modifier = Modifier) {
|
private fun PrivateDnsWarning(privateDnsHost: String?, prefs: Prefs) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val lastHost = remember { arrayOf("") }
|
val shownHost = rememberLast(privateDnsHost).orEmpty()
|
||||||
privateDnsHost?.let { lastHost[0] = it }
|
|
||||||
var dismissedHost by remember { mutableStateOf(prefs.dismissedPrivateDns) }
|
var dismissedHost by remember { mutableStateOf(prefs.dismissedPrivateDns) }
|
||||||
AnimatedVisibility(
|
AnimatedVisibility(
|
||||||
visible = privateDnsHost != null && privateDnsHost != dismissedHost,
|
visible = privateDnsHost != null && privateDnsHost != dismissedHost,
|
||||||
enter = Motion.expandIn,
|
enter = Motion.expandIn,
|
||||||
exit = Motion.collapseOut,
|
exit = Motion.collapseOut,
|
||||||
modifier = modifier,
|
|
||||||
) {
|
) {
|
||||||
HintCard(
|
HintCard(
|
||||||
text = stringResource(R.string.hint, lastHost[0]),
|
text = stringResource(R.string.hint, shownHost),
|
||||||
icon = R.drawable.ic_alert,
|
icon = R.drawable.ic_alert,
|
||||||
tint = WarningColor,
|
tint = WarningColor,
|
||||||
action = {
|
action = {
|
||||||
TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) }
|
TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) }
|
||||||
},
|
},
|
||||||
onDismiss = {
|
onDismiss = {
|
||||||
dismissedHost = lastHost[0]
|
dismissedHost = shownHost
|
||||||
prefs.dismissedPrivateDns = lastHost[0]
|
prefs.dismissedPrivateDns = shownHost
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -428,12 +466,62 @@ fun StatBlock(value: String, label: String, modifier: Modifier = Modifier, value
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun ChartSection(chart: Chart, period: StatsPeriod, height: Dp, onPeriod: (StatsPeriod) -> Unit) {
|
||||||
|
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
|
PeriodChip(period, onPeriod)
|
||||||
|
Spacer(Modifier.weight(1f))
|
||||||
|
LegendItem(stringResource(R.string.stat_requests), Palette.Accent)
|
||||||
|
Spacer(Modifier.width(14.dp))
|
||||||
|
LegendItem(stringResource(R.string.mon_blocked), Palette.Blocked)
|
||||||
|
}
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(height),
|
||||||
|
contentAlignment = Alignment.Center,
|
||||||
|
) {
|
||||||
|
if (chart.bars.all { it.total == 0L }) {
|
||||||
|
Text(
|
||||||
|
stringResource(R.string.chart_empty),
|
||||||
|
color = Palette.Fg3,
|
||||||
|
fontSize = 13.sp,
|
||||||
|
lineHeight = 18.sp,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.padding(horizontal = 24.dp),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
TrafficChart(chart.bars, Modifier.fillMaxWidth().height(height))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Hours: first hour on the left, now on the right. Days: a label under every bar.
|
||||||
|
Row(Modifier.fillMaxWidth()) {
|
||||||
|
if (chart.period == StatsPeriod.DAY) {
|
||||||
|
Text(chart.labels.firstOrNull().orEmpty(), color = Palette.Fg3, fontSize = 11.sp, modifier = Modifier.weight(1f))
|
||||||
|
Text(stringResource(R.string.chart_now), color = Palette.Fg3, fontSize = 11.sp)
|
||||||
|
} else {
|
||||||
|
chart.labels.forEachIndexed { index, label ->
|
||||||
|
Text(
|
||||||
|
label,
|
||||||
|
color = if (index == chart.labels.lastIndex) Palette.Fg else Palette.Fg3,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
maxLines = 1,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun LegendItem(label: String, color: Color) {
|
private fun LegendItem(label: String, color: Color) {
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
Box(
|
Box(
|
||||||
Modifier
|
Modifier
|
||||||
.size(width = 12.dp, height = 3.dp)
|
.size(8.dp)
|
||||||
.clip(RoundedCornerShape(2.dp))
|
.clip(RoundedCornerShape(2.dp))
|
||||||
.background(color)
|
.background(color)
|
||||||
)
|
)
|
||||||
@@ -442,76 +530,89 @@ private fun LegendItem(label: String, color: Color) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Requests (accent line with a soft fill) and blocked queries (grey line) per hour
|
// One bar per hour or day: requests in the accent color with the blocked part at the bottom.
|
||||||
|
// Empty slots show a short stub, so a mostly empty day reads as empty instead of broken.
|
||||||
@Composable
|
@Composable
|
||||||
private fun TrafficChart(points: List<HourPoint>, modifier: Modifier = Modifier) {
|
private fun TrafficChart(bars: List<Bar>, modifier: Modifier = Modifier) {
|
||||||
val measurer = rememberTextMeasurer()
|
val measurer = rememberTextMeasurer()
|
||||||
val labelStyle = TextStyle(color = Palette.Fg3, fontSize = 10.sp)
|
// Scale, grid and grid labels are worked out when the bars or the size change, not every frame
|
||||||
Canvas(modifier) {
|
Spacer(
|
||||||
val n = points.size
|
modifier.drawWithCache {
|
||||||
if (n < 2) return@Canvas
|
val n = bars.size
|
||||||
val maxValue = niceCeiling(points.maxOf { it.total }.coerceAtLeast(1L))
|
if (n == 0) return@drawWithCache onDrawBehind {}
|
||||||
val inset = 6.dp.toPx()
|
val maxValue = niceCeiling(bars.maxOf { it.total }.coerceAtLeast(1L))
|
||||||
val top = 14.dp.toPx()
|
val top = 16.dp.toPx()
|
||||||
val base = size.height - 8.dp.toPx()
|
val base = size.height - 2.dp.toPx()
|
||||||
val span = base - top
|
val span = base - top
|
||||||
val step = (size.width - 2 * inset) / (n - 1)
|
val slot = size.width / n
|
||||||
fun x(index: Int) = inset + index * step
|
val barWidth = (slot * if (n > 10) 0.62f else 0.5f).coerceAtLeast(2.dp.toPx())
|
||||||
fun y(value: Long) = base - value.toFloat() / maxValue * span
|
val radius = CornerRadius((barWidth / 2).coerceAtMost(4.dp.toPx()))
|
||||||
|
val stub = 2.dp.toPx()
|
||||||
|
val minBar = 4.dp.toPx()
|
||||||
|
val minBlocked = 2.dp.toPx()
|
||||||
|
val gridWidth = 1.dp.toPx()
|
||||||
|
val dash = PathEffect.dashPathEffect(floatArrayOf(3.dp.toPx(), 4.dp.toPx()))
|
||||||
|
fun height(value: Long) = value.toFloat() / maxValue * span
|
||||||
|
|
||||||
listOf(maxValue / 2, maxValue).forEach { value ->
|
val grid = listOf(maxValue / 2, maxValue).filter { it > 0 }.map { value ->
|
||||||
val gridY = y(value)
|
val y = base - height(value)
|
||||||
|
val labelTop = y - 14.dp.toPx()
|
||||||
|
// The same constraints drawText() would use for a label at this spot
|
||||||
|
val label = measurer.measure(
|
||||||
|
text = formatCompact(value),
|
||||||
|
style = ChartLabelStyle,
|
||||||
|
constraints = Constraints(
|
||||||
|
maxWidth = ceil(size.width).roundToInt().coerceAtLeast(0),
|
||||||
|
maxHeight = ceil(size.height - labelTop).roundToInt().coerceAtLeast(0),
|
||||||
|
),
|
||||||
|
layoutDirection = layoutDirection,
|
||||||
|
density = this,
|
||||||
|
)
|
||||||
|
GridLine(y, labelTop, label)
|
||||||
|
}
|
||||||
|
|
||||||
|
onDrawBehind {
|
||||||
|
grid.forEach { line ->
|
||||||
drawLine(
|
drawLine(
|
||||||
color = Palette.Line,
|
color = Palette.Line,
|
||||||
start = Offset(0f, gridY),
|
start = Offset(0f, line.y),
|
||||||
end = Offset(size.width, gridY),
|
end = Offset(size.width, line.y),
|
||||||
strokeWidth = 1.dp.toPx(),
|
strokeWidth = gridWidth,
|
||||||
pathEffect = PathEffect.dashPathEffect(floatArrayOf(3.dp.toPx(), 4.dp.toPx())),
|
pathEffect = dash,
|
||||||
)
|
|
||||||
drawText(
|
|
||||||
textMeasurer = measurer,
|
|
||||||
text = formatCompact(value),
|
|
||||||
topLeft = Offset(20.dp.toPx(), gridY - 15.dp.toPx()),
|
|
||||||
style = labelStyle,
|
|
||||||
)
|
)
|
||||||
|
drawText(line.label, topLeft = Offset(0f, line.labelTop))
|
||||||
}
|
}
|
||||||
|
|
||||||
val line = Path()
|
bars.forEachIndexed { index, bar ->
|
||||||
val area = Path()
|
val x = index * slot + (slot - barWidth) / 2
|
||||||
val blocked = Path()
|
if (bar.total == 0L) {
|
||||||
points.forEachIndexed { index, point ->
|
drawRoundRect(Palette.Line, Offset(x, base - stub), Size(barWidth, stub), CornerRadius(stub / 2))
|
||||||
val px = x(index)
|
return@forEachIndexed
|
||||||
if (index == 0) {
|
}
|
||||||
line.moveTo(px, y(point.total))
|
val current = index == n - 1
|
||||||
area.moveTo(px, base)
|
val h = height(bar.total).coerceAtLeast(minBar)
|
||||||
area.lineTo(px, y(point.total))
|
drawRoundRect(
|
||||||
blocked.moveTo(px, y(point.blocked))
|
if (current) Palette.Accent else Palette.Accent.copy(alpha = 0.6f),
|
||||||
|
Offset(x, base - h),
|
||||||
|
Size(barWidth, h),
|
||||||
|
radius,
|
||||||
|
)
|
||||||
|
if (bar.blocked > 0) {
|
||||||
|
val hb = height(bar.blocked).coerceIn(minBlocked, h)
|
||||||
|
if (hb >= h - radius.x) {
|
||||||
|
drawRoundRect(Palette.Blocked, Offset(x, base - hb), Size(barWidth, hb), radius)
|
||||||
} else {
|
} else {
|
||||||
line.lineTo(px, y(point.total))
|
drawRect(Palette.Blocked, Offset(x, base - hb), Size(barWidth, hb))
|
||||||
area.lineTo(px, y(point.total))
|
}
|
||||||
blocked.lineTo(px, y(point.blocked))
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
area.lineTo(x(n - 1), base)
|
|
||||||
area.close()
|
|
||||||
|
|
||||||
drawPath(area, Palette.Accent.copy(alpha = 0.14f))
|
|
||||||
drawPath(
|
|
||||||
blocked,
|
|
||||||
Palette.Muted,
|
|
||||||
style = Stroke(width = 1.6.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round),
|
|
||||||
)
|
)
|
||||||
drawPath(
|
|
||||||
line,
|
|
||||||
Palette.Accent,
|
|
||||||
style = Stroke(width = 2.4.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round),
|
|
||||||
)
|
|
||||||
val end = Offset(x(n - 1), y(points.last().total))
|
|
||||||
drawCircle(Palette.Bg, radius = 5.dp.toPx(), center = end)
|
|
||||||
drawCircle(Palette.Accent, radius = 5.dp.toPx(), center = end, style = Stroke(width = 2.4.dp.toPx()))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class GridLine(val y: Float, val labelTop: Float, val label: TextLayoutResult)
|
||||||
|
|
||||||
// 1, 2 or 5 times a power of ten, at least [value]: keeps the grid labels round
|
// 1, 2 or 5 times a power of ten, at least [value]: keeps the grid labels round
|
||||||
private fun niceCeiling(value: Long): Long {
|
private fun niceCeiling(value: Long): Long {
|
||||||
var magnitude = 1L
|
var magnitude = 1L
|
||||||
@@ -522,35 +623,127 @@ private fun niceCeiling(value: Long): Long {
|
|||||||
return 10 * magnitude
|
return 10 * magnitude
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Date formats of the chart for the current locale and time zone. The chart is refreshed up to
|
||||||
|
// once a second, so they are kept rather than built anew each time. Main thread only.
|
||||||
|
private class ChartFormats(val locale: Locale, val zone: String) {
|
||||||
|
val hour = SimpleDateFormat("HH:00", locale)
|
||||||
|
val day = SimpleDateFormat("EEE", locale)
|
||||||
|
}
|
||||||
|
|
||||||
|
private var chartFormats: ChartFormats? = null
|
||||||
|
|
||||||
|
private fun chartFormats(): ChartFormats {
|
||||||
|
val locale = Locale.getDefault()
|
||||||
|
val zone = TimeZone.getDefault().id
|
||||||
|
return chartFormats?.takeIf { it.locale == locale && it.zone == zone }
|
||||||
|
?: ChartFormats(locale, zone).also { chartFormats = it }
|
||||||
|
}
|
||||||
|
|
||||||
|
// 24 hourly bars, or 7 bars for the calendar days of the last week (today last)
|
||||||
|
private fun buildChart(period: StatsPeriod, now: Long = System.currentTimeMillis()): Chart {
|
||||||
|
val hours = StatsStore.hourly(period.hours, now)
|
||||||
|
val firstHour = now / HOUR_MS - (hours.size - 1)
|
||||||
|
val formats = chartFormats()
|
||||||
|
if (period == StatsPeriod.DAY) {
|
||||||
|
// Only the first hour gets a label; the other end of the axis says "now"
|
||||||
|
val label = formats.hour.format(Date(firstHour * HOUR_MS))
|
||||||
|
return Chart(period, hours.map { Bar(it.total, it.blocked) }, listOf(label))
|
||||||
|
}
|
||||||
|
val calendar = Calendar.getInstance()
|
||||||
|
fun dayKey(time: Long): Int {
|
||||||
|
calendar.timeInMillis = time
|
||||||
|
return calendar.get(Calendar.YEAR) * 1000 + calendar.get(Calendar.DAY_OF_YEAR)
|
||||||
|
}
|
||||||
|
val dayStarts = (6 downTo 0).map { back ->
|
||||||
|
calendar.timeInMillis = now
|
||||||
|
calendar.add(Calendar.DAY_OF_YEAR, -back)
|
||||||
|
calendar.timeInMillis
|
||||||
|
}
|
||||||
|
val keys = dayStarts.map { dayKey(it) }
|
||||||
|
val totals = LongArray(7)
|
||||||
|
val blocked = LongArray(7)
|
||||||
|
hours.forEachIndexed { index, point ->
|
||||||
|
val day = keys.indexOf(dayKey((firstHour + index) * HOUR_MS))
|
||||||
|
if (day >= 0) {
|
||||||
|
totals[day] += point.total
|
||||||
|
blocked[day] += point.blocked
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Chart(period, List(7) { Bar(totals[it], blocked[it]) }, dayStarts.map { formats.day.format(Date(it)) })
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum class BlocklistOffer { NONE, SWITCH_ON, FIRST_LIST }
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun BlocklistRow(info: String, onClick: () -> Unit, modifier: Modifier = Modifier) {
|
private fun BlocklistCard(
|
||||||
|
info: String,
|
||||||
|
offer: BlocklistOffer,
|
||||||
|
downloading: Boolean,
|
||||||
|
error: String?,
|
||||||
|
canAccept: Boolean,
|
||||||
|
onAccept: () -> Unit,
|
||||||
|
onClick: () -> Unit,
|
||||||
|
) {
|
||||||
|
val subtitle = when {
|
||||||
|
error != null -> stringResource(R.string.bl_download_failed, error)
|
||||||
|
offer == BlocklistOffer.SWITCH_ON -> stringResource(R.string.blocklist_cta_master)
|
||||||
|
offer == BlocklistOffer.FIRST_LIST -> stringResource(R.string.blocklist_cta_lists)
|
||||||
|
else -> info
|
||||||
|
}
|
||||||
Row(
|
Row(
|
||||||
modifier = modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.appCard()
|
.appCard()
|
||||||
.clickable(onClick = onClick)
|
.clickable(onClick = onClick)
|
||||||
.padding(16.dp),
|
.padding(16.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
|
val idle = offer != BlocklistOffer.NONE
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(40.dp)
|
.size(40.dp)
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
.background(Palette.Accent),
|
.background(if (idle) Palette.Track else Palette.Accent),
|
||||||
contentAlignment = Alignment.Center,
|
contentAlignment = Alignment.Center,
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
painterResource(R.drawable.ic_privacy),
|
painterResource(R.drawable.ic_privacy),
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
tint = Palette.AccentInk,
|
tint = if (idle) Palette.Fg2 else Palette.AccentInk,
|
||||||
modifier = Modifier.size(22.dp),
|
modifier = Modifier.size(22.dp),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Spacer(Modifier.width(14.dp))
|
Spacer(Modifier.width(14.dp))
|
||||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
||||||
Text(stringResource(R.string.blocklist_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
|
Text(stringResource(R.string.blocklist_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
|
||||||
Text(info, color = Palette.Fg2, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
|
Text(
|
||||||
|
subtitle,
|
||||||
|
color = if (error != null) Palette.Blocked else Palette.Fg2,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
lineHeight = 16.sp,
|
||||||
|
maxLines = 3,
|
||||||
|
overflow = TextOverflow.Ellipsis,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
Spacer(Modifier.width(10.dp))
|
||||||
|
if (offer == BlocklistOffer.NONE) {
|
||||||
Chevron()
|
Chevron()
|
||||||
|
} else {
|
||||||
|
Button(
|
||||||
|
onClick = onAccept,
|
||||||
|
enabled = canAccept && !downloading,
|
||||||
|
shape = RoundedCornerShape(14.dp),
|
||||||
|
contentPadding = PaddingValues(horizontal = 14.dp),
|
||||||
|
modifier = Modifier.heightIn(min = 40.dp),
|
||||||
|
) {
|
||||||
|
if (downloading) {
|
||||||
|
CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp, color = Palette.Fg2)
|
||||||
|
Spacer(Modifier.width(8.dp))
|
||||||
|
Text(stringResource(R.string.downloading), fontSize = 13.sp, maxLines = 1)
|
||||||
|
} else {
|
||||||
|
Text(stringResource(R.string.turn_on), fontWeight = FontWeight.Bold, fontSize = 13.sp, maxLines = 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TextButton
|
import androidx.compose.material3.TextButton
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
|
import androidx.compose.runtime.MutableState
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.saveable.Saver
|
import androidx.compose.runtime.saveable.Saver
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -38,6 +42,7 @@ import androidx.compose.ui.text.font.FontFamily
|
|||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import kotlinx.coroutines.channels.awaitClose
|
import kotlinx.coroutines.channels.awaitClose
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.coroutines.flow.callbackFlow
|
import kotlinx.coroutines.flow.callbackFlow
|
||||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
@@ -46,6 +51,7 @@ import kotlinx.coroutines.flow.flowOf
|
|||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
AppLogo.preload(this)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
setContent {
|
setContent {
|
||||||
MaterialTheme(colorScheme = AppColors) { AppShell() }
|
MaterialTheme(colorScheme = AppColors) { AppShell() }
|
||||||
@@ -56,7 +62,22 @@ class MainActivity : ComponentActivity() {
|
|||||||
internal class TestResult(val ok: Boolean, val text: String)
|
internal class TestResult(val ok: Boolean, val text: String)
|
||||||
|
|
||||||
// How long a tap on Connect, Disconnect or Switch blocks further taps if the VPN state never changes
|
// How long a tap on Connect, Disconnect or Switch blocks further taps if the VPN state never changes
|
||||||
internal const val BUSY_TIMEOUT_MS = 5000L
|
private const val BUSY_TIMEOUT_MS = 5000L
|
||||||
|
|
||||||
|
// Set by a tap until the VPN state changes or the attempt gives up, so a double tap neither
|
||||||
|
// starts two connections nor switches the VPN back on right after turning it off
|
||||||
|
@Composable
|
||||||
|
internal fun rememberVpnBusy(active: DohProvider?): MutableState<Boolean> {
|
||||||
|
val busy = remember { mutableStateOf(false) }
|
||||||
|
LaunchedEffect(active) { busy.value = false }
|
||||||
|
LaunchedEffect(busy.value) {
|
||||||
|
if (busy.value) {
|
||||||
|
delay(BUSY_TIMEOUT_MS)
|
||||||
|
busy.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return busy
|
||||||
|
}
|
||||||
|
|
||||||
// Keeps test results across rotation and process death
|
// Keeps test results across rotation and process death
|
||||||
internal val TestResultSaver = Saver<TestResult?, String>(
|
internal val TestResultSaver = Saver<TestResult?, String>(
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package cc.skysparkle.sparkledns
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
import androidx.compose.animation.SizeTransform
|
|
||||||
import androidx.compose.animation.core.CubicBezierEasing
|
import androidx.compose.animation.core.CubicBezierEasing
|
||||||
import androidx.compose.animation.core.FiniteAnimationSpec
|
import androidx.compose.animation.core.FiniteAnimationSpec
|
||||||
import androidx.compose.animation.core.tween
|
import androidx.compose.animation.core.tween
|
||||||
@@ -25,6 +24,4 @@ object Motion {
|
|||||||
|
|
||||||
val expandIn = fadeIn(enterFade) + expandVertically(size)
|
val expandIn = fadeIn(enterFade) + expandVertically(size)
|
||||||
val collapseOut = fadeOut(exitFade) + shrinkVertically(size)
|
val collapseOut = fadeOut(exitFade) + shrinkVertically(size)
|
||||||
|
|
||||||
fun sizeTransform() = SizeTransform(clip = false) { _, _ -> size }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,9 +3,10 @@ package cc.skysparkle.sparkledns
|
|||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
// IPv4 addresses are kept as plain numbers, so parsing a query allocates only its payload
|
||||||
class UdpPacket(
|
class UdpPacket(
|
||||||
val srcIp: ByteArray,
|
val srcIp: Int,
|
||||||
val dstIp: ByteArray,
|
val dstIp: Int,
|
||||||
val srcPort: Int,
|
val srcPort: Int,
|
||||||
val dstPort: Int,
|
val dstPort: Int,
|
||||||
val payload: ByteArray,
|
val payload: ByteArray,
|
||||||
@@ -29,8 +30,8 @@ object Packet {
|
|||||||
if (end <= ihl + 8) return null
|
if (end <= ihl + 8) return null
|
||||||
|
|
||||||
return UdpPacket(
|
return UdpPacket(
|
||||||
srcIp = buf.copyOfRange(12, 16),
|
srcIp = i32(buf, 12),
|
||||||
dstIp = buf.copyOfRange(16, 20),
|
dstIp = i32(buf, 16),
|
||||||
srcPort = u16(buf, ihl),
|
srcPort = u16(buf, ihl),
|
||||||
dstPort = dstPort,
|
dstPort = dstPort,
|
||||||
payload = buf.copyOfRange(ihl + 8, end),
|
payload = buf.copyOfRange(ihl + 8, end),
|
||||||
@@ -47,8 +48,8 @@ object Packet {
|
|||||||
p[6] = 0x40 // don't fragment
|
p[6] = 0x40 // don't fragment
|
||||||
p[8] = 64
|
p[8] = 64
|
||||||
p[9] = 17
|
p[9] = 17
|
||||||
query.dstIp.copyInto(p, 12)
|
put32(p, 12, query.dstIp)
|
||||||
query.srcIp.copyInto(p, 16)
|
put32(p, 16, query.srcIp)
|
||||||
put16(p, 10, checksum(p, 0, 20, 0))
|
put16(p, 10, checksum(p, 0, 20, 0))
|
||||||
|
|
||||||
put16(p, 20, query.dstPort)
|
put16(p, 20, query.dstPort)
|
||||||
@@ -123,7 +124,9 @@ object DnsMessage {
|
|||||||
|
|
||||||
fun question(msg: ByteArray): Question? {
|
fun question(msg: ByteArray): Question? {
|
||||||
if (msg.size < 12 || u16(msg, 4) < 1) return null
|
if (msg.size < 12 || u16(msg, 4) < 1) return null
|
||||||
val name = StringBuilder()
|
// Sized up front, so the builder does not grow: a valid name has at most 253 characters,
|
||||||
|
// and never more than the message has bytes after the header
|
||||||
|
val name = StringBuilder(minOf(msg.size - 12, 253))
|
||||||
var p = 12
|
var p = 12
|
||||||
while (true) {
|
while (true) {
|
||||||
if (p >= msg.size) return null
|
if (p >= msg.size) return null
|
||||||
@@ -180,6 +183,8 @@ internal fun put32(b: ByteArray, off: Int, value: Int) {
|
|||||||
internal fun u32(b: ByteArray, off: Int): Long =
|
internal fun u32(b: ByteArray, off: Int): Long =
|
||||||
((u16(b, off).toLong()) shl 16) or u16(b, off + 2).toLong()
|
((u16(b, off).toLong()) shl 16) or u16(b, off + 2).toLong()
|
||||||
|
|
||||||
|
internal fun i32(b: ByteArray, off: Int): Int = (u16(b, off) shl 16) or u16(b, off + 2)
|
||||||
|
|
||||||
// Returns the offset right after a (possibly compressed) DNS name
|
// Returns the offset right after a (possibly compressed) DNS name
|
||||||
internal fun skipName(b: ByteArray, start: Int): Int? {
|
internal fun skipName(b: ByteArray, start: Int): Int? {
|
||||||
var p = start
|
var p = start
|
||||||
|
|||||||
@@ -45,12 +45,10 @@ object Providers {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
val list: List<DohProvider> get() = builtIn
|
|
||||||
|
|
||||||
// The project's own server stays the default whatever order the list uses
|
// The project's own server stays the default whatever order the list uses
|
||||||
val default: DohProvider get() = list.firstOrNull { it.id == DEFAULT_ID } ?: list.first()
|
val default: DohProvider = builtIn.firstOrNull { it.id == DEFAULT_ID } ?: builtIn.first()
|
||||||
|
|
||||||
fun byId(id: String): DohProvider = list.firstOrNull { it.id == id } ?: default
|
fun byId(id: String): DohProvider = builtIn.firstOrNull { it.id == id } ?: default
|
||||||
}
|
}
|
||||||
|
|
||||||
fun parseIps(raw: String): List<String> =
|
fun parseIps(raw: String): List<String> =
|
||||||
|
|||||||
@@ -16,14 +16,6 @@ class QueryEntry(
|
|||||||
val latencyMs: Int,
|
val latencyMs: Int,
|
||||||
)
|
)
|
||||||
|
|
||||||
data class QueryStats(
|
|
||||||
val total: Long,
|
|
||||||
val cached: Long,
|
|
||||||
val blocked: Long,
|
|
||||||
val failed: Long,
|
|
||||||
val avgLatencyMs: Int,
|
|
||||||
)
|
|
||||||
|
|
||||||
// In-memory only: nothing is written to disk or sent anywhere. StatsStore keeps hourly
|
// In-memory only: nothing is written to disk or sent anywhere. StatsStore keeps hourly
|
||||||
// numbers without domains for the charts.
|
// numbers without domains for the charts.
|
||||||
object QueryLog {
|
object QueryLog {
|
||||||
@@ -31,14 +23,12 @@ object QueryLog {
|
|||||||
|
|
||||||
private val entries = ArrayDeque<QueryEntry>()
|
private val entries = ArrayDeque<QueryEntry>()
|
||||||
private var nextId = 0L
|
private var nextId = 0L
|
||||||
private var total = 0L
|
|
||||||
private var cached = 0L
|
|
||||||
private var blocked = 0L
|
|
||||||
private var failed = 0L
|
|
||||||
private var latencySum = 0L
|
|
||||||
private var latencyCount = 0L
|
|
||||||
private val version = MutableStateFlow(0L)
|
private val version = MutableStateFlow(0L)
|
||||||
|
|
||||||
|
// The last snapshot, handed out again while the log has not changed
|
||||||
|
private var lastSnapshot: List<QueryEntry> = emptyList()
|
||||||
|
private var snapshotVersion = 0L
|
||||||
|
|
||||||
// Fires right away, then at most once a second while queries keep coming: a busy log refreshes
|
// Fires right away, then at most once a second while queries keep coming: a busy log refreshes
|
||||||
// the screen no more often than the old one-second polling did, and an idle one not at all
|
// the screen no more often than the old one-second polling did, and an idle one not at all
|
||||||
fun changes(): Flow<Long> = version.transform {
|
fun changes(): Flow<Long> = version.transform {
|
||||||
@@ -48,42 +38,32 @@ object QueryLog {
|
|||||||
|
|
||||||
fun add(question: DnsMessage.Question?, status: QueryStatus, latencyMs: Int) {
|
fun add(question: DnsMessage.Question?, status: QueryStatus, latencyMs: Int) {
|
||||||
if (question == null) return
|
if (question == null) return
|
||||||
|
val time = System.currentTimeMillis()
|
||||||
synchronized(this) {
|
synchronized(this) {
|
||||||
if (entries.size >= MAX_ENTRIES) entries.removeFirst()
|
if (entries.size >= MAX_ENTRIES) entries.removeFirst()
|
||||||
entries.addLast(
|
entries.addLast(QueryEntry(nextId++, time, question.name.ifEmpty { "." }, question.type, status, latencyMs))
|
||||||
QueryEntry(nextId++, System.currentTimeMillis(), question.name.ifEmpty { "." }, question.type, status, latencyMs)
|
|
||||||
)
|
|
||||||
total++
|
|
||||||
when (status) {
|
|
||||||
QueryStatus.OK -> { latencySum += latencyMs; latencyCount++ }
|
|
||||||
QueryStatus.CACHED -> cached++
|
|
||||||
QueryStatus.BLOCKED -> blocked++
|
|
||||||
QueryStatus.FAILED -> failed++
|
|
||||||
}
|
|
||||||
version.value++
|
version.value++
|
||||||
}
|
}
|
||||||
// Hourly numbers for the charts; outside the lock above, as it takes a lock of its own
|
// Hourly numbers for the charts; outside the lock above, as it takes a lock of its own
|
||||||
StatsStore.record(status, latencyMs, Companies.of(question.name))
|
StatsStore.record(status, latencyMs, Companies.of(question.name), time)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Newest first. Builds a real copy: on API 35+ List.reversed() resolves to a live JDK view,
|
// Newest first. Builds a real copy: on API 35+ List.reversed() resolves to a live JDK view,
|
||||||
// and on older devices that method does not exist at all
|
// and on older devices that method does not exist at all. While the log does not change the
|
||||||
|
// same list comes back, so a screen refreshed with it has nothing to update.
|
||||||
@Synchronized
|
@Synchronized
|
||||||
fun snapshot(): List<QueryEntry> = List(entries.size) { entries[entries.size - 1 - it] }
|
fun snapshot(): List<QueryEntry> {
|
||||||
|
val current = version.value
|
||||||
@Synchronized
|
if (snapshotVersion != current) {
|
||||||
fun stats() = QueryStats(
|
lastSnapshot = List(entries.size) { entries[entries.size - 1 - it] }
|
||||||
total = total,
|
snapshotVersion = current
|
||||||
cached = cached,
|
}
|
||||||
blocked = blocked,
|
return lastSnapshot
|
||||||
failed = failed,
|
}
|
||||||
avgLatencyMs = if (latencyCount == 0L) 0 else (latencySum / latencyCount).toInt(),
|
|
||||||
)
|
|
||||||
|
|
||||||
@Synchronized
|
@Synchronized
|
||||||
fun clear() {
|
fun clear() {
|
||||||
entries.clear()
|
entries.clear()
|
||||||
total = 0; cached = 0; blocked = 0; failed = 0; latencySum = 0; latencyCount = 0
|
|
||||||
version.value++
|
version.value++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package cc.skysparkle.sparkledns
|
|||||||
import androidx.annotation.DrawableRes
|
import androidx.annotation.DrawableRes
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
import androidx.compose.animation.animateColorAsState
|
import androidx.compose.animation.animateColorAsState
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -28,7 +27,6 @@ import androidx.compose.material3.OutlinedButton
|
|||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
@@ -37,6 +35,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.drawBehind
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
@@ -51,7 +50,6 @@ import androidx.compose.ui.unit.dp
|
|||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.delay
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
||||||
@@ -66,6 +64,7 @@ fun SettingsScreen(
|
|||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val prefs = remember { Prefs(context) }
|
val prefs = remember { Prefs(context) }
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
|
val side = sidePadding(windowWidth())
|
||||||
val active by DohVpnService.active.collectAsStateWithLifecycle()
|
val active by DohVpnService.active.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
var selected by remember { mutableStateOf(prefs.providerId) }
|
var selected by remember { mutableStateOf(prefs.providerId) }
|
||||||
@@ -84,14 +83,7 @@ fun SettingsScreen(
|
|||||||
|
|
||||||
// Picking a server never touches a live connection; switching is an explicit action
|
// Picking a server never touches a live connection; switching is an explicit action
|
||||||
val pendingSwitch = active?.let { it != selectedProvider && canConnect } == true
|
val pendingSwitch = active?.let { it != selectedProvider && canConnect } == true
|
||||||
var busy by remember { mutableStateOf(false) }
|
var busy by rememberVpnBusy(active)
|
||||||
LaunchedEffect(active) { busy = false }
|
|
||||||
LaunchedEffect(busy) {
|
|
||||||
if (busy) {
|
|
||||||
delay(BUSY_TIMEOUT_MS)
|
|
||||||
busy = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun select(id: String) {
|
fun select(id: String) {
|
||||||
selected = id
|
selected = id
|
||||||
@@ -114,14 +106,14 @@ fun SettingsScreen(
|
|||||||
Column(
|
Column(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.verticalScroll(rememberScrollState())
|
.verticalScroll(rememberScrollState())
|
||||||
.padding(start = 20.dp, end = 20.dp, top = 16.dp, bottom = bottomPadding),
|
.padding(start = side, end = side, top = 16.dp, bottom = bottomPadding),
|
||||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
verticalArrangement = Arrangement.spacedBy(10.dp),
|
||||||
) {
|
) {
|
||||||
ScreenTitle(stringResource(R.string.tab_settings), Modifier.heightIn(min = 44.dp))
|
ScreenTitle(stringResource(R.string.tab_settings), Modifier.heightIn(min = 44.dp))
|
||||||
|
|
||||||
SectionLabel(stringResource(R.string.servers), Modifier.padding(top = 8.dp))
|
SectionLabel(stringResource(R.string.servers), Modifier.padding(top = 8.dp))
|
||||||
Column(Modifier.fillMaxWidth().appCard()) {
|
Column(Modifier.fillMaxWidth().appCard()) {
|
||||||
Providers.list.forEachIndexed { index, provider ->
|
Providers.builtIn.forEachIndexed { index, provider ->
|
||||||
if (index > 0) ListDivider()
|
if (index > 0) ListDivider()
|
||||||
ServerRow(
|
ServerRow(
|
||||||
title = provider.name,
|
title = provider.name,
|
||||||
@@ -202,9 +194,8 @@ fun SettingsScreen(
|
|||||||
Text(stringResource(if (testing) R.string.testing else R.string.test), maxLines = 1)
|
Text(stringResource(if (testing) R.string.testing else R.string.test), maxLines = 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remembers the last name so the button keeps its label while it animates out
|
// The button keeps its label while it animates out
|
||||||
val lastSwitch = remember { arrayOf("") }
|
val switchName = rememberLast(if (pendingSwitch) selectedProvider.displayName(context) else null).orEmpty()
|
||||||
if (pendingSwitch) lastSwitch[0] = selectedProvider.displayName(context)
|
|
||||||
AnimatedVisibility(visible = pendingSwitch, modifier = Modifier.weight(1f)) {
|
AnimatedVisibility(visible = pendingSwitch, modifier = Modifier.weight(1f)) {
|
||||||
Button(
|
Button(
|
||||||
onClick = {
|
onClick = {
|
||||||
@@ -222,7 +213,7 @@ fun SettingsScreen(
|
|||||||
Icon(painterResource(R.drawable.ic_swap), contentDescription = null, modifier = Modifier.size(18.dp))
|
Icon(painterResource(R.drawable.ic_swap), contentDescription = null, modifier = Modifier.size(18.dp))
|
||||||
Spacer(Modifier.width(8.dp))
|
Spacer(Modifier.width(8.dp))
|
||||||
Text(
|
Text(
|
||||||
stringResource(R.string.switch_to, lastSwitch[0]),
|
stringResource(R.string.switch_to, switchName),
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
)
|
)
|
||||||
@@ -278,7 +269,8 @@ private fun ServerRow(
|
|||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.background(highlight)
|
// Read when drawing, so the fade does not recompose the row every frame
|
||||||
|
.drawBehind { drawRect(highlight) }
|
||||||
.selectable(selected = selected, onClick = onClick, role = Role.RadioButton)
|
.selectable(selected = selected, onClick = onClick, role = Role.RadioButton)
|
||||||
.heightIn(min = 60.dp)
|
.heightIn(min = 60.dp)
|
||||||
.padding(start = 16.dp, end = 8.dp, top = 8.dp, bottom = 8.dp),
|
.padding(start = 16.dp, end = 8.dp, top = 8.dp, bottom = 8.dp),
|
||||||
@@ -295,26 +287,8 @@ private fun ServerRow(
|
|||||||
)
|
)
|
||||||
Text(subtitle, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
|
Text(subtitle, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
|
||||||
}
|
}
|
||||||
if (onDonate != null) {
|
if (onDonate != null) LinkButton(R.drawable.ic_donate, stringResource(R.string.donate), onDonate)
|
||||||
IconButton(onClick = onDonate, modifier = Modifier.size(40.dp)) {
|
if (onPolicy != null) LinkButton(R.drawable.ic_policy, stringResource(R.string.about_privacy_policy), onPolicy)
|
||||||
Icon(
|
|
||||||
painterResource(R.drawable.ic_donate),
|
|
||||||
contentDescription = stringResource(R.string.donate),
|
|
||||||
tint = Palette.Fg3,
|
|
||||||
modifier = Modifier.size(18.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (onPolicy != null) {
|
|
||||||
IconButton(onClick = onPolicy, modifier = Modifier.size(40.dp)) {
|
|
||||||
Icon(
|
|
||||||
painterResource(R.drawable.ic_policy),
|
|
||||||
contentDescription = stringResource(R.string.about_privacy_policy),
|
|
||||||
tint = Palette.Fg3,
|
|
||||||
modifier = Modifier.size(18.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Spacer(Modifier.width(4.dp))
|
Spacer(Modifier.width(4.dp))
|
||||||
if (selected) {
|
if (selected) {
|
||||||
Icon(
|
Icon(
|
||||||
@@ -330,6 +304,14 @@ private fun ServerRow(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Small button next to a server that opens one of its pages
|
||||||
|
@Composable
|
||||||
|
private fun LinkButton(@DrawableRes icon: Int, description: String, onClick: () -> Unit) {
|
||||||
|
IconButton(onClick = onClick, modifier = Modifier.size(40.dp)) {
|
||||||
|
Icon(painterResource(icon), contentDescription = description, tint = Palette.Fg3, modifier = Modifier.size(18.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun NavRow(@DrawableRes icon: Int, title: String, subtitle: String, onClick: () -> Unit) {
|
private fun NavRow(@DrawableRes icon: Int, title: String, subtitle: String, onClick: () -> Unit) {
|
||||||
Row(
|
Row(
|
||||||
|
|||||||
@@ -4,12 +4,11 @@ import android.content.Context
|
|||||||
import android.util.Log
|
import android.util.Log
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
import java.io.BufferedInputStream
|
import java.io.ByteArrayInputStream
|
||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
import java.io.DataInputStream
|
import java.io.DataInputStream
|
||||||
import java.io.DataOutputStream
|
import java.io.DataOutputStream
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileInputStream
|
|
||||||
import java.util.concurrent.Executors
|
import java.util.concurrent.Executors
|
||||||
|
|
||||||
class StatsSummary(
|
class StatsSummary(
|
||||||
@@ -26,47 +25,123 @@ class HourPoint(val total: Long, val blocked: Long)
|
|||||||
// Hourly counters of the last 7 days for the charts. Only numbers are kept, never domains,
|
// Hourly counters of the last 7 days for the charts. Only numbers are kept, never domains,
|
||||||
// and they never leave the device.
|
// and they never leave the device.
|
||||||
object StatsStore {
|
object StatsStore {
|
||||||
private const val HOURS = 24 * 7
|
|
||||||
private const val HOUR_MS = 3_600_000L
|
private const val HOUR_MS = 3_600_000L
|
||||||
private const val FORMAT = 1
|
|
||||||
private const val FILE = "stats.bin"
|
private const val FILE = "stats.bin"
|
||||||
private const val SAVE_INTERVAL_MS = 60_000L
|
private const val SAVE_INTERVAL_MS = 60_000L
|
||||||
|
|
||||||
// Per hour: total, blocked, cached, latency sum and count, then one counter per company
|
private val counters = HourlyCounters()
|
||||||
private const val TOTAL = 0
|
|
||||||
private const val BLOCKED = 1
|
|
||||||
private const val CACHED = 2
|
|
||||||
private const val LATENCY_SUM = 3
|
|
||||||
private const val LATENCY_COUNT = 4
|
|
||||||
private const val FIRST_COMPANY = 5
|
|
||||||
private val FIELDS = FIRST_COMPANY + Company.entries.size
|
|
||||||
|
|
||||||
// A ring of slots; each remembers which hour (since the epoch) it currently holds
|
|
||||||
private val hourIds = LongArray(HOURS) { -1L }
|
|
||||||
private val counters = Array(HOURS) { LongArray(FIELDS) }
|
|
||||||
private var file: File? = null
|
private var file: File? = null
|
||||||
|
|
||||||
// Bumped when the numbers change without a new query: loaded from disk or cleared
|
// Bumped when the numbers change without a new query: loaded from disk
|
||||||
private val _version = MutableStateFlow(0)
|
private val _version = MutableStateFlow(0)
|
||||||
val version: StateFlow<Int> = _version
|
val version: StateFlow<Int> = _version
|
||||||
private var lastSave = 0L
|
private var lastSave = 0L
|
||||||
private var dirty = false
|
private var dirty = false
|
||||||
|
|
||||||
|
// Counts every change, so summary() can hand out its last result while nothing changed
|
||||||
|
private var changes = 0L
|
||||||
|
private var lastSummary: StatsSummary? = null
|
||||||
|
private var summaryChanges = 0L
|
||||||
|
private var summaryHours = 0
|
||||||
|
private var summaryHour = 0L
|
||||||
|
|
||||||
// Saves happen off the VPN threads, one at a time
|
// Saves happen off the VPN threads, one at a time
|
||||||
private val writer = Executors.newSingleThreadExecutor { Thread(it, "stats-writer").apply { isDaemon = true } }
|
private val writer = Executors.newSingleThreadExecutor { Thread(it, "stats-writer").apply { isDaemon = true } }
|
||||||
|
|
||||||
|
// The file is read outside the lock, so neither the DNS threads nor the screens wait for
|
||||||
|
// storage. Queries counted before it was read are added to the saved numbers.
|
||||||
fun init(context: Context) {
|
fun init(context: Context) {
|
||||||
val target = File(context.filesDir, FILE)
|
val target = File(context.filesDir, FILE)
|
||||||
|
val saved = read(target)
|
||||||
synchronized(this) {
|
synchronized(this) {
|
||||||
file = target
|
file = target
|
||||||
load(target)
|
if (saved != null) counters.merge(saved)
|
||||||
|
changes++
|
||||||
}
|
}
|
||||||
_version.value++
|
_version.value++
|
||||||
}
|
}
|
||||||
|
|
||||||
fun record(status: QueryStatus, latencyMs: Int, company: Company?, now: Long = System.currentTimeMillis()) {
|
fun record(status: QueryStatus, latencyMs: Int, company: Company?, now: Long = System.currentTimeMillis()) {
|
||||||
val snapshot = synchronized(this) {
|
val save = synchronized(this) {
|
||||||
val row = row(now / HOUR_MS)
|
counters.record(status, latencyMs, company, now / HOUR_MS)
|
||||||
|
changes++
|
||||||
|
dirty = true
|
||||||
|
if (file != null && now - lastSave >= SAVE_INTERVAL_MS) {
|
||||||
|
lastSave = now
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// The writer thread encodes the numbers itself, so this DNS thread only hands the job over
|
||||||
|
if (save) writer.execute(::save)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Totals of the last [hours] hours, the current one included. While nothing changed the same
|
||||||
|
// object comes back, so a screen refreshed with it has nothing to recompose.
|
||||||
|
fun summary(hours: Int, now: Long = System.currentTimeMillis()): StatsSummary = synchronized(this) {
|
||||||
|
val current = now / HOUR_MS
|
||||||
|
lastSummary?.takeIf { summaryChanges == changes && summaryHours == hours && summaryHour == current }
|
||||||
|
?: counters.summary(hours, current).also {
|
||||||
|
lastSummary = it
|
||||||
|
summaryChanges = changes
|
||||||
|
summaryHours = hours
|
||||||
|
summaryHour = current
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One point per hour, oldest first, ending with the current hour
|
||||||
|
fun hourly(hours: Int, now: Long = System.currentTimeMillis()): List<HourPoint> =
|
||||||
|
synchronized(this) { counters.hourly(hours, now / HOUR_MS) }
|
||||||
|
|
||||||
|
// Saves what is not on disk yet; called when the VPN stops
|
||||||
|
fun flush() {
|
||||||
|
val save = synchronized(this) {
|
||||||
|
if (file != null && dirty) {
|
||||||
|
lastSave = System.currentTimeMillis()
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (save) writer.execute(::save)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Runs on the writer thread
|
||||||
|
private fun save() {
|
||||||
|
val (target, bytes) = synchronized(this) {
|
||||||
|
val current = file ?: return
|
||||||
|
dirty = false
|
||||||
|
current to counters.encode()
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
val tmp = File(target.parentFile, "$FILE.tmp")
|
||||||
|
tmp.writeBytes(bytes)
|
||||||
|
if (!tmp.renameTo(target)) tmp.delete()
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w("SparkleDNS", "Cannot save statistics", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun read(source: File): HourlyCounters? {
|
||||||
|
if (!source.exists()) return null
|
||||||
|
return try {
|
||||||
|
HourlyCounters.decode(source.readBytes())
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w("SparkleDNS", "Cannot read statistics", e)
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The numbers behind StatsStore: a ring of hourly rows, each remembering which hour (since the
|
||||||
|
// epoch) it holds. Plain data without locks or Android; StatsStore takes care of both.
|
||||||
|
internal class HourlyCounters {
|
||||||
|
val hourIds = LongArray(HOURS) { -1L }
|
||||||
|
val rows = Array(HOURS) { LongArray(FIELDS) }
|
||||||
|
|
||||||
|
fun record(status: QueryStatus, latencyMs: Int, company: Company?, hour: Long) {
|
||||||
|
val row = row(hour)
|
||||||
row[TOTAL]++
|
row[TOTAL]++
|
||||||
when (status) {
|
when (status) {
|
||||||
QueryStatus.BLOCKED -> row[BLOCKED]++
|
QueryStatus.BLOCKED -> row[BLOCKED]++
|
||||||
@@ -78,30 +153,19 @@ object StatsStore {
|
|||||||
QueryStatus.FAILED -> Unit
|
QueryStatus.FAILED -> Unit
|
||||||
}
|
}
|
||||||
if (company != null) row[FIRST_COMPANY + company.ordinal]++
|
if (company != null) row[FIRST_COMPANY + company.ordinal]++
|
||||||
dirty = true
|
|
||||||
if (file != null && now - lastSave >= SAVE_INTERVAL_MS) {
|
|
||||||
lastSave = now
|
|
||||||
dirty = false
|
|
||||||
encode()
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
snapshot?.let(::save)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Totals of the last [hours] hours, the current one included
|
// Totals of the last [hours] hours up to [currentHour]
|
||||||
fun summary(hours: Int, now: Long = System.currentTimeMillis()): StatsSummary = synchronized(this) {
|
fun summary(hours: Int, currentHour: Long): StatsSummary {
|
||||||
val current = now / HOUR_MS
|
|
||||||
val sums = LongArray(FIELDS)
|
val sums = LongArray(FIELDS)
|
||||||
for (back in 0 until hours.coerceIn(1, HOURS)) {
|
for (back in 0 until hours.coerceIn(1, HOURS)) {
|
||||||
val id = current - back
|
val id = currentHour - back
|
||||||
val index = slot(id)
|
val index = slot(id)
|
||||||
if (hourIds[index] != id) continue
|
if (hourIds[index] != id) continue
|
||||||
val row = counters[index]
|
val row = rows[index]
|
||||||
for (field in 0 until FIELDS) sums[field] += row[field]
|
for (field in 0 until FIELDS) sums[field] += row[field]
|
||||||
}
|
}
|
||||||
StatsSummary(
|
return StatsSummary(
|
||||||
total = sums[TOTAL],
|
total = sums[TOTAL],
|
||||||
blocked = sums[BLOCKED],
|
blocked = sums[BLOCKED],
|
||||||
cached = sums[CACHED],
|
cached = sums[CACHED],
|
||||||
@@ -110,41 +174,43 @@ object StatsStore {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// One point per hour, oldest first, ending with the current hour
|
// One point per hour, oldest first, ending with [currentHour]
|
||||||
fun hourly(hours: Int, now: Long = System.currentTimeMillis()): List<HourPoint> = synchronized(this) {
|
fun hourly(hours: Int, currentHour: Long): List<HourPoint> {
|
||||||
val count = hours.coerceIn(1, HOURS)
|
val count = hours.coerceIn(1, HOURS)
|
||||||
val current = now / HOUR_MS
|
return List(count) { position ->
|
||||||
List(count) { position ->
|
val id = currentHour - (count - 1 - position)
|
||||||
val id = current - (count - 1 - position)
|
|
||||||
val index = slot(id)
|
val index = slot(id)
|
||||||
if (hourIds[index] == id) HourPoint(counters[index][TOTAL], counters[index][BLOCKED]) else HourPoint(0, 0)
|
if (hourIds[index] == id) HourPoint(rows[index][TOTAL], rows[index][BLOCKED]) else HourPoint(0, 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun clear() {
|
// Saved hours are added to the ones counted since the start; a slot keeps the newer hour
|
||||||
val snapshot = synchronized(this) {
|
fun merge(saved: HourlyCounters) {
|
||||||
hourIds.fill(-1L)
|
for (index in 0 until HOURS) {
|
||||||
counters.forEach { it.fill(0L) }
|
val id = saved.hourIds[index]
|
||||||
dirty = false
|
when {
|
||||||
lastSave = System.currentTimeMillis()
|
id < 0 || id < hourIds[index] -> Unit
|
||||||
if (file != null) encode() else null
|
id == hourIds[index] -> for (field in 0 until FIELDS) rows[index][field] += saved.rows[index][field]
|
||||||
|
else -> {
|
||||||
|
hourIds[index] = id
|
||||||
|
saved.rows[index].copyInto(rows[index])
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
snapshot?.let(::save)
|
|
||||||
_version.value++
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Saves what is not on disk yet; called when the VPN stops
|
fun encode(): ByteArray {
|
||||||
fun flush() {
|
val bytes = ByteArrayOutputStream(12 + HOURS * (FIELDS + 1) * 8)
|
||||||
val snapshot = synchronized(this) {
|
DataOutputStream(bytes).use { out ->
|
||||||
if (file != null && dirty) {
|
out.writeInt(FORMAT)
|
||||||
dirty = false
|
out.writeInt(FIELDS)
|
||||||
lastSave = System.currentTimeMillis()
|
out.writeInt(HOURS)
|
||||||
encode()
|
for (index in 0 until HOURS) {
|
||||||
} else {
|
out.writeLong(hourIds[index])
|
||||||
null
|
rows[index].forEach { out.writeLong(it) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
snapshot?.let(::save)
|
return bytes.toByteArray()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun slot(id: Long): Int = (((id % HOURS) + HOURS) % HOURS).toInt()
|
private fun slot(id: Long): Int = (((id % HOURS) + HOURS) % HOURS).toInt()
|
||||||
@@ -153,58 +219,41 @@ object StatsStore {
|
|||||||
val index = slot(id)
|
val index = slot(id)
|
||||||
if (hourIds[index] != id) {
|
if (hourIds[index] != id) {
|
||||||
hourIds[index] = id
|
hourIds[index] = id
|
||||||
counters[index].fill(0L)
|
rows[index].fill(0L)
|
||||||
}
|
}
|
||||||
return counters[index]
|
return rows[index]
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun encode(): ByteArray {
|
companion object {
|
||||||
val bytes = ByteArrayOutputStream()
|
const val HOURS = 24 * 7
|
||||||
DataOutputStream(bytes).use { out ->
|
private const val FORMAT = 1
|
||||||
out.writeInt(FORMAT)
|
|
||||||
out.writeInt(FIELDS)
|
|
||||||
out.writeInt(HOURS)
|
|
||||||
for (index in 0 until HOURS) {
|
|
||||||
out.writeLong(hourIds[index])
|
|
||||||
counters[index].forEach { out.writeLong(it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bytes.toByteArray()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun save(bytes: ByteArray) {
|
// Per hour: total, blocked, cached, latency sum and count, then one counter per company
|
||||||
val target = file ?: return
|
private const val TOTAL = 0
|
||||||
writer.execute {
|
private const val BLOCKED = 1
|
||||||
try {
|
private const val CACHED = 2
|
||||||
val tmp = File(target.parentFile, "$FILE.tmp")
|
private const val LATENCY_SUM = 3
|
||||||
tmp.writeBytes(bytes)
|
private const val LATENCY_COUNT = 4
|
||||||
if (!tmp.renameTo(target)) tmp.delete()
|
const val FIRST_COMPANY = 5
|
||||||
} catch (e: Exception) {
|
val FIELDS = FIRST_COMPANY + Company.entries.size
|
||||||
Log.w("SparkleDNS", "Cannot save statistics", e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Files from a version with fewer companies load fine: the new counters start at zero
|
// Files from a version with fewer companies load fine: the new counters start at zero.
|
||||||
private fun load(source: File) {
|
// Null for a file of another format.
|
||||||
if (!source.exists()) return
|
fun decode(bytes: ByteArray): HourlyCounters? {
|
||||||
try {
|
DataInputStream(ByteArrayInputStream(bytes)).use { input ->
|
||||||
DataInputStream(BufferedInputStream(FileInputStream(source))).use { input ->
|
if (input.readInt() != FORMAT) return null
|
||||||
if (input.readInt() != FORMAT) return
|
|
||||||
val fields = input.readInt()
|
val fields = input.readInt()
|
||||||
if (input.readInt() != HOURS || fields < FIRST_COMPANY) return
|
if (input.readInt() != HOURS || fields < FIRST_COMPANY) return null
|
||||||
|
val result = HourlyCounters()
|
||||||
for (index in 0 until HOURS) {
|
for (index in 0 until HOURS) {
|
||||||
hourIds[index] = input.readLong()
|
result.hourIds[index] = input.readLong()
|
||||||
for (field in 0 until fields) {
|
for (field in 0 until fields) {
|
||||||
val value = input.readLong()
|
val value = input.readLong()
|
||||||
if (field < FIELDS) counters[index][field] = value
|
if (field < FIELDS) result.rows[index][field] = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return result
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
|
||||||
Log.w("SparkleDNS", "Cannot read statistics", e)
|
|
||||||
hourIds.fill(-1L)
|
|
||||||
counters.forEach { it.fill(0L) }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.BoxScope
|
|||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
@@ -14,6 +15,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
|
|||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.layout.widthIn
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.foundation.text.BasicTextField
|
import androidx.compose.foundation.text.BasicTextField
|
||||||
import androidx.compose.material3.HorizontalDivider
|
import androidx.compose.material3.HorizontalDivider
|
||||||
@@ -29,11 +31,13 @@ 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.graphics.SolidColor
|
import androidx.compose.ui.graphics.SolidColor
|
||||||
|
import androidx.compose.ui.platform.LocalConfiguration
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.TextStyle
|
import androidx.compose.ui.text.TextStyle
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
|
import androidx.compose.ui.unit.Dp
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
|
||||||
@@ -44,7 +48,6 @@ object Palette {
|
|||||||
val CardHigh = Color(0xFF1E2026)
|
val CardHigh = Color(0xFF1E2026)
|
||||||
val Line = Color(0xFF24262C)
|
val Line = Color(0xFF24262C)
|
||||||
val Track = Color(0xFF3A3C44)
|
val Track = Color(0xFF3A3C44)
|
||||||
val Muted = Color(0xFF5B5F6B)
|
|
||||||
val Fg = Color(0xFFF2F3F5)
|
val Fg = Color(0xFFF2F3F5)
|
||||||
val Fg2 = Color(0xFF9A9DA6)
|
val Fg2 = Color(0xFF9A9DA6)
|
||||||
val Fg3 = Color(0xFF7E828C)
|
val Fg3 = Color(0xFF7E828C)
|
||||||
@@ -86,6 +89,24 @@ internal val AppColors = darkColorScheme(
|
|||||||
|
|
||||||
val CardShape = RoundedCornerShape(20.dp)
|
val CardShape = RoundedCornerShape(20.dp)
|
||||||
|
|
||||||
|
// On tablets content stays this wide and sits in the middle, so rows do not stretch across the screen
|
||||||
|
val MaxContentWidth = 560.dp
|
||||||
|
|
||||||
|
// From this width Home and Activity show two columns side by side
|
||||||
|
val WideLayoutWidth = 840.dp
|
||||||
|
val MaxWideContentWidth = 1040.dp
|
||||||
|
|
||||||
|
// Size of the app window in dp
|
||||||
|
@Composable
|
||||||
|
fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun windowHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp
|
||||||
|
|
||||||
|
// Side padding that keeps content at most [max] wide and at least [min] away from the edges
|
||||||
|
fun sidePadding(available: Dp, max: Dp = MaxContentWidth, min: Dp = 20.dp): Dp =
|
||||||
|
maxOf(min, (available - max) / 2)
|
||||||
|
|
||||||
fun Modifier.appCard(): Modifier = clip(CardShape).background(Palette.Card)
|
fun Modifier.appCard(): Modifier = clip(CardShape).background(Palette.Card)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
@@ -105,7 +126,7 @@ fun AppSwitch(
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun appSwitchColors() = SwitchDefaults.colors(
|
private fun appSwitchColors() = SwitchDefaults.colors(
|
||||||
checkedThumbColor = Color.White,
|
checkedThumbColor = Color.White,
|
||||||
checkedTrackColor = Palette.Accent,
|
checkedTrackColor = Palette.Accent,
|
||||||
checkedBorderColor = Palette.Accent,
|
checkedBorderColor = Palette.Accent,
|
||||||
@@ -174,7 +195,13 @@ fun PageHeader(
|
|||||||
// A page with a back header around content that is not built for one
|
// A page with a back header around content that is not built for one
|
||||||
@Composable
|
@Composable
|
||||||
fun SubPage(title: String, onBack: () -> Unit, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) {
|
fun SubPage(title: String, onBack: () -> Unit, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) {
|
||||||
Column(modifier) {
|
Box(modifier, contentAlignment = Alignment.TopCenter) {
|
||||||
|
Column(
|
||||||
|
Modifier
|
||||||
|
.fillMaxHeight()
|
||||||
|
.widthIn(max = MaxContentWidth + 32.dp)
|
||||||
|
.fillMaxWidth()
|
||||||
|
) {
|
||||||
PageHeader(title, onBack)
|
PageHeader(title, onBack)
|
||||||
Box(
|
Box(
|
||||||
Modifier
|
Modifier
|
||||||
@@ -184,8 +211,11 @@ fun SubPage(title: String, onBack: () -> Unit, modifier: Modifier = Modifier, co
|
|||||||
content = content,
|
content = content,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val SearchTextStyle = TextStyle(color = Palette.Fg, fontSize = 14.sp)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun SearchField(
|
fun SearchField(
|
||||||
value: String,
|
value: String,
|
||||||
@@ -219,7 +249,7 @@ fun SearchField(
|
|||||||
onValueChange = onValueChange,
|
onValueChange = onValueChange,
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
singleLine = true,
|
singleLine = true,
|
||||||
textStyle = TextStyle(color = Palette.Fg, fontSize = 14.sp),
|
textStyle = SearchTextStyle,
|
||||||
cursorBrush = SolidColor(Palette.Accent),
|
cursorBrush = SolidColor(Palette.Accent),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package cc.skysparkle.sparkledns
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import androidx.annotation.DrawableRes
|
import androidx.annotation.DrawableRes
|
||||||
import androidx.compose.animation.AnimatedContent
|
import androidx.annotation.StringRes
|
||||||
import androidx.compose.animation.fadeIn
|
|
||||||
import androidx.compose.animation.fadeOut
|
|
||||||
import androidx.compose.animation.slideInVertically
|
|
||||||
import androidx.compose.animation.slideOutVertically
|
|
||||||
import androidx.compose.animation.togetherWith
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
@@ -29,21 +27,21 @@ import androidx.compose.material3.Text
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberUpdatedState
|
import androidx.compose.runtime.rememberUpdatedState
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
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.graphics.ImageBitmap
|
||||||
|
import androidx.compose.ui.res.imageResource
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
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.unit.Dp
|
import androidx.compose.ui.unit.Dp
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.lifecycle.Lifecycle
|
import androidx.lifecycle.Lifecycle
|
||||||
import androidx.lifecycle.compose.LocalLifecycleOwner
|
import androidx.lifecycle.compose.LocalLifecycleOwner
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
import androidx.lifecycle.repeatOnLifecycle
|
||||||
@@ -53,6 +51,28 @@ import java.util.Locale
|
|||||||
val CachedColor = Color(0xFF7FD1AE)
|
val CachedColor = Color(0xFF7FD1AE)
|
||||||
val WarningColor = Color(0xFFFFB86B)
|
val WarningColor = Color(0xFFFFB86B)
|
||||||
|
|
||||||
|
// The 512 px logo, decoded once while the screens are in use. Home shows it each time the tab
|
||||||
|
// opens, and decoding it there would cost the main thread a frame.
|
||||||
|
object AppLogo {
|
||||||
|
@Volatile
|
||||||
|
private var bitmap: ImageBitmap? = null
|
||||||
|
|
||||||
|
// Started with the activity, so the first frame of Home usually finds the logo decoded
|
||||||
|
fun preload(context: Context) {
|
||||||
|
if (bitmap != null) return
|
||||||
|
val appContext = context.applicationContext
|
||||||
|
Thread({ runCatching { get(appContext) } }, "logo-load").start()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Synchronized
|
||||||
|
fun get(context: Context): ImageBitmap =
|
||||||
|
bitmap ?: ImageBitmap.imageResource(context.resources, R.drawable.app_logo).also { bitmap = it }
|
||||||
|
|
||||||
|
fun clear() {
|
||||||
|
bitmap = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Icon on a soft circle of its own color
|
// Icon on a soft circle of its own color
|
||||||
@Composable
|
@Composable
|
||||||
fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.primary, size: Dp = 40.dp) {
|
fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.primary, size: Dp = 40.dp) {
|
||||||
@@ -67,52 +87,6 @@ fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.pr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SectionHeader(
|
|
||||||
title: String,
|
|
||||||
@DrawableRes icon: Int? = null,
|
|
||||||
modifier: Modifier = Modifier,
|
|
||||||
action: (@Composable () -> Unit)? = null,
|
|
||||||
) {
|
|
||||||
Row(
|
|
||||||
modifier = modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.heightIn(min = 40.dp)
|
|
||||||
.padding(top = 8.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
) {
|
|
||||||
if (icon != null) {
|
|
||||||
Icon(
|
|
||||||
painterResource(icon),
|
|
||||||
contentDescription = null,
|
|
||||||
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
modifier = Modifier.size(18.dp),
|
|
||||||
)
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
title,
|
|
||||||
style = MaterialTheme.typography.titleSmall,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
action?.invoke()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Pill(text: String, color: Color) {
|
|
||||||
Text(
|
|
||||||
text,
|
|
||||||
style = MaterialTheme.typography.labelMedium,
|
|
||||||
color = color,
|
|
||||||
modifier = Modifier
|
|
||||||
.clip(RoundedCornerShape(50))
|
|
||||||
.background(color.copy(alpha = 0.14f))
|
|
||||||
.padding(horizontal = 10.dp, vertical = 3.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HintCard(
|
fun HintCard(
|
||||||
text: String,
|
text: String,
|
||||||
@@ -161,39 +135,14 @@ fun HintCard(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
private class Last<T>(var value: T?)
|
||||||
fun StatColumn(value: String, label: String, modifier: Modifier = Modifier) {
|
|
||||||
Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) {
|
|
||||||
// Numbers roll up when they change
|
|
||||||
AnimatedContent(
|
|
||||||
targetState = value,
|
|
||||||
transitionSpec = {
|
|
||||||
(slideInVertically(Motion.slide) { it / 2 } + fadeIn(Motion.enterFade)) togetherWith
|
|
||||||
(slideOutVertically(Motion.slide) { -it / 2 } + fadeOut(Motion.exitFade)) using
|
|
||||||
Motion.sizeTransform()
|
|
||||||
},
|
|
||||||
label = "stat",
|
|
||||||
) { shown ->
|
|
||||||
Text(shown, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.SemiBold, maxLines = 1)
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
label,
|
|
||||||
style = MaterialTheme.typography.labelSmall,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
maxLines = 2,
|
|
||||||
overflow = TextOverflow.Ellipsis,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// The last non-null value, so a card can keep showing its text while it animates out
|
||||||
@Composable
|
@Composable
|
||||||
fun StatDivider() {
|
fun <T : Any> rememberLast(value: T?): T? {
|
||||||
Box(
|
val last = remember { Last<T>(null) }
|
||||||
Modifier
|
if (value != null) last.value = value
|
||||||
.size(width = 1.dp, height = 32.dp)
|
return last.value
|
||||||
.background(MaterialTheme.colorScheme.outlineVariant)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Runs [onChange] when the query log changes, at most once a second and only while the screen
|
// Runs [onChange] when the query log changes, at most once a second and only while the screen
|
||||||
@@ -209,13 +158,6 @@ fun OnQueryLogChange(onChange: () -> Unit) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun rememberLiveStats(): QueryStats {
|
|
||||||
var stats by remember { mutableStateOf(QueryLog.stats()) }
|
|
||||||
OnQueryLogChange { stats = QueryLog.stats() }
|
|
||||||
return stats
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called from composition only, i.e. on the main thread; rebuilt when the locale changes
|
// Called from composition only, i.e. on the main thread; rebuilt when the locale changes
|
||||||
private var countFormat: Pair<Locale, NumberFormat>? = null
|
private var countFormat: Pair<Locale, NumberFormat>? = null
|
||||||
|
|
||||||
@@ -226,9 +168,6 @@ fun formatCount(value: Long): String {
|
|||||||
return format.format(value)
|
return format.format(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun cachePercent(stats: QueryStats): String =
|
|
||||||
"${if (stats.total == 0L) 0 else stats.cached * 100 / stats.total}%"
|
|
||||||
|
|
||||||
// Rows of one visual group share a background; only the outer corners are rounded
|
// Rows of one visual group share a background; only the outer corners are rounded
|
||||||
fun groupedShape(first: Boolean, last: Boolean, radius: Dp = 16.dp) = RoundedCornerShape(
|
fun groupedShape(first: Boolean, last: Boolean, radius: Dp = 16.dp) = RoundedCornerShape(
|
||||||
topStart = if (first) radius else 0.dp,
|
topStart = if (first) radius else 0.dp,
|
||||||
@@ -270,3 +209,27 @@ fun EmptyState(icon: Int, text: String) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum class StatsPeriod(val hours: Int, @StringRes val label: Int) {
|
||||||
|
DAY(24, R.string.period_24h),
|
||||||
|
WEEK(24 * 7, R.string.period_7d),
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switches between the last 24 hours and the last 7 days
|
||||||
|
@Composable
|
||||||
|
fun PeriodChip(period: StatsPeriod, onChange: (StatsPeriod) -> Unit) {
|
||||||
|
val shape = RoundedCornerShape(18.dp)
|
||||||
|
Row(
|
||||||
|
modifier = Modifier
|
||||||
|
.clip(shape)
|
||||||
|
.border(1.dp, Palette.Track, shape)
|
||||||
|
.clickable { onChange(if (period == StatsPeriod.DAY) StatsPeriod.WEEK else StatsPeriod.DAY) }
|
||||||
|
.heightIn(min = 36.dp)
|
||||||
|
.padding(start = 14.dp, end = 10.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
) {
|
||||||
|
Text(stringResource(period.label), color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.width(4.dp))
|
||||||
|
Icon(painterResource(R.drawable.ic_expand), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(16.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -96,14 +96,12 @@
|
|||||||
<string name="period_24h">24 Stunden</string>
|
<string name="period_24h">24 Stunden</string>
|
||||||
<string name="period_7d">7 Tage</string>
|
<string name="period_7d">7 Tage</string>
|
||||||
<string name="home_lists_info">Aktive Listen: %1$d · Regeln: %2$s</string>
|
<string name="home_lists_info">Aktive Listen: %1$d · Regeln: %2$s</string>
|
||||||
<string name="blocking_off">Blockieren ist aus</string>
|
|
||||||
<string name="blocklist_title">DNS-Blocklisten</string>
|
<string name="blocklist_title">DNS-Blocklisten</string>
|
||||||
<string name="tab_activity">Aktivität</string>
|
<string name="tab_activity">Aktivität</string>
|
||||||
<string name="tab_settings">Einstellungen</string>
|
<string name="tab_settings">Einstellungen</string>
|
||||||
<string name="companies_title">Anteil der Konzerne</string>
|
<string name="companies_title">Anteil der Konzerne</string>
|
||||||
<string name="companies_desc">Welcher Anteil deiner Anfragen an die größten Konzerne geht.</string>
|
<string name="companies_desc">Welcher Anteil deiner Anfragen an die größten Konzerne geht.</string>
|
||||||
<string name="companies_other">Andere</string>
|
<string name="companies_other">Andere</string>
|
||||||
<string name="no_data">Noch keine Daten</string>
|
|
||||||
<string name="recent_title">Letzte Anfragen</string>
|
<string name="recent_title">Letzte Anfragen</string>
|
||||||
<string name="filter">Filter</string>
|
<string name="filter">Filter</string>
|
||||||
<string name="bl_search">Listen suchen</string>
|
<string name="bl_search">Listen suchen</string>
|
||||||
@@ -126,4 +124,11 @@
|
|||||||
<string name="settings_general">Allgemein</string>
|
<string name="settings_general">Allgemein</string>
|
||||||
<string name="settings_apps">Apps ohne SparkleDNS</string>
|
<string name="settings_apps">Apps ohne SparkleDNS</string>
|
||||||
<string name="settings_apps_desc">Ausgewählte Apps nutzen das normale DNS des Netzwerks</string>
|
<string name="settings_apps_desc">Ausgewählte Apps nutzen das normale DNS des Netzwerks</string>
|
||||||
|
<string name="chart_empty">Noch keine Daten. Nach dem Verbinden füllt sich das Diagramm Stunde für Stunde.</string>
|
||||||
|
<string name="companies_wait">Daten werden gesammelt: %1$d von %2$d Anfragen</string>
|
||||||
|
<string name="blocklist_cta_lists">Keine Liste ist aktiv. Schalte HaGeZi Pro ein, um Werbung und Tracker zu blockieren.</string>
|
||||||
|
<string name="blocklist_cta_master">Blockieren ist aus. Schalte es ein, um Werbung und Tracker zu filtern.</string>
|
||||||
|
<string name="turn_on">Einschalten</string>
|
||||||
|
<string name="downloading">Wird geladen…</string>
|
||||||
|
<string name="change_server">Server wechseln</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -96,14 +96,12 @@
|
|||||||
<string name="period_24h">24 時間</string>
|
<string name="period_24h">24 時間</string>
|
||||||
<string name="period_7d">7 日間</string>
|
<string name="period_7d">7 日間</string>
|
||||||
<string name="home_lists_info">有効なリスト: %1$d · ルール: %2$s</string>
|
<string name="home_lists_info">有効なリスト: %1$d · ルール: %2$s</string>
|
||||||
<string name="blocking_off">ブロックはオフです</string>
|
|
||||||
<string name="blocklist_title">DNS ブロックリスト</string>
|
<string name="blocklist_title">DNS ブロックリスト</string>
|
||||||
<string name="tab_activity">アクティビティ</string>
|
<string name="tab_activity">アクティビティ</string>
|
||||||
<string name="tab_settings">設定</string>
|
<string name="tab_settings">設定</string>
|
||||||
<string name="companies_title">企業の占有率</string>
|
<string name="companies_title">企業の占有率</string>
|
||||||
<string name="companies_desc">リクエストのうち大手企業に送られる割合です。</string>
|
<string name="companies_desc">リクエストのうち大手企業に送られる割合です。</string>
|
||||||
<string name="companies_other">その他</string>
|
<string name="companies_other">その他</string>
|
||||||
<string name="no_data">まだデータがありません</string>
|
|
||||||
<string name="recent_title">最近のアクティビティ</string>
|
<string name="recent_title">最近のアクティビティ</string>
|
||||||
<string name="filter">フィルター</string>
|
<string name="filter">フィルター</string>
|
||||||
<string name="bl_search">リストを検索</string>
|
<string name="bl_search">リストを検索</string>
|
||||||
@@ -126,4 +124,11 @@
|
|||||||
<string name="settings_general">一般</string>
|
<string name="settings_general">一般</string>
|
||||||
<string name="settings_apps">SparkleDNS を使わないアプリ</string>
|
<string name="settings_apps">SparkleDNS を使わないアプリ</string>
|
||||||
<string name="settings_apps_desc">選んだアプリはネットワークの通常の DNS を使います</string>
|
<string name="settings_apps_desc">選んだアプリはネットワークの通常の DNS を使います</string>
|
||||||
|
<string name="chart_empty">まだデータがありません。接続すると 1 時間ごとにグラフが埋まっていきます。</string>
|
||||||
|
<string name="companies_wait">データ収集中: %2$d 件中 %1$d 件</string>
|
||||||
|
<string name="blocklist_cta_lists">有効なリストがありません。HaGeZi Pro をオンにして広告とトラッカーをブロックしましょう。</string>
|
||||||
|
<string name="blocklist_cta_master">ブロックはオフです。オンにすると広告とトラッカーをフィルタリングします。</string>
|
||||||
|
<string name="turn_on">オンにする</string>
|
||||||
|
<string name="downloading">ダウンロード中…</string>
|
||||||
|
<string name="change_server">サーバーを変更</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -96,14 +96,12 @@
|
|||||||
<string name="period_24h">24 valandos</string>
|
<string name="period_24h">24 valandos</string>
|
||||||
<string name="period_7d">7 dienos</string>
|
<string name="period_7d">7 dienos</string>
|
||||||
<string name="home_lists_info">Įjungta sąrašų: %1$d · taisyklių: %2$s</string>
|
<string name="home_lists_info">Įjungta sąrašų: %1$d · taisyklių: %2$s</string>
|
||||||
<string name="blocking_off">Blokavimas išjungtas</string>
|
|
||||||
<string name="blocklist_title">DNS blokavimo sąrašai</string>
|
<string name="blocklist_title">DNS blokavimo sąrašai</string>
|
||||||
<string name="tab_activity">Veikla</string>
|
<string name="tab_activity">Veikla</string>
|
||||||
<string name="tab_settings">Nustatymai</string>
|
<string name="tab_settings">Nustatymai</string>
|
||||||
<string name="companies_title">Įmonių dalis</string>
|
<string name="companies_title">Įmonių dalis</string>
|
||||||
<string name="companies_desc">Kokia jūsų užklausų dalis tenka didžiausioms įmonėms.</string>
|
<string name="companies_desc">Kokia jūsų užklausų dalis tenka didžiausioms įmonėms.</string>
|
||||||
<string name="companies_other">Kitos</string>
|
<string name="companies_other">Kitos</string>
|
||||||
<string name="no_data">Duomenų dar nėra</string>
|
|
||||||
<string name="recent_title">Naujausios užklausos</string>
|
<string name="recent_title">Naujausios užklausos</string>
|
||||||
<string name="filter">Filtras</string>
|
<string name="filter">Filtras</string>
|
||||||
<string name="bl_search">Ieškoti sąrašų</string>
|
<string name="bl_search">Ieškoti sąrašų</string>
|
||||||
@@ -126,4 +124,11 @@
|
|||||||
<string name="settings_general">Bendrieji</string>
|
<string name="settings_general">Bendrieji</string>
|
||||||
<string name="settings_apps">Programėlės be SparkleDNS</string>
|
<string name="settings_apps">Programėlės be SparkleDNS</string>
|
||||||
<string name="settings_apps_desc">Pasirinktos programėlės naudoja įprastą tinklo DNS</string>
|
<string name="settings_apps_desc">Pasirinktos programėlės naudoja įprastą tinklo DNS</string>
|
||||||
|
<string name="chart_empty">Duomenų dar nėra. Prisijungus grafikas pildysis kas valandą.</string>
|
||||||
|
<string name="companies_wait">Renkami duomenys: %1$d iš %2$d užklausų</string>
|
||||||
|
<string name="blocklist_cta_lists">Neįjungtas nė vienas sąrašas. Įjunkite HaGeZi Pro, kad blokuotumėte reklamas ir sekiklius.</string>
|
||||||
|
<string name="blocklist_cta_master">Blokavimas išjungtas. Įjunkite jį, kad filtruotumėte reklamas ir sekiklius.</string>
|
||||||
|
<string name="turn_on">Įjungti</string>
|
||||||
|
<string name="downloading">Atsisiunčiama…</string>
|
||||||
|
<string name="change_server">Keisti serverį</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -96,14 +96,12 @@
|
|||||||
<string name="period_24h">24 часа</string>
|
<string name="period_24h">24 часа</string>
|
||||||
<string name="period_7d">7 дней</string>
|
<string name="period_7d">7 дней</string>
|
||||||
<string name="home_lists_info">Включено списков: %1$d · правил: %2$s</string>
|
<string name="home_lists_info">Включено списков: %1$d · правил: %2$s</string>
|
||||||
<string name="blocking_off">Блокировка выключена</string>
|
|
||||||
<string name="blocklist_title">Блок-листы DNS</string>
|
<string name="blocklist_title">Блок-листы DNS</string>
|
||||||
<string name="tab_activity">Активность</string>
|
<string name="tab_activity">Активность</string>
|
||||||
<string name="tab_settings">Настройки</string>
|
<string name="tab_settings">Настройки</string>
|
||||||
<string name="companies_title">Доля компаний</string>
|
<string name="companies_title">Доля компаний</string>
|
||||||
<string name="companies_desc">Какая часть ваших запросов уходит крупнейшим компаниям.</string>
|
<string name="companies_desc">Какая часть ваших запросов уходит крупнейшим компаниям.</string>
|
||||||
<string name="companies_other">Другие</string>
|
<string name="companies_other">Другие</string>
|
||||||
<string name="no_data">Данных пока нет</string>
|
|
||||||
<string name="recent_title">Последние запросы</string>
|
<string name="recent_title">Последние запросы</string>
|
||||||
<string name="filter">Фильтр</string>
|
<string name="filter">Фильтр</string>
|
||||||
<string name="bl_search">Поиск списков</string>
|
<string name="bl_search">Поиск списков</string>
|
||||||
@@ -126,4 +124,11 @@
|
|||||||
<string name="settings_general">Общие</string>
|
<string name="settings_general">Общие</string>
|
||||||
<string name="settings_apps">Приложения без SparkleDNS</string>
|
<string name="settings_apps">Приложения без SparkleDNS</string>
|
||||||
<string name="settings_apps_desc">Выбранные приложения используют обычный DNS сети</string>
|
<string name="settings_apps_desc">Выбранные приложения используют обычный DNS сети</string>
|
||||||
|
<string name="chart_empty">Данных пока нет. После подключения график будет заполняться по часам.</string>
|
||||||
|
<string name="companies_wait">Собираем данные: %1$d из %2$d запросов</string>
|
||||||
|
<string name="blocklist_cta_lists">Ни один список не включён. Включите HaGeZi Pro, чтобы блокировать рекламу и трекеры.</string>
|
||||||
|
<string name="blocklist_cta_master">Блокировка выключена. Включите её, чтобы фильтровать рекламу и трекеры.</string>
|
||||||
|
<string name="turn_on">Включить</string>
|
||||||
|
<string name="downloading">Загрузка…</string>
|
||||||
|
<string name="change_server">Сменить сервер</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -96,14 +96,12 @@
|
|||||||
<string name="period_24h">24 小时</string>
|
<string name="period_24h">24 小时</string>
|
||||||
<string name="period_7d">7 天</string>
|
<string name="period_7d">7 天</string>
|
||||||
<string name="home_lists_info">已启用列表:%1$d · 规则:%2$s</string>
|
<string name="home_lists_info">已启用列表:%1$d · 规则:%2$s</string>
|
||||||
<string name="blocking_off">屏蔽已关闭</string>
|
|
||||||
<string name="blocklist_title">DNS 屏蔽列表</string>
|
<string name="blocklist_title">DNS 屏蔽列表</string>
|
||||||
<string name="tab_activity">活动</string>
|
<string name="tab_activity">活动</string>
|
||||||
<string name="tab_settings">设置</string>
|
<string name="tab_settings">设置</string>
|
||||||
<string name="companies_title">公司占比</string>
|
<string name="companies_title">公司占比</string>
|
||||||
<string name="companies_desc">你的请求中发往大公司的比例。</string>
|
<string name="companies_desc">你的请求中发往大公司的比例。</string>
|
||||||
<string name="companies_other">其他</string>
|
<string name="companies_other">其他</string>
|
||||||
<string name="no_data">暂无数据</string>
|
|
||||||
<string name="recent_title">最近活动</string>
|
<string name="recent_title">最近活动</string>
|
||||||
<string name="filter">筛选</string>
|
<string name="filter">筛选</string>
|
||||||
<string name="bl_search">搜索列表</string>
|
<string name="bl_search">搜索列表</string>
|
||||||
@@ -126,4 +124,11 @@
|
|||||||
<string name="settings_general">通用</string>
|
<string name="settings_general">通用</string>
|
||||||
<string name="settings_apps">不使用 SparkleDNS 的应用</string>
|
<string name="settings_apps">不使用 SparkleDNS 的应用</string>
|
||||||
<string name="settings_apps_desc">选中的应用使用网络的常规 DNS</string>
|
<string name="settings_apps_desc">选中的应用使用网络的常规 DNS</string>
|
||||||
|
<string name="chart_empty">暂无数据。连接后,图表会按小时逐步填充。</string>
|
||||||
|
<string name="companies_wait">正在收集数据:%1$d / %2$d 个请求</string>
|
||||||
|
<string name="blocklist_cta_lists">没有启用任何列表。开启 HaGeZi Pro 以屏蔽广告和跟踪器。</string>
|
||||||
|
<string name="blocklist_cta_master">屏蔽已关闭。开启后即可过滤广告和跟踪器。</string>
|
||||||
|
<string name="turn_on">开启</string>
|
||||||
|
<string name="downloading">正在下载…</string>
|
||||||
|
<string name="change_server">更换服务器</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -97,14 +97,12 @@
|
|||||||
<string name="period_24h">24 hours</string>
|
<string name="period_24h">24 hours</string>
|
||||||
<string name="period_7d">7 days</string>
|
<string name="period_7d">7 days</string>
|
||||||
<string name="home_lists_info">Lists on: %1$d · rules: %2$s</string>
|
<string name="home_lists_info">Lists on: %1$d · rules: %2$s</string>
|
||||||
<string name="blocking_off">Blocking is off</string>
|
|
||||||
<string name="blocklist_title">DNS Blocklist</string>
|
<string name="blocklist_title">DNS Blocklist</string>
|
||||||
<string name="tab_activity">Activity</string>
|
<string name="tab_activity">Activity</string>
|
||||||
<string name="tab_settings">Settings</string>
|
<string name="tab_settings">Settings</string>
|
||||||
<string name="companies_title">Company dominance</string>
|
<string name="companies_title">Company dominance</string>
|
||||||
<string name="companies_desc">Share of your requests that go to the biggest companies.</string>
|
<string name="companies_desc">Share of your requests that go to the biggest companies.</string>
|
||||||
<string name="companies_other">Other</string>
|
<string name="companies_other">Other</string>
|
||||||
<string name="no_data">No data yet</string>
|
|
||||||
<string name="recent_title">Recent activity</string>
|
<string name="recent_title">Recent activity</string>
|
||||||
<string name="filter">Filter</string>
|
<string name="filter">Filter</string>
|
||||||
<string name="bl_search">Search lists</string>
|
<string name="bl_search">Search lists</string>
|
||||||
@@ -127,4 +125,11 @@
|
|||||||
<string name="settings_general">General</string>
|
<string name="settings_general">General</string>
|
||||||
<string name="settings_apps">Apps without SparkleDNS</string>
|
<string name="settings_apps">Apps without SparkleDNS</string>
|
||||||
<string name="settings_apps_desc">Picked apps use the regular DNS of the network</string>
|
<string name="settings_apps_desc">Picked apps use the regular DNS of the network</string>
|
||||||
|
<string name="chart_empty">No data yet. Connect, and the chart fills in hour by hour.</string>
|
||||||
|
<string name="companies_wait">Collecting data: %1$d of %2$d requests</string>
|
||||||
|
<string name="blocklist_cta_lists">No lists are on. Turn on HaGeZi Pro to block ads and trackers.</string>
|
||||||
|
<string name="blocklist_cta_master">Blocking is off. Turn it on to filter ads and trackers.</string>
|
||||||
|
<string name="turn_on">Turn on</string>
|
||||||
|
<string name="downloading">Downloading…</string>
|
||||||
|
<string name="change_server">Change server</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -24,6 +24,15 @@ class BlocklistMatchTest {
|
|||||||
assertFalse(isBlockedIn("ads.example.com", LongArray(0), LongArray(0)))
|
assertFalse(isBlockedIn("ads.example.com", LongArray(0), LongArray(0)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun skipsTrailingDots() {
|
||||||
|
val lists = set("example.com")
|
||||||
|
|
||||||
|
assertTrue(isBlockedIn("www.example.com..", lists, LongArray(0)))
|
||||||
|
assertFalse(isBlockedIn("example.org.", lists, LongArray(0)))
|
||||||
|
assertFalse(isBlockedIn("...", lists, LongArray(0)))
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun mergesSortedListsWithoutDuplicates() {
|
fun mergesSortedListsWithoutDuplicates() {
|
||||||
val a = longArrayOf(-5, 1, 4, 9)
|
val a = longArrayOf(-5, 1, 4, 9)
|
||||||
|
|||||||
@@ -49,5 +49,6 @@ class BlocklistParserTest {
|
|||||||
val name = "a.b.example.com"
|
val name = "a.b.example.com"
|
||||||
assertEquals(DomainHash.of("example.com"), DomainHash.of(name, name.indexOf("example")))
|
assertEquals(DomainHash.of("example.com"), DomainHash.of(name, name.indexOf("example")))
|
||||||
assertEquals(DomainHash.of(name), DomainHash.of(name, 0))
|
assertEquals(DomainHash.of(name), DomainHash.of(name, 0))
|
||||||
|
assertEquals(DomainHash.of("b.example"), DomainHash.of(name, 2, name.indexOf(".com")))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class CompaniesTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun matchesDomainsAndTheirSubdomains() {
|
||||||
|
assertEquals(Company.GOOGLE, Companies.of("youtube.com"))
|
||||||
|
assertEquals(Company.GOOGLE, Companies.of("r3---sn-abc.googlevideo.com"))
|
||||||
|
assertEquals(Company.META, Companies.of("scontent.cdninstagram.com"))
|
||||||
|
assertEquals(Company.X, Companies.of("t.co"))
|
||||||
|
assertEquals(Company.MICROSOFT, Companies.of("api.github.com"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun ignoresCaseAndTrailingDots() {
|
||||||
|
assertEquals(Company.APPLE, Companies.of("WWW.Apple.COM"))
|
||||||
|
assertEquals(Company.AMAZON, Companies.of("s3.amazonaws.com."))
|
||||||
|
assertEquals(Company.AMAZON, Companies.of("s3.amazonaws.com.."))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun knowsGoogleCountrySites() {
|
||||||
|
assertEquals(Company.GOOGLE, Companies.of("google.de"))
|
||||||
|
assertEquals(Company.GOOGLE, Companies.of("www.google.co.uk"))
|
||||||
|
assertEquals(Company.GOOGLE, Companies.of("google.com.br"))
|
||||||
|
assertNull(Companies.of("google.example.org"))
|
||||||
|
assertNull(Companies.of("google."))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun leavesOtherDomainsAlone() {
|
||||||
|
assertNull(Companies.of("example.com"))
|
||||||
|
assertNull(Companies.of("notyoutube.com"))
|
||||||
|
assertNull(Companies.of("youtube.com.example"))
|
||||||
|
assertNull(Companies.of("com"))
|
||||||
|
assertNull(Companies.of(""))
|
||||||
|
assertNull(Companies.of("."))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
|
import org.junit.Assert.assertArrayEquals
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
|
import org.junit.Test
|
||||||
|
import java.io.ByteArrayInputStream
|
||||||
|
import java.io.ByteArrayOutputStream
|
||||||
|
import java.io.DataInputStream
|
||||||
|
import java.io.DataOutputStream
|
||||||
|
|
||||||
|
class HourlyCountersTest {
|
||||||
|
|
||||||
|
private val hours = HourlyCounters.HOURS
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun countsQueriesPerHour() {
|
||||||
|
val counters = HourlyCounters()
|
||||||
|
counters.record(QueryStatus.OK, 40, Company.GOOGLE, hour = 100)
|
||||||
|
counters.record(QueryStatus.OK, 20, null, hour = 100)
|
||||||
|
counters.record(QueryStatus.BLOCKED, 0, Company.META, hour = 100)
|
||||||
|
counters.record(QueryStatus.CACHED, 0, null, hour = 99)
|
||||||
|
counters.record(QueryStatus.FAILED, 5000, null, hour = 99)
|
||||||
|
|
||||||
|
val day = counters.summary(24, currentHour = 100)
|
||||||
|
assertEquals(5L, day.total)
|
||||||
|
assertEquals(1L, day.blocked)
|
||||||
|
assertEquals(1L, day.cached)
|
||||||
|
assertEquals(30, day.avgLatencyMs)
|
||||||
|
assertEquals(1L, day.companies[Company.GOOGLE.ordinal])
|
||||||
|
assertEquals(1L, day.companies[Company.META.ordinal])
|
||||||
|
assertEquals(3L, counters.summary(1, currentHour = 100).total)
|
||||||
|
|
||||||
|
val points = counters.hourly(3, currentHour = 100)
|
||||||
|
assertEquals(listOf(0L, 2L, 3L), points.map { it.total })
|
||||||
|
assertEquals(listOf(0L, 0L, 1L), points.map { it.blocked })
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun aSlotStartsOverAWeekLater() {
|
||||||
|
val counters = HourlyCounters()
|
||||||
|
counters.record(QueryStatus.OK, 10, null, hour = 5)
|
||||||
|
counters.record(QueryStatus.OK, 10, null, hour = 5L + hours)
|
||||||
|
|
||||||
|
assertEquals(1L, counters.summary(hours, currentHour = 5L + hours).total)
|
||||||
|
assertEquals(0L, counters.summary(1, currentHour = 5).total)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun savedNumbersReadBackUnchanged() {
|
||||||
|
val counters = HourlyCounters()
|
||||||
|
counters.record(QueryStatus.BLOCKED, 0, Company.XIAOMI, hour = 1000)
|
||||||
|
counters.record(QueryStatus.OK, 12, Company.APPLE, hour = 1001)
|
||||||
|
|
||||||
|
val copy = requireNotNull(HourlyCounters.decode(counters.encode()))
|
||||||
|
|
||||||
|
assertArrayEquals(counters.hourIds, copy.hourIds)
|
||||||
|
for (index in 0 until hours) assertArrayEquals(counters.rows[index], copy.rows[index])
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun writesFormatOne() {
|
||||||
|
val bytes = HourlyCounters().encode()
|
||||||
|
val input = DataInputStream(ByteArrayInputStream(bytes))
|
||||||
|
|
||||||
|
assertEquals(1, input.readInt())
|
||||||
|
assertEquals(HourlyCounters.FIELDS, input.readInt())
|
||||||
|
assertEquals(hours, input.readInt())
|
||||||
|
assertEquals(-1L, input.readLong())
|
||||||
|
assertEquals(12 + hours * (HourlyCounters.FIELDS + 1) * 8, bytes.size)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun readsFilesFromVersionsWithFewerCompanies() {
|
||||||
|
// A file from a version that knew two companies: field n of hour 7 holds n + 1
|
||||||
|
val fields = HourlyCounters.FIRST_COMPANY + 2
|
||||||
|
val bytes = ByteArrayOutputStream()
|
||||||
|
DataOutputStream(bytes).use { out ->
|
||||||
|
out.writeInt(1)
|
||||||
|
out.writeInt(fields)
|
||||||
|
out.writeInt(hours)
|
||||||
|
for (index in 0 until hours) {
|
||||||
|
out.writeLong(if (index == 7) 7L else -1L)
|
||||||
|
for (field in 0 until fields) out.writeLong(if (index == 7) field + 1L else 0L)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val summary = requireNotNull(HourlyCounters.decode(bytes.toByteArray())).summary(1, currentHour = 7)
|
||||||
|
|
||||||
|
assertEquals(1L, summary.total)
|
||||||
|
assertEquals(2L, summary.blocked)
|
||||||
|
assertEquals(3L, summary.cached)
|
||||||
|
assertEquals(0, summary.avgLatencyMs) // latency sum 4, count 5
|
||||||
|
assertArrayEquals(longArrayOf(6, 7) + LongArray(Company.entries.size - 2), summary.companies)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun refusesOtherFormats() {
|
||||||
|
val bytes = HourlyCounters().encode()
|
||||||
|
bytes[3] = 2
|
||||||
|
|
||||||
|
assertNull(HourlyCounters.decode(bytes))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun mergeKeepsWhatWasCountedBeforeTheFileWasRead() {
|
||||||
|
val saved = HourlyCounters()
|
||||||
|
saved.record(QueryStatus.OK, 10, null, hour = 50)
|
||||||
|
saved.record(QueryStatus.OK, 10, null, hour = 49)
|
||||||
|
|
||||||
|
val live = HourlyCounters()
|
||||||
|
live.record(QueryStatus.BLOCKED, 0, null, hour = 50)
|
||||||
|
live.merge(saved)
|
||||||
|
|
||||||
|
assertEquals(2L, live.summary(1, currentHour = 50).total)
|
||||||
|
assertEquals(1L, live.summary(1, currentHour = 50).blocked)
|
||||||
|
assertEquals(3L, live.summary(2, currentHour = 50).total)
|
||||||
|
|
||||||
|
// A slot already holding a newer hour keeps it
|
||||||
|
val later = HourlyCounters()
|
||||||
|
later.record(QueryStatus.OK, 10, null, hour = 50L + hours)
|
||||||
|
later.merge(saved)
|
||||||
|
|
||||||
|
assertEquals(1L, later.summary(1, currentHour = 50L + hours).total)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,8 +18,8 @@ class PacketTest {
|
|||||||
val parsed = requireNotNull(Packet.parseDnsQuery(packet, packet.size))
|
val parsed = requireNotNull(Packet.parseDnsQuery(packet, packet.size))
|
||||||
|
|
||||||
assertArrayEquals(query, parsed.payload)
|
assertArrayEquals(query, parsed.payload)
|
||||||
assertArrayEquals(client, parsed.srcIp)
|
assertEquals(i32(client, 0), parsed.srcIp)
|
||||||
assertArrayEquals(server, parsed.dstIp)
|
assertEquals(i32(server, 0), parsed.dstIp)
|
||||||
assertEquals(40000, parsed.srcPort)
|
assertEquals(40000, parsed.srcPort)
|
||||||
assertEquals(53, parsed.dstPort)
|
assertEquals(53, parsed.dstPort)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package cc.skysparkle.sparkledns
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertNotSame
|
||||||
|
import org.junit.Assert.assertSame
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
// The screens refresh once a second; a refresh that brings the same object has nothing to update
|
||||||
|
class RefreshTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun logSnapshotIsReusedUntilTheLogChanges() {
|
||||||
|
QueryLog.clear()
|
||||||
|
val empty = QueryLog.snapshot()
|
||||||
|
assertSame(empty, QueryLog.snapshot())
|
||||||
|
|
||||||
|
QueryLog.add(DnsMessage.Question("example.com", 1), QueryStatus.OK, 10)
|
||||||
|
QueryLog.add(DnsMessage.Question("example.org", 28), QueryStatus.CACHED, 0)
|
||||||
|
val filled = QueryLog.snapshot()
|
||||||
|
|
||||||
|
assertNotSame(empty, filled)
|
||||||
|
assertEquals(listOf("example.org", "example.com"), filled.map { it.domain })
|
||||||
|
assertSame(filled, QueryLog.snapshot())
|
||||||
|
|
||||||
|
QueryLog.clear()
|
||||||
|
assertEquals(0, QueryLog.snapshot().size)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun summaryIsReusedUntilSomethingChanges() {
|
||||||
|
val now = 1_000 * 3_600_000L
|
||||||
|
val first = StatsStore.summary(24, now)
|
||||||
|
assertSame(first, StatsStore.summary(24, now))
|
||||||
|
assertNotSame(first, StatsStore.summary(24 * 7, now))
|
||||||
|
|
||||||
|
StatsStore.record(QueryStatus.OK, 5, null, now)
|
||||||
|
val after = StatsStore.summary(24, now)
|
||||||
|
|
||||||
|
assertNotSame(first, after)
|
||||||
|
assertEquals(first.total + 1, after.total)
|
||||||
|
assertSame(after, StatsStore.summary(24, now))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
• Neue gefüllte Symbole in der ganzen App (Material Symbols)
|
• Neue gefüllte Symbole (Material Symbols)
|
||||||
• Symbole in Menüs, Einstellungen und auf Schaltflächen
|
• Balkendiagramm für 24 Stunden oder 7 Tage, höher auf großen Bildschirmen
|
||||||
|
• Tablets: Inhalt mittig, auf breiten Bildschirmen zweispaltig
|
||||||
|
• Anteile der Konzerne erscheinen, sobald genug Daten da sind
|
||||||
|
• HaGeZi Pro direkt auf dem Startbildschirm einschalten
|
||||||
|
• Tippe auf den Server, um ihn zu wechseln
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
• New filled icons throughout the app (Material Symbols)
|
• New filled icons (Material Symbols)
|
||||||
• Icons in menus, Settings and on buttons
|
• Bar chart for 24 hours or 7 days, taller on big screens
|
||||||
|
• Tablets: content stays centred, two columns on wide screens
|
||||||
|
• Company shares appear once there is enough data
|
||||||
|
• Turn on HaGeZi Pro right from Home
|
||||||
|
• Tap the server on Home to change it
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
• アプリ全体のアイコンを塗りつぶしスタイルに一新(Material Symbols)
|
• 塗りつぶしの新しいアイコン(Material Symbols)
|
||||||
• メニュー、設定、ボタンにアイコンを追加
|
• 24 時間/7 日間の棒グラフ。大きな画面では高く表示
|
||||||
|
• タブレット:コンテンツを中央に、広い画面では 2 列表示
|
||||||
|
• 企業の占有率はデータが十分に集まってから表示
|
||||||
|
• ホームから HaGeZi Pro をすぐにオン
|
||||||
|
• ホームのサーバーをタップして変更
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
• Naujos užpildytos piktogramos visoje programėlėje (Material Symbols)
|
• Naujos užpildytos piktogramos (Material Symbols)
|
||||||
• Piktogramos meniu, nustatymuose ir mygtukuose
|
• Stulpelinė 24 valandų arba 7 dienų diagrama, aukštesnė dideliuose ekranuose
|
||||||
|
• Planšetės: turinys centre, plačiuose ekranuose – du stulpeliai
|
||||||
|
• Įmonių dalys rodomos, kai surenkama pakankamai duomenų
|
||||||
|
• HaGeZi Pro įjungiamas tiesiai pradžios ekrane
|
||||||
|
• Bakstelėkite serverį pradžios ekrane, kad jį pakeistumėte
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
• Новые залитые иконки во всём приложении (Material Symbols)
|
• Новые залитые иконки (Material Symbols)
|
||||||
• Иконки в меню, настройках и на кнопках
|
• Столбиковый график за 24 часа или 7 дней, выше на больших экранах
|
||||||
|
• Планшеты: контент по центру, на широких экранах две колонки
|
||||||
|
• Доли компаний появляются, когда данных достаточно
|
||||||
|
• HaGeZi Pro включается прямо с главной
|
||||||
|
• Нажмите на сервер на главной, чтобы сменить его
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
• 全应用采用新的填充图标(Material Symbols)
|
• 全新填充图标(Material Symbols)
|
||||||
• 菜单、设置和按钮新增图标
|
• 24 小时或 7 天柱状图,大屏幕上更高
|
||||||
|
• 平板:内容居中,宽屏显示两栏
|
||||||
|
• 数据足够后才显示公司占比
|
||||||
|
• 在首页直接开启 HaGeZi Pro
|
||||||
|
• 点按首页上的服务器即可更换
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# Records which classes and methods the app uses on startup and in each tab, in the text format
|
|
||||||
# of app/src/main/baseline-prof.txt. Needs a rooted Android 13+ device or emulator (no Play Store).
|
|
||||||
# Usage: scripts/baseline-profile.sh <non-minified release apk> <output file>
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
PKG=cc.skysparkle.sparkledns
|
|
||||||
ACT="$PKG/.MainActivity"
|
|
||||||
APK="$1"
|
|
||||||
OUT="$2"
|
|
||||||
|
|
||||||
adb root >/dev/null 2>&1 && sleep 3
|
|
||||||
adb wait-for-device
|
|
||||||
adb uninstall "$PKG" >/dev/null 2>&1 || true
|
|
||||||
adb install -g "$APK" >/dev/null
|
|
||||||
read -r W H < <(adb shell wm size | tr -d '\r' | awk -F'[ x]' '/Physical/ {print $3, $4}')
|
|
||||||
|
|
||||||
tap_text() {
|
|
||||||
local xy
|
|
||||||
for _ in 1 2 3 4 5; do
|
|
||||||
adb shell uiautomator dump /sdcard/ui.xml >/dev/null 2>&1 || true
|
|
||||||
xy="$(adb shell cat /sdcard/ui.xml | python3 -c '
|
|
||||||
import re, sys
|
|
||||||
xml, text = sys.stdin.read(), sys.argv[1]
|
|
||||||
for node in re.findall(r"<node [^>]*>", xml):
|
|
||||||
# Compose merges a clickable row into one node: "System, 3 of 5"
|
|
||||||
if re.search(r"(text|content-desc)=\"%s(\"|, )" % re.escape(text), node):
|
|
||||||
x1, y1, x2, y2 = map(int, re.search(r"bounds=\"\[(\d+),(\d+)\]\[(\d+),(\d+)\]\"", node).groups())
|
|
||||||
print((x1 + x2) // 2, (y1 + y2) // 2)
|
|
||||||
break
|
|
||||||
' "$1")"
|
|
||||||
if [[ -n "$xy" ]]; then
|
|
||||||
adb shell input tap $xy
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
# Lazy lists only show what is on screen; with "scroll", look further down
|
|
||||||
[[ "${2:-}" == scroll ]] && adb shell input swipe $((W / 2)) $((H * 2 / 3)) $((W / 2)) $((H / 3)) 300
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
echo "::warning::'$1' not found on screen"
|
|
||||||
}
|
|
||||||
|
|
||||||
swipe() {
|
|
||||||
adb shell input swipe $((W / 2)) $((H * 3 / 4)) $((W / 2)) $((H / 4)) 200
|
|
||||||
sleep 1
|
|
||||||
adb shell input swipe $((W / 2)) $((H / 4)) $((W / 2)) $((H * 3 / 4)) 200
|
|
||||||
sleep 1
|
|
||||||
}
|
|
||||||
|
|
||||||
for _ in 1 2 3; do
|
|
||||||
adb shell am force-stop "$PKG"
|
|
||||||
adb shell am start-activity -W -n "$ACT" >/dev/null
|
|
||||||
sleep 3
|
|
||||||
swipe
|
|
||||||
tap_text "Monitor"; sleep 2
|
|
||||||
tap_text "Apps"; sleep 3
|
|
||||||
tap_text "System" scroll; sleep 2
|
|
||||||
swipe
|
|
||||||
tap_text "Blocklist"; sleep 2
|
|
||||||
swipe
|
|
||||||
tap_text "About"; sleep 2
|
|
||||||
tap_text "Home"; sleep 2
|
|
||||||
# Makes ART write the profile now instead of on its own schedule
|
|
||||||
adb shell "kill -10 \$(pidof $PKG)"
|
|
||||||
sleep 5
|
|
||||||
done
|
|
||||||
|
|
||||||
adb shell pm dump-profiles --dump-classes-and-methods "$PKG"
|
|
||||||
sleep 2
|
|
||||||
adb pull "/data/misc/profman/$PKG-primary.prof.txt" "$OUT" >/dev/null
|
|
||||||
echo "Profile lines: $(wc -l < "$OUT")"
|
|
||||||
Reference in New Issue
Block a user