net: tighten the local network gate after the second review

Record an explicit denial rather than the presentation, so an unanswered
prompt is shown again after recreation. Watch every network instead of
only the default, exclude VPN and cellular interfaces from the on-link
set, skip the gate while offline, and only retry a sync the prompt
actually raced.
This commit is contained in:
austinried
2026-11-14 12:08:02 +00:00
parent c0db939c60
commit 85f45de69c
5 changed files with 64 additions and 30 deletions
@@ -5,6 +5,7 @@ import android.content.pm.PackageManager
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.IpPrefix import android.net.IpPrefix
import android.net.LinkAddress import android.net.LinkAddress
import android.net.NetworkCapabilities
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
@@ -19,7 +20,7 @@ private const val LOCAL_NETWORK_PERMISSION_SDK = 37
class LocalNetworkAccess( class LocalNetworkAccess(
private val context: Context, private val context: Context,
) { ) {
private val promptedAddresses = mutableSetOf<String>() private val deniedAddresses = mutableSetOf<String>()
suspend fun requiresPermission(address: String): Boolean { suspend fun requiresPermission(address: String): Boolean {
if (Build.VERSION.SDK_INT < LOCAL_NETWORK_PERMISSION_SDK) return false if (Build.VERSION.SDK_INT < LOCAL_NETWORK_PERMISSION_SDK) return false
@@ -35,12 +36,12 @@ class LocalNetworkAccess(
} }
@Synchronized @Synchronized
fun markPrompted(address: String) { fun markDenied(address: String) {
promptedAddresses += normalizeServerAddress(address) deniedAddresses += normalizeServerAddress(address)
} }
@Synchronized @Synchronized
fun wasPrompted(address: String): Boolean = normalizeServerAddress(address) in promptedAddresses fun wasDenied(address: String): Boolean = normalizeServerAddress(address) in deniedAddresses
private fun granted(): Boolean = private fun granted(): Boolean =
ContextCompat.checkSelfPermission(context, LOCAL_NETWORK_PERMISSION) == PackageManager.PERMISSION_GRANTED ContextCompat.checkSelfPermission(context, LOCAL_NETWORK_PERMISSION) == PackageManager.PERMISSION_GRANTED
@@ -48,12 +49,17 @@ class LocalNetworkAccess(
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
private fun currentLinkAddresses(): List<LinkAddress> { private fun currentLinkAddresses(): List<LinkAddress> {
val manager = context.getSystemService(ConnectivityManager::class.java) ?: return emptyList() val manager = context.getSystemService(ConnectivityManager::class.java) ?: return emptyList()
return manager.allNetworks.flatMap { network -> return manager.allNetworks
manager.getLinkProperties(network)?.linkAddresses.orEmpty() .filter { network -> manager.getNetworkCapabilities(network)?.isLocalNetworkInterface == true }
} .flatMap { network -> manager.getLinkProperties(network)?.linkAddresses.orEmpty() }
} }
} }
private val NetworkCapabilities.isLocalNetworkInterface: Boolean
get() =
!hasTransport(NetworkCapabilities.TRANSPORT_VPN) &&
!hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
internal fun isLocalHostname(host: String): Boolean { internal fun isLocalHostname(host: String): Boolean {
val normalized = host.lowercase().trimEnd('.') val normalized = host.lowercase().trimEnd('.')
return normalized == "local" || normalized.endsWith(".local") return normalized == "local" || normalized.endsWith(".local")
@@ -67,6 +67,7 @@ import com.subtracks.data.repo.DownloadRepository
import com.subtracks.data.repo.LibraryRepository import com.subtracks.data.repo.LibraryRepository
import com.subtracks.data.repo.SourceRepository import com.subtracks.data.repo.SourceRepository
import com.subtracks.data.sync.SyncManager import com.subtracks.data.sync.SyncManager
import com.subtracks.data.sync.SyncStatus
import com.subtracks.playback.PlaybackController import com.subtracks.playback.PlaybackController
import com.subtracks.ui.components.AlbumInfoDialog import com.subtracks.ui.components.AlbumInfoDialog
import com.subtracks.ui.components.ArtistChooserSheet import com.subtracks.ui.components.ArtistChooserSheet
@@ -120,6 +121,8 @@ class RootViewModel(
.activeConfig() .activeConfig()
.map { it?.address } .map { it?.address }
.stateIn(viewModelScope, SharingStarted.Eagerly, null) .stateIn(viewModelScope, SharingStarted.Eagerly, null)
val offline = sourceRepository.offline
} }
private const val NAVIGATION_DURATION_MS = 260 private const val NAVIGATION_DURATION_MS = 260
@@ -205,11 +208,16 @@ fun SubtracksRoot(root: RootViewModel = koinViewModel()) {
val localNetworkGate = rememberLocalNetworkGate() val localNetworkGate = rememberLocalNetworkGate()
val syncManager = koinInject<SyncManager>() val syncManager = koinInject<SyncManager>()
val serverAddress by root.serverAddress.collectAsStateWithLifecycle() val serverAddress by root.serverAddress.collectAsStateWithLifecycle()
val offline by root.offline.collectAsStateWithLifecycle()
val networkRevision = rememberNetworkRevision() val networkRevision = rememberNetworkRevision()
LaunchedEffect(serverAddress, networkRevision) { LaunchedEffect(serverAddress, networkRevision, offline) {
if (offline) return@LaunchedEffect
localNetworkGate.run( localNetworkGate.run(
address = serverAddress, address = serverAddress,
onGranted = { syncManager.requestSync() }, onGranted = {
val status = syncManager.status.value
if (status is SyncStatus.Running || status is SyncStatus.Failed) syncManager.requestSync()
},
onNotNeeded = {}, onNotNeeded = {},
automatic = true, automatic = true,
) )
@@ -3,6 +3,8 @@ package com.subtracks.ui.components
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.LinkProperties import android.net.LinkProperties
import android.net.Network import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
@@ -43,7 +45,7 @@ class LocalNetworkGate internal constructor(
return return
} }
scope.launch { scope.launch {
if (!checker.requiresPermission(address) || (automatic && checker.wasPrompted(address))) { if (!checker.requiresPermission(address) || (automatic && checker.wasDenied(address))) {
onNotNeeded() onNotNeeded()
} else { } else {
requestPermission(address, onGranted, onDenied) requestPermission(address, onGranted, onDenied)
@@ -53,6 +55,7 @@ class LocalNetworkGate internal constructor(
} }
private class PendingRequest( private class PendingRequest(
val address: String,
val onGranted: () -> Unit, val onGranted: () -> Unit,
val onDenied: () -> Unit, val onDenied: () -> Unit,
) )
@@ -69,16 +72,18 @@ fun rememberLocalNetworkGate(): LocalNetworkGate {
pending = null pending = null
awaitingSystemPrompt = false awaitingSystemPrompt = false
if (request != null) { if (request != null) {
if (granted) request.onGranted() else request.onDenied() if (granted) {
request.onGranted()
} else {
checker.markDenied(request.address)
request.onDenied()
}
} }
} }
val gate = val gate =
LocalNetworkGate(scope, checker) { address, onGranted, onDenied -> LocalNetworkGate(scope, checker) { address, onGranted, onDenied ->
if (pending == null) { if (pending == null) pending = PendingRequest(address, onGranted, onDenied)
checker.markPrompted(address)
pending = PendingRequest(onGranted, onDenied)
}
} }
val request = pending val request = pending
@@ -86,6 +91,7 @@ fun rememberLocalNetworkGate(): LocalNetworkGate {
AlertDialog( AlertDialog(
onDismissRequest = { onDismissRequest = {
pending = null pending = null
checker.markDenied(request.address)
request.onDenied() request.onDenied()
}, },
title = { Text(stringResource(R.string.local_network_permission_title)) }, title = { Text(stringResource(R.string.local_network_permission_title)) },
@@ -104,6 +110,7 @@ fun rememberLocalNetworkGate(): LocalNetworkGate {
TextButton( TextButton(
onClick = { onClick = {
pending = null pending = null
checker.markDenied(request.address)
request.onDenied() request.onDenied()
}, },
) { ) {
@@ -138,8 +145,15 @@ internal fun rememberNetworkRevision(): Int {
) { ) {
mainExecutor.execute { revision++ } mainExecutor.execute { revision++ }
} }
override fun onCapabilitiesChanged(
network: Network,
networkCapabilities: NetworkCapabilities,
) {
mainExecutor.execute { revision++ }
} }
runCatching { manager?.registerDefaultNetworkCallback(callback) } }
runCatching { manager?.registerNetworkCallback(NetworkRequest.Builder().build(), callback) }
onDispose { onDispose {
if (manager != null) runCatching { manager.unregisterNetworkCallback(callback) } if (manager != null) runCatching { manager.unregisterNetworkCallback(callback) }
} }
@@ -63,7 +63,23 @@ fun AddSourceRoute(
viewModel: AddSourceViewModel = koinViewModel(key = sourceId?.toString() ?: "new") { parametersOf(sourceId) }, viewModel: AddSourceViewModel = koinViewModel(key = sourceId?.toString() ?: "new") { parametersOf(sourceId) },
) { ) {
val state by viewModel.state.collectAsStateWithLifecycle() val state by viewModel.state.collectAsStateWithLifecycle()
val offline by viewModel.offline.collectAsStateWithLifecycle()
val localNetworkGate = rememberLocalNetworkGate() val localNetworkGate = rememberLocalNetworkGate()
fun runGated(
onGranted: () -> Unit,
onDenied: () -> Unit = onGranted,
) {
if (offline) {
onGranted()
} else {
localNetworkGate.run(
address = state.address,
onGranted = onGranted,
onDenied = onDenied,
)
}
}
AddSourceScreen( AddSourceScreen(
state = state, state = state,
onNameChange = viewModel::setName, onNameChange = viewModel::setName,
@@ -71,20 +87,8 @@ fun AddSourceRoute(
onUsernameChange = viewModel::setUsername, onUsernameChange = viewModel::setUsername,
onPasswordChange = viewModel::setPassword, onPasswordChange = viewModel::setPassword,
onTokenAuthChange = viewModel::setTokenAuth, onTokenAuthChange = viewModel::setTokenAuth,
onTest = { onTest = { runGated(viewModel::testConnection, viewModel::localNetworkPermissionDenied) },
localNetworkGate.run( onSave = { runGated({ viewModel.save(onSaved) }) },
address = state.address,
onGranted = viewModel::testConnection,
onDenied = viewModel::localNetworkPermissionDenied,
)
},
onSave = {
localNetworkGate.run(
address = state.address,
onGranted = { viewModel.save(onSaved) },
onDenied = { viewModel.save(onSaved) },
)
},
onDelete = { viewModel.delete(onSaved) }, onDelete = { viewModel.delete(onSaved) },
onBack = onBack, onBack = onBack,
dismissals = dismissals, dismissals = dismissals,
@@ -47,6 +47,8 @@ class AddSourceViewModel(
private val _state = MutableStateFlow(AddSourceState(isEditing = sourceId != null)) private val _state = MutableStateFlow(AddSourceState(isEditing = sourceId != null))
val state: StateFlow<AddSourceState> = _state val state: StateFlow<AddSourceState> = _state
val offline: StateFlow<Boolean> = sourceRepository.offline
init { init {
sourceId?.let { id -> sourceId?.let { id ->
viewModelScope.launch { viewModelScope.launch {