GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

tor: bridges status

Browse source
This commit is contained in:
ardocrat 2024-05-17 18:29:49 +03:00
parent dc49ab3d77
commit bc20019783
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.yml
View file

@ -136,6 +136,8 @@ transport:
bridges_desc: Setup bridges to bypass Tor network censorship if usual connection is not working. bridges_desc: Setup bridges to bypass Tor network censorship if usual connection is not working.
bin_file: 'Binary file:' bin_file: 'Binary file:'
conn_line: 'Connection line:' conn_line: 'Connection line:'
bridges_disabled: Bridges disabled
bridge_name: 'Bridge %{b}'
network: network:
self: Network self: Network
type: 'Network type:' type: 'Network type:'

2
locales/ru.yml
View file

@ -136,6 +136,8 @@ transport:
bridges_desc: Настройте мосты для обхода цензуры сети Tor, если обычное соединение не работает. bridges_desc: Настройте мосты для обхода цензуры сети Tor, если обычное соединение не работает.
bin_file: 'Исполняемый файл:' bin_file: 'Исполняемый файл:'
conn_line: 'Строка подключения:' conn_line: 'Строка подключения:'
bridges_disabled: Мосты отключены
bridge_name: 'Мост %{b}'
network: network:
self: Сеть self: Сеть
type: 'Тип сети:' type: 'Тип сети:'

26
src/gui/views/wallets/wallet/transport.rs
View file

@ -24,7 +24,7 @@ use grin_core::core::{amount_from_hr_string, amount_to_hr_string};
use grin_wallet_libwallet::SlatepackAddress; use grin_wallet_libwallet::SlatepackAddress;
use crate::gui::Colors; use crate::gui::Colors;
use crate::gui::icons::{CHECK_CIRCLE, COMPUTER_TOWER, COPY, DOTS_THREE_CIRCLE, EXPORT, GEAR_SIX, GLOBE_SIMPLE, POWER, QR_CODE, WARNING_CIRCLE, X_CIRCLE}; use crate::gui::icons::{CHECK_CIRCLE, COPY, DOTS_THREE_CIRCLE, EXPORT, GEAR_SIX, GLOBE_SIMPLE, POWER, QR_CODE, SHIELD_CHECKERED, SHIELD_SLASH, WARNING_CIRCLE, X_CIRCLE};
use crate::gui::platform::PlatformCallbacks; use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{Modal, QrCodeContent, Root, View}; use crate::gui::views::{Modal, QrCodeContent, Root, View};
use crate::gui::views::types::{ModalPosition, TextEditOptions}; use crate::gui::views::types::{ModalPosition, TextEditOptions};
@ -254,12 +254,20 @@ impl WalletTransport {
.size(18.0) .size(18.0)
.color(Colors::TITLE)); .color(Colors::TITLE));
// Setup wallet API address text. // Setup bridges status text.
let port = wallet.foreign_api_port().unwrap(); let bridge = TorConfig::get_bridge();
let address_text = format!("{} http://127.0.0.1:{}", let bridges_text = match &bridge {
COMPUTER_TOWER, None => {
port); format!("{} {}", SHIELD_SLASH, t!("transport.bridges_disabled"))
ui.label(RichText::new(address_text).size(15.0).color(Colors::TEXT)); }
Some(b) => {
let name = b.protocol_name().to_uppercase();
format!("{} {}",
SHIELD_CHECKERED,
t!("transport.bridge_name", "b" = name))
}
};
ui.label(RichText::new(bridges_text).size(15.0).color(Colors::TEXT));
ui.add_space(1.0); ui.add_space(1.0);
// Setup Tor status text. // Setup Tor status text.
@ -384,8 +392,8 @@ impl WalletTransport {
// Check if bin path or connection line text was changed to save bridge. // Check if bin path or connection line text was changed to save bridge.
if conn_edit_before != self.bridge_conn_line_edit || if conn_edit_before != self.bridge_conn_line_edit ||
bin_edit_before != self.bridge_bin_path_edit { bin_edit_before != self.bridge_bin_path_edit {
let bin_path = self.bridge_bin_path_edit.clone(); let bin_path = self.bridge_bin_path_edit.trim().to_string();
let conn_line = self.bridge_conn_line_edit.clone(); let conn_line = self.bridge_conn_line_edit.trim().to_string();
let b = match bridge { let b = match bridge {
TorBridge::Snowflake(_, _) => { TorBridge::Snowflake(_, _) => {
TorBridge::Snowflake(bin_path, conn_line) TorBridge::Snowflake(bin_path, conn_line)