tor-commits December 2021

tor-commits@lists.torproject.org

15 participants
1464 discussions

[orbot/master] Translated using Weblate (Portuguese (Brazil))
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 41cf5d375662dfda70fab935e3aa989e374bcb27 Author: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Date: Fri Dec 3 08:50:52 2021 +0100 Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (211 of 211 strings) Co-authored-by: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/ Translation: Guardian Project/Orbot --- app/src/main/res/values-pt-rBR/strings.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 89686755..a7efd89a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -18,7 +18,7 @@ <string name="menu_scan">Escanear um BridgeQR</string> <string name="menu_share_bridge">Compartilhar o BridgeQR</string>  - <string name="wizard_details_msg">O Orbot é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também tem a habilidade, em dispositivos com acesso root, de enviar todo o trafego de Internet via rede Tor.</string> + <string name="wizard_details_msg">O Orbot é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor.</string>  <string name="pref_general_group">Geral</string> <string name="pref_start_boot_title">Iniciar o Orbot durante o Boot</string> @@ -81,8 +81,8 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string> <string name="enter_ports">Insira as portas</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ativar os registros log de depuração para saída (deve usar adb ou aLogCat para ver)</string> - <string name="project_home">Home(s) do Projeto: </string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_home">Site do projeto:</string> + <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">Software de Terceiros:</string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> @@ -216,5 +216,7 @@ <string name="backup_port_exist">Erro: Um serviço Onion já está usando a porta %s</string> <string name="be_a_snowflake_desc_limit">Somente quando o dispositivo está conectado e na rede Wi-Fi</string> <string name="be_a_snowflake_title_limit">Limites do proxy snowflake</string> - <string name="snowflake_proxy_enabled">MODO DE PROXY SNOWFLAKE ATIVADO</string> + <string name="snowflake_proxy_enabled">Modo proxy snowflake ativado</string> + <string name="version">Versão:</string> + <string name="license">Licença:</string> </resources> \ No newline at end of file

1 0

