Show blocking rule as it is (don't remove uri scheme)

This commit is contained in:
Juha Heinanen
2026-06-29 09:32:43 +03:00
parent de24c80d17
commit d88ab524c7
@@ -45,7 +45,6 @@ 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.scale import androidx.compose.ui.draw.scale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
@@ -133,7 +132,6 @@ fun BlockingContent(
acc: Account, acc: Account,
onRuleDeleted: () -> Unit onRuleDeleted: () -> Unit
) { ) {
val ctx = LocalContext.current
val alertTitle = remember { mutableStateOf("") } val alertTitle = remember { mutableStateOf("") }
val alertMessage = remember { mutableStateOf("") } val alertMessage = remember { mutableStateOf("") }
val showAlert = remember { mutableStateOf(false) } val showAlert = remember { mutableStateOf(false) }
@@ -247,10 +245,6 @@ fun BlockingContent(
verticalArrangement = Arrangement.spacedBy(4.dp), verticalArrangement = Arrangement.spacedBy(4.dp),
) { ) {
items(rules) { rule -> items(rules) { rule ->
val pattern = if (Utils.checkUri(rule.pattern))
Utils.friendlyUri(ctx, rule.pattern, acc)
else
rule.pattern
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
@@ -262,7 +256,7 @@ fun BlockingContent(
) )
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text = pattern, text = rule.pattern,
fontSize = 18.sp, fontSize = 18.sp,
color = MaterialTheme.colorScheme.onBackground color = MaterialTheme.colorScheme.onBackground
) )
@@ -273,7 +267,7 @@ fun BlockingContent(
onClick = { onClick = {
message.value = String.format( message.value = String.format(
deleteRuleMessage, deleteRuleMessage,
pattern rule.pattern
) )
lastAction.value = { lastAction.value = {
BaresipService.blockRules.remove(rule) BaresipService.blockRules.remove(rule)