From 85f45de69c50f23387ab5cbda13b4c1dad16ebb6 Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Wed, 11 Nov 2026 00:37:08 +0000 Subject: [PATCH] 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. --- .../subtracks/data/net/LocalNetworkAccess.kt | 20 ++++++++---- .../main/kotlin/com/subtracks/ui/AppRoot.kt | 12 +++++-- .../ui/components/LocalNetworkGate.kt | 28 ++++++++++++---- .../subtracks/ui/settings/AddSourceScreen.kt | 32 +++++++++++-------- .../ui/settings/AddSourceViewModel.kt | 2 ++ 5 files changed, 64 insertions(+), 30 deletions(-) diff --git a/app/src/main/kotlin/com/subtracks/data/net/LocalNetworkAccess.kt b/app/src/main/kotlin/com/subtracks/data/net/LocalNetworkAccess.kt index 4af79ca8..04858840 100644 --- a/app/src/main/kotlin/com/subtracks/data/net/LocalNetworkAccess.kt +++ b/app/src/main/kotlin/com/subtracks/data/net/LocalNetworkAccess.kt @@ -5,6 +5,7 @@ import android.content.pm.PackageManager import android.net.ConnectivityManager import android.net.IpPrefix import android.net.LinkAddress +import android.net.NetworkCapabilities import android.os.Build import androidx.annotation.RequiresApi import androidx.core.content.ContextCompat @@ -19,7 +20,7 @@ private const val LOCAL_NETWORK_PERMISSION_SDK = 37 class LocalNetworkAccess( private val context: Context, ) { - private val promptedAddresses = mutableSetOf() + private val deniedAddresses = mutableSetOf() suspend fun requiresPermission(address: String): Boolean { if (Build.VERSION.SDK_INT < LOCAL_NETWORK_PERMISSION_SDK) return false @@ -35,12 +36,12 @@ class LocalNetworkAccess( } @Synchronized - fun markPrompted(address: String) { - promptedAddresses += normalizeServerAddress(address) + fun markDenied(address: String) { + deniedAddresses += normalizeServerAddress(address) } @Synchronized - fun wasPrompted(address: String): Boolean = normalizeServerAddress(address) in promptedAddresses + fun wasDenied(address: String): Boolean = normalizeServerAddress(address) in deniedAddresses private fun granted(): Boolean = ContextCompat.checkSelfPermission(context, LOCAL_NETWORK_PERMISSION) == PackageManager.PERMISSION_GRANTED @@ -48,12 +49,17 @@ class LocalNetworkAccess( @Suppress("DEPRECATION") private fun currentLinkAddresses(): List { val manager = context.getSystemService(ConnectivityManager::class.java) ?: return emptyList() - return manager.allNetworks.flatMap { network -> - manager.getLinkProperties(network)?.linkAddresses.orEmpty() - } + return manager.allNetworks + .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 { val normalized = host.lowercase().trimEnd('.') return normalized == "local" || normalized.endsWith(".local") diff --git a/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt b/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt index aa29e899..00ac82de 100644 --- a/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt +++ b/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt @@ -67,6 +67,7 @@ import com.subtracks.data.repo.DownloadRepository import com.subtracks.data.repo.LibraryRepository import com.subtracks.data.repo.SourceRepository import com.subtracks.data.sync.SyncManager +import com.subtracks.data.sync.SyncStatus import com.subtracks.playback.PlaybackController import com.subtracks.ui.components.AlbumInfoDialog import com.subtracks.ui.components.ArtistChooserSheet @@ -120,6 +121,8 @@ class RootViewModel( .activeConfig() .map { it?.address } .stateIn(viewModelScope, SharingStarted.Eagerly, null) + + val offline = sourceRepository.offline } private const val NAVIGATION_DURATION_MS = 260 @@ -205,11 +208,16 @@ fun SubtracksRoot(root: RootViewModel = koinViewModel()) { val localNetworkGate = rememberLocalNetworkGate() val syncManager = koinInject() val serverAddress by root.serverAddress.collectAsStateWithLifecycle() + val offline by root.offline.collectAsStateWithLifecycle() val networkRevision = rememberNetworkRevision() - LaunchedEffect(serverAddress, networkRevision) { + LaunchedEffect(serverAddress, networkRevision, offline) { + if (offline) return@LaunchedEffect localNetworkGate.run( address = serverAddress, - onGranted = { syncManager.requestSync() }, + onGranted = { + val status = syncManager.status.value + if (status is SyncStatus.Running || status is SyncStatus.Failed) syncManager.requestSync() + }, onNotNeeded = {}, automatic = true, ) diff --git a/app/src/main/kotlin/com/subtracks/ui/components/LocalNetworkGate.kt b/app/src/main/kotlin/com/subtracks/ui/components/LocalNetworkGate.kt index aae28b82..b4c28acc 100644 --- a/app/src/main/kotlin/com/subtracks/ui/components/LocalNetworkGate.kt +++ b/app/src/main/kotlin/com/subtracks/ui/components/LocalNetworkGate.kt @@ -3,6 +3,8 @@ package com.subtracks.ui.components import android.net.ConnectivityManager import android.net.LinkProperties import android.net.Network +import android.net.NetworkCapabilities +import android.net.NetworkRequest import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.material3.AlertDialog @@ -43,7 +45,7 @@ class LocalNetworkGate internal constructor( return } scope.launch { - if (!checker.requiresPermission(address) || (automatic && checker.wasPrompted(address))) { + if (!checker.requiresPermission(address) || (automatic && checker.wasDenied(address))) { onNotNeeded() } else { requestPermission(address, onGranted, onDenied) @@ -53,6 +55,7 @@ class LocalNetworkGate internal constructor( } private class PendingRequest( + val address: String, val onGranted: () -> Unit, val onDenied: () -> Unit, ) @@ -69,16 +72,18 @@ fun rememberLocalNetworkGate(): LocalNetworkGate { pending = null awaitingSystemPrompt = false if (request != null) { - if (granted) request.onGranted() else request.onDenied() + if (granted) { + request.onGranted() + } else { + checker.markDenied(request.address) + request.onDenied() + } } } val gate = LocalNetworkGate(scope, checker) { address, onGranted, onDenied -> - if (pending == null) { - checker.markPrompted(address) - pending = PendingRequest(onGranted, onDenied) - } + if (pending == null) pending = PendingRequest(address, onGranted, onDenied) } val request = pending @@ -86,6 +91,7 @@ fun rememberLocalNetworkGate(): LocalNetworkGate { AlertDialog( onDismissRequest = { pending = null + checker.markDenied(request.address) request.onDenied() }, title = { Text(stringResource(R.string.local_network_permission_title)) }, @@ -104,6 +110,7 @@ fun rememberLocalNetworkGate(): LocalNetworkGate { TextButton( onClick = { pending = null + checker.markDenied(request.address) request.onDenied() }, ) { @@ -138,8 +145,15 @@ internal fun rememberNetworkRevision(): Int { ) { 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 { if (manager != null) runCatching { manager.unregisterNetworkCallback(callback) } } diff --git a/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceScreen.kt b/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceScreen.kt index 1894d7bd..b5328d85 100644 --- a/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceScreen.kt +++ b/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceScreen.kt @@ -63,7 +63,23 @@ fun AddSourceRoute( viewModel: AddSourceViewModel = koinViewModel(key = sourceId?.toString() ?: "new") { parametersOf(sourceId) }, ) { val state by viewModel.state.collectAsStateWithLifecycle() + val offline by viewModel.offline.collectAsStateWithLifecycle() val localNetworkGate = rememberLocalNetworkGate() + + fun runGated( + onGranted: () -> Unit, + onDenied: () -> Unit = onGranted, + ) { + if (offline) { + onGranted() + } else { + localNetworkGate.run( + address = state.address, + onGranted = onGranted, + onDenied = onDenied, + ) + } + } AddSourceScreen( state = state, onNameChange = viewModel::setName, @@ -71,20 +87,8 @@ fun AddSourceRoute( onUsernameChange = viewModel::setUsername, onPasswordChange = viewModel::setPassword, onTokenAuthChange = viewModel::setTokenAuth, - onTest = { - localNetworkGate.run( - address = state.address, - onGranted = viewModel::testConnection, - onDenied = viewModel::localNetworkPermissionDenied, - ) - }, - onSave = { - localNetworkGate.run( - address = state.address, - onGranted = { viewModel.save(onSaved) }, - onDenied = { viewModel.save(onSaved) }, - ) - }, + onTest = { runGated(viewModel::testConnection, viewModel::localNetworkPermissionDenied) }, + onSave = { runGated({ viewModel.save(onSaved) }) }, onDelete = { viewModel.delete(onSaved) }, onBack = onBack, dismissals = dismissals, diff --git a/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceViewModel.kt b/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceViewModel.kt index 4add31cc..b05ea112 100644 --- a/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceViewModel.kt +++ b/app/src/main/kotlin/com/subtracks/ui/settings/AddSourceViewModel.kt @@ -47,6 +47,8 @@ class AddSourceViewModel( private val _state = MutableStateFlow(AddSourceState(isEditing = sourceId != null)) val state: StateFlow = _state + val offline: StateFlow = sourceRepository.offline + init { sourceId?.let { id -> viewModelScope.launch {