highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-10 17:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1040 from davotoula/1037-tor-setting-reset-to-off-after-switching-away

Browse Source 
1037 tor setting reset to off after switching away
This commit is contained in:
Vitor Pamplona
2024-09-01 12:36:36 -04:00
committed by GitHub
parent b1f1466e6b 9fa1b8c541
commit 34e82dab8b
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
View File

@@ -252,7 +252,7 @@ class AccountSettings(
portNumber: String, portNumber: String,
) { ) {
val port = portNumber.toIntOrNull() ?: return val port = portNumber.toIntOrNull() ?: return
if (proxyPort != port && isProxyEnabled() != enabled) { if (proxyPort != port || isProxyEnabled() != enabled) {
proxyPort = portNumber.toInt() proxyPort = portNumber.toInt()
proxy = HttpClientManager.initProxy(enabled, "127.0.0.1", proxyPort) proxy = HttpClientManager.initProxy(enabled, "127.0.0.1", proxyPort)
saveAccountSettings() saveAccountSettings()

3
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
View File

@@ -472,7 +472,7 @@ fun LoginPage(
}, },
), ),
) )
}
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
if (PackageUtils.isOrbotInstalled(context)) { if (PackageUtils.isOrbotInstalled(context)) {
@@ -510,7 +510,6 @@ fun LoginPage(
) )
} }
} }
}
if (isFirstLogin) { if (isFirstLogin) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {