Fetch the built-in bridges from Tor's Censorship Circumvention API, rather than hardcode them

4 files changed, 9 insertions, 1 deletions

diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py
index d0ad249b..486a3578 100644
--- a/desktop/src/onionshare/gui_common.py
+++ b/desktop/src/onionshare/gui_common.py
@@ -38,6 +38,7 @@ from onionshare_cli.onion import (
     TorTooOldEphemeral,
     TorTooOldStealth,
     PortNotAvailable,
+    TorErrorGettingBridges,
 )
 
 
@@ -507,5 +508,7 @@ class GuiCommon:
             return strings._("error_stealth_not_supported")
         elif type(e) is PortNotAvailable:
             return strings._("error_port_not_available")
+        elif type(e) is TorErrorGettingBridges:
+            return strings._("error_getting_bridges")
 
         return None
diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json
index d405c702..73b35b2e 100644
--- a/desktop/src/onionshare/resources/locale/en.json
+++ b/desktop/src/onionshare/resources/locale/en.json
@@ -223,6 +223,7 @@
     "error_port_not_available": "OnionShare port not available",
     "history_receive_read_message_button": "Read Message",
     "error_tor_protocol_error": "There was an error with Tor: {}",
+    "error_getting_bridges": "Could not obtain bridges from the Tor API",
     "moat_contact_label": "Contacting BridgeDB...",
     "moat_captcha_label": "Solve the CAPTCHA to request a bridge.",
     "moat_captcha_placeholder": "Enter the characters from the image",
@@ -232,4 +233,4 @@
     "moat_captcha_error": "The solution is not correct. Please try again.",
     "moat_solution_empty_error": "You must enter the characters from the image",
     "mode_tor_not_connected_label": "OnionShare is not connected to the Tor network"
-}
\ No newline at end of file
+}
diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py
index b02c6f21..c5f24017 100644
--- a/desktop/src/onionshare/threads.py
+++ b/desktop/src/onionshare/threads.py
@@ -37,6 +37,7 @@ from onionshare_cli.onion import (
     TorTooOldEphemeral,
     TorTooOldStealth,
     PortNotAvailable,
+    TorErrorGettingBridges,
 )
 
 from . import strings
@@ -104,6 +105,7 @@ class OnionThread(QtCore.QThread):
             TorTooOldEphemeral,
             TorTooOldStealth,
             PortNotAvailable,
+            TorErrorGettingBridges,
         ) as e:
             message = self.mode.common.gui.get_translated_tor_error(e)
             self.error.emit(message)
diff --git a/desktop/src/onionshare/tor_connection.py b/desktop/src/onionshare/tor_connection.py
index 2cc599c4..77218c1a 100644
--- a/desktop/src/onionshare/tor_connection.py
+++ b/desktop/src/onionshare/tor_connection.py
@@ -36,6 +36,7 @@ from onionshare_cli.onion import (
     TorTooOldEphemeral,
     TorTooOldStealth,
     PortNotAvailable,
+    TorErrorGettingBridges,
 )
 
 from . import strings
@@ -310,6 +311,7 @@ class TorConnectionThread(QtCore.QThread):
             TorTooOldEphemeral,
             TorTooOldStealth,
             PortNotAvailable,
+            TorErrorGettingBridges,
         ) as e:
             message = self.common.gui.get_translated_tor_error(e)
             self.common.log(