laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-08 23:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3408 from vitorpamplona/claude/nsite-tor-warning-removal-hp52fw

Browse Source 
Remove network routing confirmation dialog from napplet host
This commit is contained in:
Vitor Pamplona
2026-06-27 15:55:17 -04:00
committed by GitHub
parent fb357937b8 217f4ad9ca
commit 0ed15be975
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nappletHost/src/main/kotlin/com/vitorpamplona/amethyst/napplethost/NappletHostActivity.kt
+3 -21
View File
@@ -736,31 +736,13 @@ class NappletHostActivity : ComponentActivity() {
title = barTitle(),
isSandbox = true,
onReload = { if (this::webView.isInitialized) webView.reload() },
// Website-mode nSites can re-route over Tor; switching rebuilds the session via a confirm
// dialog, so the row taps through rather than toggling inline.
// Website-mode nSites can re-route over Tor; switching rebuilds the session, so the row taps
// through to a full relaunch rather than toggling inline.
torInitiallyOn = if (profile.exposesNetwork && proxyPort > 0) useTor else null,
onNetworkTap = if (profile.exposesNetwork && proxyPort > 0) ({ showNetworkDialog() }) else null,
onNetworkTap = if (profile.exposesNetwork && proxyPort > 0) ({ setNetworkMode(!useTor) }) else null,
onInfo = { showAccessDialog() },
)
/**
* Explains the site's current network routing and offers to switch it. Switching persists the
* per-site choice (via the broker, which owns the preference) and relaunches this screen so the new
* routing applies cleanly from [onCreate] — the proxy and content server are rebuilt for the new mode.
*/
private fun showNetworkDialog() {
val titleRes = if (useTor) R.string.napplet_net_tor_title else R.string.napplet_net_open_title
val messageRes = if (useTor) R.string.napplet_net_tor_message else R.string.napplet_net_open_message
val switchRes = if (useTor) R.string.napplet_net_switch_open else R.string.napplet_net_switch_tor
AlertDialog
.Builder(this)
.setTitle(getString(titleRes, barTitle()))
.setMessage(getString(messageRes))
.setPositiveButton(getString(switchRes)) { _, _ -> setNetworkMode(!useTor) }
.setNegativeButton(android.R.string.cancel, null)
.show()
}
/** Persists the new routing choice in the main process, then relaunches this screen to apply it. */
private fun setNetworkMode(newUseTor: Boolean) {
val msg =
nappletHost/src/main/res/values/strings.xml
-6
View File
@@ -19,12 +19,6 @@
<!-- nSite network routing (Tor vs open web) -->
<string name="napplet_net_tor_desc">This site loads over Tor. Tap to change.</string>
<string name="napplet_net_open_desc">This site loads over the open web. Tap to change.</string>
<string name="napplet_net_tor_title">“%1$s” loads over Tor</string>
<string name="napplet_net_tor_message">This site\'s traffic is routed through Tor, so it can\'t see your IP address. Some sites are slow or broken over Tor — you can switch this site to the open web. Your choice is remembered for this site.</string>
<string name="napplet_net_open_title">“%1$s” loads over the open web</string>
<string name="napplet_net_open_message">This site loads directly, so it (and the servers it contacts) can see your IP address. Switch it back to Tor to keep your IP private. Your choice is remembered for this site.</string>
<string name="napplet_net_switch_open">Use open web</string>
<string name="napplet_net_switch_tor">Use Tor</string>
<!-- Short labels for the pull-down sheet's network row -->
<string name="napplet_net_tor_label">Loads over Tor</string>
<string name="napplet_net_open_label">Loads over the open web</string>