[orbot/master] Translated using Weblate (Vietnamese)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 1abfd73f1ed394a00b57ac726ee69be5a620c281 Author: bruh <quangtrung02hn16(a)gmail.com> Date: Fri Dec 3 08:50:53 2021 +0100 Translated using Weblate (Vietnamese) Currently translated at 100.0% (211 of 211 strings) Co-authored-by: bruh <quangtrung02hn16(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/vi/ Translation: Guardian Project/Orbot --- app/src/main/res/values-vi/strings.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1f6255ae..c66da787 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -80,8 +80,8 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Cổng truy cập được đằng sau tường lửa</string> <string name="enter_ports">Nhập số cổng</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Kích hoạt nhật ký gỡ lỗi ở đầu ra (phải dùng adb hoặc aLogCat để xem)</string> - <string name="project_home">Các trang chủ dự án:</string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_home">Trang chủ dự án:</string> + <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">Phần mềm bên thứ 3:</string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> @@ -127,7 +127,7 @@ <string name="hidden_service_request">Một ứng dụng muốn mở máy chủ onion ở cổng %1$s vào mạng Tor. Việc này là an toàn nếu bạn tin tưởng ứng dụng đó.</string> <string name="openssl_version">OpenSSL: http://www.openssl.org</string> <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string> - <string name="wizard_details_msg">Orbot là một ứng dụng mã nguồn mở chứa Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Nó cung cấp một proxy HTTP cục bộ (8118) và một proxy SOCKS (9050) vào mạng Tor. Orbot cũng có khả năng, trên thiết bị đã root, gửi tất cả lưu lượng mạng qua Tor.</string> + <string name="wizard_details_msg">Orbot là một ứng dụng mã nguồn mở chứa Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Nó cung cấp một proxy HTTP cục bộ (8118) và một proxy SOCKS (9050) vào mạng Tor.</string> <string name="be_a_snowflake_desc">Cho phép những người dùng Tor khác kết nối đến Tor qua thiết bị của bạn</string> <string name="be_a_snowflake_title">Chạy proxy Snowflake</string> <string name="bridge_snowflake">Kết nối qua các thiết bị Tor ngang hàng khác (thử nghiệm)</string> @@ -214,7 +214,9 @@ <string name="vpn_default_world">Toàn cầu (Tự động)</string> <string name="apps_mode">Chế độ VPN</string> <string name="get_bridges_email_request">Yêu cầu cầu nối qua Email</string> - <string name="be_a_snowflake_desc_limit">Chỉ khi thiết bị được cắm điện và có Wi-Fi</string> + <string name="be_a_snowflake_desc_limit">Chỉ khi thiết bị đang sạc và có Wi-Fi</string> <string name="be_a_snowflake_title_limit">Giới hạn Proxy Snowflake</string> - <string name="snowflake_proxy_enabled">CHẾ ĐỘ PROXY SNOWFLAKE ĐÃ BẬT</string> + <string name="snowflake_proxy_enabled">Chế độ proxy Snowflake đang bật</string> + <string name="version">Phiên bản:</string> + <string name="license">Giấy phép:</string> </resources> \ No newline at end of file

1 0

[orbot/master] Translated using Weblate (Ukrainian)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 32753b41bda15ac705311d4baf2c1aeffc16d358 Author: Ihor Hordiichuk <igor_ck(a)outlook.com> Date: Fri Dec 3 08:50:52 2021 +0100 Translated using Weblate (Ukrainian) Currently translated at 100.0% (211 of 211 strings) Co-authored-by: Ihor Hordiichuk <igor_ck(a)outlook.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/uk/ Translation: Guardian Project/Orbot --- app/src/main/res/values-uk/strings.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7bae74ea..ef4c8e4c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -18,7 +18,7 @@ <string name="menu_scan">Сканувати BridgeQR</string> <string name="menu_share_bridge">Поділитися BridgeQR</string>  - <string name="wizard_details_msg">Orbot — це програма з відкритим кодом, яка містить Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Він забезпечує локальний HTTP-проксі (8118) та проксі SOCKS (9050) у мережу Tor. Orbot також має здатність, на кореневому пристрої, відправляти весь інтернет-трафік через Tor.</string> + <string name="wizard_details_msg">Orbot — це застосунок з відкритим кодом, що містить Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Він забезпечує локальний HTTP-проксі (8118) та проксі SOCKS (9050) у мережу Tor.</string>  <string name="pref_general_group">Основні</string> <string name="pref_start_boot_title">Запуск Orbot при ввімкненні</string> @@ -81,8 +81,8 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Порти доступні із обмежуваного брандмауера</string> <string name="enter_ports">Введіть порти</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Увімкнути вивід журналу зневадження (потрібно використовувати adb або aLogCat для перегляду)</string> - <string name="project_home">Домашня сторінка(и) проєкту:</string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_home">Домівка проєкту:</string> + <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">Програми сторонніх розробників: </string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> @@ -204,17 +204,19 @@ <string name="v3_backup_name_hint">Назва файлу резервної копії…</string> <string name="v3_delete_client_authorization_confirm">Видалити авторизацію клієнта</string> <string name="v3_delete_client_authorization">Видалити ключ авторизації клієнта</string> - <string name="v3_backup_key_warning">Попередження. Це може відкрити ваш ключ для інших програм</string> + <string name="v3_backup_key_warning">Попередження: Це може відкрити ваш ключ для інших застосунків</string> <string name="v3_backup_key">Резервне копіювання ключа авторизації клієнта</string> <string name="v3_onion">Домен .onion v3</string> - <string name="v3_key_hash">x25519 Закритий ключ у базі 32</string> + <string name="v3_key_hash">x25519 Закритий ключ у Base32</string> <string name="v3_client_auth_activity_title">Авторизація клієнта v3</string> <string name="v3_client_auth">Авторизація клієнта служби Onion v3</string> <string name="v3_hosted_services">Хостинг служб Onion v3</string> <string name="deny">Заборонити</string> <string name="allow">Длзволити</string> <string name="backup_port_exist">Помилка: служба Onion вже використовує порт %s</string> - <string name="be_a_snowflake_desc_limit">Тільки коли пристрій під\'єднано до мережі Wi-Fi</string> + <string name="be_a_snowflake_desc_limit">Тільки коли пристрій заряджається і під\'єднаний до мережі Wi-Fi</string> <string name="be_a_snowflake_title_limit">Обмеження проксі Snowflake</string> - <string name="snowflake_proxy_enabled">РЕЖИМ SNOWFLAKE-ПРОКСІ УВІМКНЕНО</string> + <string name="snowflake_proxy_enabled">Режим Snowflake-проксі увімкнено</string> + <string name="version">Версія:</string> + <string name="license">Ліцензія:</string> </resources> \ No newline at end of file

1 0

[orbot/master] Merge pull request #551 from guardianproject/fix_549_no_snowflake_and_bridge_ui
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 34f4de6d98eaf7ec19dd30d5ca0187a52e5ac5c5 Merge: 9cf66800 a1d04487 Author: bitmold <dsnake(a)protonmail.com> Date: Tue Dec 14 18:38:34 2021 -0500 Merge pull request #551 from guardianproject/fix_549_no_snowflake_and_bridge_ui Fixes #549 snowflake preferences are greyed out when bridges are in use app/src/main/res/values/strings.xml | 3 ++- app/src/main/res/xml/preferences.xml | 2 +- .../org/torproject/android/core/ui/SettingsPreferencesActivity.kt | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-)

1 0

[orbot/master] Translated using Weblate (Chinese (Simplified))
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 3d8182ecda4bee0c308ff76a5432acfb97236a92 Author: Eric <spice2wolf(a)gmail.com> Date: Fri Dec 3 08:50:53 2021 +0100 Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (211 of 211 strings) Translated using Weblate (Chinese (Simplified)) Currently translated at 99.0% (209 of 211 strings) Co-authored-by: Eric <spice2wolf(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/zh_Hans/ Translation: Guardian Project/Orbot --- app/src/main/res/values-zh-rCN/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a6979c54..6c863a8d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -214,7 +214,9 @@ <string name="deny">拒绝</string> <string name="allow">允许</string> <string name="backup_port_exist">错误：一个 Onion 服务已经在使用端口 %s</string> - <string name="be_a_snowflake_desc_limit">仅当设备接通电源并连接到 wifi 时</string> + <string name="be_a_snowflake_desc_limit">仅当设备接通电源并连接到 Wi-Fi 时</string> <string name="be_a_snowflake_title_limit">Snowflake 代理限制</string> <string name="snowflake_proxy_enabled">SNOWFLAKE 代理模式已启用</string> + <string name="license">许可证：</string> + <string name="version">版本：</string> </resources> \ No newline at end of file

1 0

[orbot/master] Translated using Weblate (Turkish)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2f23db8563d2880398a17e257c5a1dff1ea0051f Author: Oğuz Ersen <oguzersen(a)protonmail.com> Date: Fri Dec 3 08:50:52 2021 +0100 Translated using Weblate (Turkish) Currently translated at 100.0% (211 of 211 strings) Co-authored-by: Oğuz Ersen <oguzersen(a)protonmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/tr/ Translation: Guardian Project/Orbot --- app/src/main/res/values-tr/strings.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c55bee2c..eeeb4915 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -18,7 +18,7 @@ <string name="menu_scan">QR kodu tara</string> <string name="menu_share_bridge">QR kodu paylaş</string>  - <string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm internet trafiğini Tor üzerinden gönderebilir.</string> + <string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar.</string>  <string name="pref_general_group">Genel</string> <string name="pref_start_boot_title">Orbot Açılışta Başlatılsın</string> @@ -81,8 +81,8 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Kısıtlanmış bir güvenlik duvarından erişilebilir bağlantı noktaları</string> <string name="enter_ports">Bağlantı noktalarını girin</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">hata ayıklama günlüğü etkinleştirilsin (görüntülemek için adb ya da aLogCat gerekir)</string> - <string name="project_home">Proje Adres(ler)i:</string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_home">Proje Ana Sayfası:</string> + <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">Üçüncü Taraf Yazılım:</string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> @@ -204,7 +204,7 @@ <string name="v3_backup_name_hint">Yedekleme dosyası adı…</string> <string name="v3_delete_client_authorization_confirm">İstemci Yetkilendirmesini Sil</string> <string name="v3_delete_client_authorization">İstemci Yetkilendirme Anahtarını Sil</string> - <string name="v3_backup_key_warning">Uyarı: Bu, Diğer Uygulamaların Anahtarınıza Erişebilmesine Neden Olabilir</string> + <string name="v3_backup_key_warning">Uyarı: Bu, diğer uygulamaların anahtarınıza erişebilmesine neden olabilir</string> <string name="v3_backup_key">İstemci Yetkilendirme Anahtarını Yedekle</string> <string name="v3_onion">v3 .onion Etki Alanı</string> <string name="v3_key_hash">Base 32 olarak x25519 Özel Anahtarı</string> @@ -213,8 +213,10 @@ <string name="v3_hosted_services">Barındırılan v3 Onion Hizmetleri</string> <string name="deny">Reddet</string> <string name="allow">İzin ver</string> - <string name="backup_port_exist">Hata: Bir Onion Hizmeti Zaten %s Bağlantı Noktasını Kullanıyor</string> + <string name="backup_port_exist">Hata: Bir Onion hizmeti zaten %s bağlantı noktasını kullanıyor</string> <string name="be_a_snowflake_title_limit">Snowflake Vekil Sınırları</string> <string name="be_a_snowflake_desc_limit">Yalnızca aygıt prize takılı ve kablosuz ağa bağlıysa</string> - <string name="snowflake_proxy_enabled">SNOWFLAKE VEKİL MODU ETKIN</string> + <string name="snowflake_proxy_enabled">Snowflake vekil modu etkin</string> + <string name="version">Sürüm:</string> + <string name="license">Lisans:</string> </resources> \ No newline at end of file

1 0

[orbot/master] Closes #554, IPtProxy 1.3.0 added
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c984dcc5254eda6a55e91a6d5bfe74023fb60978 Author: b <dsnake(a)protonmail.com> Date: Tue Dec 14 18:29:43 2021 -0500 Closes #554, IPtProxy 1.3.0 added --- dependencies.gradle | 2 +- .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 555c4977..c9b4f783 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -20,7 +20,7 @@ ext { guardian_geoip : "20191217", guardian_jsocks : "1.0.4", guardian_jtorctl : "0.4.5.7", - ipt_proxy : "1.2.0", + ipt_proxy : "1.3.0", portmapper : "2.0.5", tor_android : "0.4.6.7" ] diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 1b15e0da..495e2739 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -354,10 +354,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String target = getCdnFront("snowflake-target"); String front = getCdnFront("snowflake-front"); String stunServer = getCdnFront("snowflake-stun"); + String ampCache = "https://cdn.ampproject.org/"; - IPtProxy.startSnowflake(stunServer, target, front, + IPtProxy.startSnowflake(stunServer, target, front, ampCache, null, true, false, true, 1); - } /* @@ -368,10 +368,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String broker = "https://snowflake-broker.bamsoftware.com/"; String relay = "wss://snowflake.bamsoftware.com/"; String stun = "stun:stun.stunprotocol.org:3478"; + String natProbe = null; String logFile = null; boolean keepLocalAddresses = true; boolean unsafeLogging = false; - IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, keepLocalAddresses, unsafeLogging); + IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, null); logNotice("Snowflake Proxy mode ENABLED"); }

1 0

[orbot/master] for now, disable snowflake proxy limiting
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9cf66800aa9b6378460499e66fac27773ad46058 Author: b <dsnake(a)protonmail.com> Date: Tue Dec 14 18:06:38 2021 -0500 for now, disable snowflake proxy limiting --- app/src/main/res/xml/preferences.xml | 10 +++++----- .../java/org/torproject/android/service/OrbotService.java | 11 +---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 28e06052..c1fb75ae 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -297,11 +297,11 @@ android:key="pref_be_a_snowflake" android:title="@string/be_a_snowflake_title" android:summary="@string/be_a_snowflake_desc" /> - <CheckBoxPreference - android:defaultValue="true" - android:key="pref_be_a_snowflake_limit" - android:title="@string/be_a_snowflake_title_limit" - android:summary="@string/be_a_snowflake_desc_limit" /> + + + + + </PreferenceCategory> </PreferenceScreen> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 4b9a12e6..1b15e0da 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1412,16 +1412,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb else if (useIPtSnowflakeProxy()) startSnowflakeClient(); } else if (Prefs.beSnowflakeProxy()) { - - if (Prefs.limitSnowflakeProxying()) - { - if (isChargingAndWifi(OrbotService.this)) - { - enableSnowflakeProxy(); - } - - } - else +// if (Prefs.limitSnowflakeProxying()) { enableSnowflakeProxy(); }

1 0

[orbot/master] Experimental show snowflake toast when client connects to proxy...
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 798ef6eb5d00007f8d0b7b147841061821d8a091 Author: b <dsnake(a)protonmail.com> Date: Tue Dec 14 18:39:18 2021 -0500 Experimental show snowflake toast when client connects to proxy... --- app/src/main/res/values/strings.xml | 3 +++ app/src/main/res/xml/preferences.xml | 7 +++++++ .../android/core/ui/SettingsPreferencesActivity.kt | 1 + .../java/org/torproject/android/service/OrbotService.java | 13 ++++++++++--- .../java/org/torproject/android/service/util/Prefs.java | 5 +++++ orbotservice/src/main/res/values/strings.xml | 3 +++ 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3a43f01..9ba83a26 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -259,6 +259,9 @@ <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> <string name="snowflake_proxy_enabled">SNOWFLAKE PROXY MODE ENABLED</string> + <string name="snowflake_proxy_msg_title">Show Connection Notification</string> + <string name="snowflake_proxy_msg_description">Show a message when your snowflake helps someone circumvent censorship</string> + </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index a05bce87..60619894 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -297,6 +297,13 @@ android:key="pref_be_a_snowflake" android:title="@string/be_a_snowflake_title" android:summary="@string/be_a_snowflake_desc" /> + + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_show_snowflake_proxy_msg" + android:title="@string/snowflake_proxy_msg_title" + android:summary="@string/snowflake_proxy_msg_description"/> +    diff --git a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt index 79f00544..5fe575ad 100644 --- a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt +++ b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt @@ -35,6 +35,7 @@ class SettingsPreferencesActivity : PreferenceActivity() { val bridgesEnabled = getSharedPreferences("org.torproject.android_preferences", MODE_MULTI_PROCESS).getBoolean("pref_bridges_enabled", false) findPreference("pref_be_a_snowflake")?.isEnabled = !bridgesEnabled findPreference("pref_be_a_snowflake_limit")?.isEnabled = !bridgesEnabled + findPreference("pref_show_snowflake_proxy_msg")?.isEnabled = !bridgesEnabled } override fun attachBaseContext(newBase: Context) = super.attachBaseContext(LocaleHelper.onAttach(newBase)) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 495e2739..8520a815 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -36,6 +36,7 @@ import android.os.IBinder; import android.provider.BaseColumns; import android.text.TextUtils; import android.util.Log; +import android.widget.Toast; import net.freehaven.tor.control.TorControlCommands; import net.freehaven.tor.control.TorControlConnection; @@ -74,7 +75,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; import IPtProxy.IPtProxy; - +import IPtProxy.SnowflakeClientConnected; import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; @@ -372,8 +373,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String logFile = null; boolean keepLocalAddresses = true; boolean unsafeLogging = false; - IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, null); - + SnowflakeClientConnected callback = null; + if (Prefs.showSnowflakeProxyMessage()) { + callback = (SnowflakeClientConnected) () -> { + String message = String.format(getString(R.string.snowflake_proxy_client_connected_msg), "❄️", "❄️"); + Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + }; + } + IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, callback); logNotice("Snowflake Proxy mode ENABLED"); } diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index eaec24e5..d12cc6a6 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -21,6 +21,7 @@ public class Prefs { private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; private final static String PREF_BE_A_SNOWFLAKE = "pref_be_a_snowflake"; + private final static String PREF_SHOW_SNOWFLAKE_MSG = "pref_show_snowflake_proxy_msg"; private final static String PREF_BE_A_SNOWFLAKE_LIMIT = "pref_be_a_snowflake_limit"; private final static String PREF_HOST_ONION_SERVICES = "pref_host_onionservices"; @@ -78,6 +79,10 @@ public class Prefs { return prefs.getBoolean(PREF_BE_A_SNOWFLAKE,false); } + public static boolean showSnowflakeProxyMessage() { + return prefs.getBoolean(PREF_SHOW_SNOWFLAKE_MSG, false); + } + public static void setBeSnowflakeProxy (boolean beSnowflakeProxy) { putBoolean(PREF_BE_A_SNOWFLAKE,beSnowflakeProxy); } diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index 80f80ca3..78e527d4 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -25,5 +25,8 @@ <string name="kibibyte_per_second">KiB/s</string> <string name="mebibyte_per_second">MiB/s</string> + <string name="snowflake_proxy_client_connected_msg">%s Your snowflake proxy helped someone circumvent censorship %s</string> + + </resources>

1 0

[orbot/master] Snowflake proxy uses defaults in IPtProxy, displays cute toast when user connects. activity text for snowflake proxy isn't in ALL CAPS anymore
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 50ef12d356d0a0548f12edc0c028da2dfc6820c5 Author: b <dsnake(a)protonmail.com> Date: Wed Dec 15 17:14:22 2021 -0500 Snowflake proxy uses defaults in IPtProxy, displays cute toast when user connects. activity text for snowflake proxy isn't in ALL CAPS anymore --- app/src/main/res/values/strings.xml | 2 +- .../java/org/torproject/android/service/OrbotService.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ba83a26..dfdb38ce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -258,7 +258,7 @@ <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> - <string name="snowflake_proxy_enabled">SNOWFLAKE PROXY MODE ENABLED</string> + <string formatted="true" name="snowflake_proxy_enabled">Snowflake proxy mode enabled</string> <string name="snowflake_proxy_msg_title">Show Connection Notification</string> <string name="snowflake_proxy_msg_description">Show a message when your snowflake helps someone circumvent censorship</string> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 8520a815..8fef4543 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -355,10 +355,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String target = getCdnFront("snowflake-target"); String front = getCdnFront("snowflake-front"); String stunServer = getCdnFront("snowflake-stun"); - String ampCache = "https://cdn.ampproject.org/"; + String ampCache = null; // getCdnFront("snowflake-ampcache"); IPtProxy.startSnowflake(stunServer, target, front, ampCache, - null, true, false, true, 1); + null, true, false, false, 1); } /* @@ -366,9 +366,9 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb */ private void enableSnowflakeProxy () { int capacity = 1; - String broker = "https://snowflake-broker.bamsoftware.com/"; - String relay = "wss://snowflake.bamsoftware.com/"; - String stun = "stun:stun.stunprotocol.org:3478"; + String broker = null; // "https://snowflake-broker.bamsoftware.com/"; + String relay = null; // "wss://snowflake.bamsoftware.com/"; + String stun = null; // "stun:stun.stunprotocol.org:3478"; String natProbe = null; String logFile = null; boolean keepLocalAddresses = true; @@ -377,7 +377,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (Prefs.showSnowflakeProxyMessage()) { callback = (SnowflakeClientConnected) () -> { String message = String.format(getString(R.string.snowflake_proxy_client_connected_msg), "❄️", "❄️"); - Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + new Handler(getMainLooper()).post(() -> Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show()); }; } IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, callback);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
147
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2021