From d8350ee89e144970a844605cabe246c35653ce8c Mon Sep 17 00:00:00 2001
From: jkito <belter@riseup.net>
Date: Thu, 1 Aug 2024 23:54:49 +0530
Subject: [PATCH] gui: disable obfs4 and kcp checkbox in preferences for riseup
riseup currently is not having any deployed obfs4 or kcp bridges
but the eip-service.json contains transports[].type as obfs4 for
many of the gateways, therfore the bridge options are explicitly
disabled if the provider name is 'riseup'
---
gui/components/Preferences.qml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gui/components/Preferences.qml b/gui/components/Preferences.qml
index d68a62b3..4d39de04 100644
--- a/gui/components/Preferences.qml
+++ b/gui/components/Preferences.qml
@@ -309,7 +309,7 @@ ThemedPage {
}
PropertyChanges {
target: useBridgesCheckBox
- enabled: true
+ enabled: true && (ctx && ctx.provider == "bitmask")
}
PropertyChanges {
target: useUDP
@@ -317,7 +317,7 @@ ThemedPage {
}
PropertyChanges {
target: useKCP
- enabled: true
+ enabled: true && (ctx && ctx.provider == "bitmask")
}
}
]
@@ -325,6 +325,9 @@ ThemedPage {
function areBridgesAvailable() {
// FIXME check if provider offers it
+ if (ctx && ctx.provider == "riseup") {
+ return false
+ }
let providerSupport = true
return providerSupport && !useUDP.checked
}
@@ -364,11 +367,11 @@ ThemedPage {
if (ctx && ctx.offersUdp && ctx.udp == "true") {
useUDP.checked = true
}
- if (ctx && ctx.transport == "obfs4") {
+ if (ctx && ctx.transport == "obfs4" && ctx.provider == "bitmask") {
useBridgesCheckBox.checked = true
useUDP.enabled = false
}
- if (ctx && ctx.transport == "kcp") {
+ if (ctx && ctx.transport == "kcp" && ctx.provider == "bitmask") {
useKCP.checked = true
useBridgesCheckBox.checked = true
useBridgesCheckBox.enabled = false
--
GitLab