From 6fb773875736a47e465ad7cb1554874ec1cd15e1 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Wed, 2 Mar 2016 10:28:06 +0100 Subject: Fixes FS#146: Remove Tor-Support --- src/main/java/eu/siacs/conversations/Config.java | 1 - .../java/eu/siacs/conversations/entities/Account.java | 4 ---- .../siacs/conversations/http/HttpDownloadConnection.java | 16 ++-------------- .../siacs/conversations/http/HttpUploadConnection.java | 11 +++-------- .../conversations/services/XmppConnectionService.java | 4 ---- .../eu/siacs/conversations/ui/EditAccountActivity.java | 4 +--- .../java/eu/siacs/conversations/ui/SettingsActivity.java | 10 ---------- .../eu/siacs/conversations/utils/SocksSocketFactory.java | 4 ---- .../java/eu/siacs/conversations/xmpp/XmppConnection.java | 15 +-------------- .../conversations/xmpp/jingle/JingleSocks5Transport.java | 12 ++++-------- src/main/res/layout/activity_edit_account.xml | 2 +- src/main/res/values-bg/strings.xml | 3 --- src/main/res/values-cs/strings.xml | 3 --- src/main/res/values-de/strings.xml | 3 --- src/main/res/values-es/strings.xml | 3 --- src/main/res/values-eu/strings.xml | 3 --- src/main/res/values-fr/strings.xml | 3 --- src/main/res/values-it/strings.xml | 3 --- src/main/res/values-iw/strings.xml | 2 -- src/main/res/values-ja/strings.xml | 3 --- src/main/res/values-ko/strings.xml | 3 --- src/main/res/values-nb-rNO/strings.xml | 3 --- src/main/res/values-nl/strings.xml | 3 --- src/main/res/values-pl/strings.xml | 3 --- src/main/res/values-pt-rBR/strings.xml | 3 --- src/main/res/values-ro-rRO/strings.xml | 3 --- src/main/res/values-ru/strings.xml | 3 --- src/main/res/values-sr/strings.xml | 3 --- src/main/res/values-sv/strings.xml | 3 --- src/main/res/values-tr-rTR/strings.xml | 3 --- src/main/res/values-vi/strings.xml | 3 --- src/main/res/values-zh-rCN/strings.xml | 3 --- src/main/res/values/strings.xml | 3 --- src/main/res/xml/preferences.xml | 7 +------ 34 files changed, 13 insertions(+), 142 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 0066074e..553abb9c 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -49,7 +49,6 @@ public final class Config { public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true - public static final boolean FORCE_ORBOT = false; // always use TOR public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = false; public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index 1931988d..6791f417 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -255,10 +255,6 @@ public class Account extends AbstractEntity { return this.hostname == null ? "" : this.hostname; } - public boolean isOnion() { - return getServer().toString().toLowerCase().endsWith(".onion"); - } - public void setPort(int port) { this.port = port; } diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 00416c94..1470d250 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -44,13 +44,11 @@ public class HttpDownloadConnection implements Transferable { private int mStatus = Transferable.STATUS_UNKNOWN; private boolean acceptedAutomatically = false; private int mProgress = 0; - private boolean mUseTor = false; private boolean canceled = false; public HttpDownloadConnection(HttpConnectionManager manager) { this.mHttpConnectionManager = manager; this.mXmppConnectionService = manager.getXmppConnectionService(); - this.mUseTor = mXmppConnectionService.useTorToConnect(); } @Override @@ -200,12 +198,7 @@ public class HttpDownloadConnection implements Transferable { try { Logging.d(Config.LOGTAG, "retrieve file size. interactive:" + String.valueOf(interactive)); changeStatus(STATUS_CHECKING); - HttpURLConnection connection; - if (mUseTor) { - connection = (HttpURLConnection) mUrl.openConnection(mHttpConnectionManager.getProxy()); - } else { - connection = (HttpURLConnection) mUrl.openConnection(); - } + HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection(); connection.setRequestMethod("HEAD"); Logging.d(Config.LOGTAG, "url: "+connection.getURL().toString()); Logging.d(Config.LOGTAG, "connection: "+connection.toString()); @@ -260,12 +253,7 @@ public class HttpDownloadConnection implements Transferable { PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_download_"+message.getUuid()); try { wakeLock.acquire(); - HttpURLConnection connection; - if (mUseTor) { - connection = (HttpURLConnection) mUrl.openConnection(mHttpConnectionManager.getProxy()); - } else { - connection = (HttpURLConnection) mUrl.openConnection(); - } + HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection(); if (connection instanceof HttpsURLConnection) { mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive); } diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java index b16d9f79..4842a218 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java @@ -49,7 +49,6 @@ public class HttpUploadConnection implements Transferable { private String mime; private URL mGetUrl; private URL mPutUrl; - private boolean mUseTor = false; private byte[] key = null; @@ -60,7 +59,6 @@ public class HttpUploadConnection implements Transferable { public HttpUploadConnection(HttpConnectionManager httpConnectionManager) { this.mHttpConnectionManager = httpConnectionManager; this.mXmppConnectionService = httpConnectionManager.getXmppConnectionService(); - this.mUseTor = mXmppConnectionService.useTorToConnect(); } @Override @@ -163,12 +161,9 @@ public class HttpUploadConnection implements Transferable { try { wakeLock.acquire(); Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString()); - if (mUseTor) { - connection = (HttpURLConnection) mPutUrl.openConnection(mHttpConnectionManager.getProxy()); - } else { - connection = (HttpURLConnection) mPutUrl.openConnection(); - } - if (connection instanceof HttpsURLConnection) { + connection = (HttpURLConnection) mPutUrl.openConnection(); + + if (connection instanceof HttpsURLConnection) { mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, true); } connection.setRequestMethod("PUT"); diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index e43ef062..b782b007 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2402,10 +2402,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa return getPreferences().getBoolean("autojoin", true); } - public boolean useTorToConnect() { - return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", false); - } - public boolean showExtendedConnectionOptions() { return getPreferences().getBoolean("show_connection_options", false); } diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 2b89ea05..44bf8140 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -528,9 +528,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate } } SharedPreferences preferences = getPreferences(); - boolean useTor = Config.FORCE_ORBOT || preferences.getBoolean("use_tor", false); - this.mShowOptions = useTor || preferences.getBoolean("show_connection_options", false); - mHostname.setHint(useTor ? R.string.hostname_or_onion : R.string.hostname_example); + this.mShowOptions = preferences.getBoolean("show_connection_options", false); this.mNamePort.setVisibility(mShowOptions ? View.VISIBLE : View.GONE); } diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index 014991ce..852699e6 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -62,14 +62,6 @@ public class SettingsActivity extends XmppActivity implements } } - if (Config.FORCE_ORBOT) { - PreferenceCategory connectionOptions = (PreferenceCategory) mSettingsFragment.findPreference("connection_options"); - PreferenceScreen expert = (PreferenceScreen) mSettingsFragment.findPreference("expert"); - if (connectionOptions != null) { - expert.removePreference(connectionOptions); - } - } - final Preference removeCertsPreference = mSettingsFragment.findPreference("remove_trusted_certificates"); removeCertsPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override @@ -175,8 +167,6 @@ public class SettingsActivity extends XmppActivity implements } else if (name.equals("dont_trust_system_cas")) { xmppConnectionService.updateMemorizingTrustmanager(); reconnectAccounts(); - } else if (name.equals("use_tor")) { - reconnectAccounts(); } else if ("parse_emoticons".equals(name)) { EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS); } diff --git a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java index 768e9f17..04cfa2eb 100644 --- a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java +++ b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java @@ -43,10 +43,6 @@ public class SocksSocketFactory { return socket; } - public static Socket createSocketOverTor(String destination, int port) throws IOException { - return createSocket(new InetSocketAddress(InetAddress.getLocalHost(), 9050), destination, port); - } - static class SocksConnectionException extends IOException { } diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 2653e5f3..fa381668 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -245,19 +245,8 @@ public class XmppConnection implements Runnable { tagReader = new XmlReader(wakeLock); tagWriter = new TagWriter(); this.changeStatus(Account.State.CONNECTING); - final boolean useTor = mXmppConnectionService.useTorToConnect() || account.isOnion(); final boolean extended = mXmppConnectionService.showExtendedConnectionOptions(); - if (useTor) { - String destination; - if (account.getHostname() == null || account.getHostname().isEmpty()) { - destination = account.getServer().toString(); - } else { - destination = account.getHostname(); - } - Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": connect to " + destination + " via TOR"); - socket = SocksSocketFactory.createSocketOverTor(destination, account.getPort()); - startXmpp(); - } else if (extended && account.getHostname() != null && !account.getHostname().isEmpty()) { + if (extended && account.getHostname() != null && !account.getHostname().isEmpty()) { socket = new Socket(); try { socket.connect(new InetSocketAddress(account.getHostname(), account.getPort()), Config.SOCKET_TIMEOUT * 1000); @@ -332,8 +321,6 @@ public class XmppConnection implements Runnable { this.changeStatus(Account.State.UNAUTHORIZED); } catch (final UnknownHostException | ConnectException e) { this.changeStatus(Account.State.SERVER_NOT_FOUND); - } catch (final SocksSocketFactory.SocksProxyNotFoundException e) { - this.changeStatus(Account.State.TOR_NOT_AVAILABLE); } catch (final IOException | XmlPullParserException | NoSuchAlgorithmException e) { Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage()); this.changeStatus(Account.State.OFFLINE); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java index 6400f123..76cd0c87 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java @@ -59,14 +59,10 @@ public class JingleSocks5Transport extends JingleTransport { @Override public void run() { try { - final boolean useTor = connection.getAccount().isOnion() || connection.getConnectionManager().getXmppConnectionService().useTorToConnect(); - if (useTor) { - socket = SocksSocketFactory.createSocketOverTor(candidate.getHost(),candidate.getPort()); - } else { - socket = new Socket(); - SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort()); - socket.connect(address,Config.SOCKET_TIMEOUT * 1000); - } + socket = new Socket(); + SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort()); + socket.connect(address,Config.SOCKET_TIMEOUT * 1000); + inputStream = socket.getInputStream(); outputStream = socket.getOutputStream(); SocksSocketFactory.createSocksConnection(socket,destination,0); diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 4d0e6056..cf49b3ac 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -102,7 +102,7 @@ android:id="@+id/hostname" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:hint="@string/hostname_or_onion" + android:hint="@string/hostname_example" android:inputType="textNoSuggestions" android:textColor="@color/primaryText" android:textColorHint="@color/secondaryText" diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index a2acb210..62e390ab 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -520,11 +520,8 @@ Ключът за OMEMO беше потвърден със сертификат! Устройството Ви не поддържа избраните клиентски сертификати! Връзка - Свързване през Тор - Всички връзки да минават през мрежата на Тор. Изисква Орбот Име на сървър Порт - Адрес на сървър или .onion Това не е правилен номер на порт Това не е правилно име на сървър %1$d от %2$d свързани профила diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 69f132b6..91fa2464 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -522,11 +522,8 @@ OMEMO klíč ověřen certifikátem! Tento přístroj nepodporuje výběr klientského certifikátu! Připojení - Připojit přes Tor - Vedení všech připojení po Tor síti vyžaduje aplikaci Orbot Hostname Port - Server- nebo .onion-adresa Toto není platné číslo portu Toto není platné hostname %1$d z %2$d účtů připojeno diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 8d1accc1..f91bf1dd 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -582,11 +582,8 @@ OMEMO Schlüssel mit Zertifikat bestätigt! Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht! Verbindung - Über TOR verbinden - Alle Verbindungen über das Tor-Netzwerk tunneln. Benötigt Orbot Hostname Port - Server- oder .onion-Adresse Dies ist keine gültige Port-Nummer Dies ist kein gültiger Hostname %1$d von %2$d Konten verbunden diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 6d6ca48f..18d9218d 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -520,11 +520,8 @@ ¡Clave OMEMO con certificado verificada! ¡Tu dispositivo no soporta la elección de certificados de cliente! Conexión - Conectar via Tor - Todas las conexiones se realizan a través de la red TOR. Requiere Orbot Hostname Puerto - Server- or .onion-Address Éste no es un número de puerto válido Éste no es un hostame válido %1$d de %2$d cuentas conectadas diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 9065217d..d27c304c 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -520,11 +520,8 @@ OMEMO gakoa ziurtagiriarekin egiaztatuta! Zure gailuak ez du bezero ziurtagiriak aukeratzea onartzen! Konexioa - Tor bidez konektatu - Konexio guztiak Tor sarean zehar igaro. Orbot behar du Ostalariaren izena Ataka - Zerbitzari- edo .onion-helbidea Hau ez da ataka zenbaki balioduna Hau ez da ostalari izen balioduna %2$dtik %1$d kontu konektatuta diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 2d50465e..2a689797 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -520,11 +520,8 @@ Clef OMEMO vérifiée avec un certificat ! Votre appareil ne supporte pas la sélection de certificats client ! Connexion - Connection via Tor - Rediriger toutes les connexions via le réseau Tor. Nécessite Orbot. Nom d\'hôte Port - Adresse du serveur ou .onion Ce numéro de port n\'est pas valide Ce nom d\'hôte n\'est pas valide %1$d compte(s) sur %2$d connecté(s) diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 9bd78d0d..5fac85d0 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -507,11 +507,8 @@ Chiave OMEMO verificata con certificato! Il tuo dispositivo non supporta la selezione di certificati utente! Opzioni di connessione - Connettiti via Tor - Indirizza tutte le connessioni attraverso la rete Tor. Richiede Orbot Nome host Porta - Indirizzo server o .onion Questo non è un numero di porta valido Questo non è un nome host valido %1$d su %2$d account connessi diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 8f030b27..3f52ad4c 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -482,10 +482,8 @@ אין התאמה בין מזהה Jabber לבין תעודה חידוש תעודה שגיאה בתפיסת OMEMO! - התחבר דרך Tor שם מארח פורט - שרת- או כתובת onion. זהו אינו מספר פורט תקין זהו אינו שם מארח תקין %1$d מתוך %2$d חשבונות מחוברים diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 63a08fb4..57289f5a 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -518,11 +518,8 @@ OMEMO 鍵の取得中にエラー! お使いのデバイスはクライアント証明書の選択をサポートしていません! 接続 - Tor 経由で接続 - Tor ネットワークを介してすべての接続をトンネルします。 Orbot が必要です ホスト名 ポート - サーバーまたは .onion アドレス これは有効なポート番号ではありません これは有効なホスト名ではありません %1$d / %2$d アカウントが接続しました diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 0931f7f6..ec730843 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -498,11 +498,8 @@ OMEMO key를 가져오는 도중 오류가 발생했습니다 OMEMO 키와 인증서 검증됨 기기가 선택된 클라이언트 인증서를 지원하지 않습니다 - Tor를 통해 접속 - 모든 연결을 Tor 네트워크를 통하도록 유도함. Orbot이 필요합니다 호스트 이름 포트 - 서버 또는 .onion 주소 올바른 포트 번호가 아닙니다 올바른 호스트 이름이 아닙니다 %2$d 중 %1$d 계정이 연결되었습니다 diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 5d0cd818..47d7334d 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -507,11 +507,8 @@ Bekreftet OMEMO-nøkkel med sertifikat! Din enhet støtter ikke valg av klientsertifikat! Tilkoblingsalternativ - Koble til via Tor - Send alle tilkoblinger i tunnel gjennom Tor-nettverket. Krever Orbot Tjenernavn Port - Tjener- eller .onion-adresse Dette er ikke et gyldig portnummer Dette er ikke et gyldig tjenernavn %1$d av %2$d kontoer tilkoblet diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 77435034..33018c9d 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -520,11 +520,8 @@ OMEMO-sleutel geverifieerd met certificaat! Je apparaat ondersteunt de selectie van cliënt-certificaten niet! Verbinding - Verbinden via Tor - Tunnel alle verbindingen door het Tor-netwerk. Vereist Orbot Hostnaam Poort - Server- of .onion-adres Dit is geen geldig poortnummer Dit is geen geldige hostnaam %1$d van %2$d accounts verbonden diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index b9e2f7cd..76d8db62 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -507,11 +507,8 @@ Błąd pobierania klucza OMEMO! Zweryfikowano klucz OMEMO z certyfikatem Twoje urządzenie nie wspiera wyboru certyfikatów klienckich - Połącz przez sieć TOR - Tuneluj wszystkie połączenia przez sieć TOR. Wymaga zainstalowania aplikacji \"Orbot\" Nazwa hosta Port - Adres serwera lub \".onion\" adres To nie jest prawidłowy numer portu To nie jest prawidłowa nazwa hosta %1$d z %2$d kont połączonych diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 00828057..0b8b0080 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -522,11 +522,8 @@ A chave OMEMO foi verificada com o certificado. O seu dispositivo não suporta a seleção de certificados de clientes. Conexão - Conectar via Tor - Faça o tunelamento de todas as conexões através de redes Tor. Necessita do Orbot. Nome do host Porta - Server- ou .onion-Address Esse número de porta não é válido Esse nome de host não é válido %1$d de %2$d contas conectadas diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index 76a9fe69..e55b21f2 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -522,11 +522,8 @@ Verifica cheia OMEMO cu un certificat Dispozitivul nu permite selectia unui certificat pentru client! Optiuni conexiune - Conectare prin TOR - Trimite toate conexiunile prin reteaua Tor. Necesita OrBot Nume gazda Port - Adresa server- sau .onion Acesta nu este un numar de port valabil Acesta nu este un nume de gazda valabila %1$d din %2$d conturi conectate diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 21c341f9..e2ef9436 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -501,11 +501,8 @@ Ошибка при получении OMEMO ключа! Проверен OMEMO ключ с сертификатом! Ваше устройство не поддерживает выбор клиентских сертификатов! - Соединение через Tor - Направить все соединения через сеть TOR. Требуется Orbot Имя сервера Порт - Сервер- или .onion-Адрес Это недопустимый номер порта Это недопустимое имя сервера %1$d из %2$d аккаунтов соединены diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index ceb23bf7..92f5a933 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -511,11 +511,8 @@ Оверен ОМЕМО кључ помоћу сертификата! Ваш уређај не подржава избор сертификата клијента! Опције повезивања - Повежи се преко Тора - Тунеловање свих веза кроз Тор мрежу. Захтева Орбот Име домаћина Порт - Сервер или .onion адреса Ово није исправан број порта Ово није исправно име домаћина %1$d од %2$d налога повезано diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index ae952762..00db3f2e 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -520,11 +520,8 @@ Verifierade OMEMO-nyckel med certifikat! Din enhet stödjer inte val av klientcertifikat! Anslutning - Ansluten via Tor - Tunnla alla anslutningar genom Tor-nätverket. Kräver Orbot Servernamn Port - Server- eller .onion-adress Inte ett giltigt portnummer Inte ett giltigt servernamn %1$d av %2$d konton anslutna diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index b2478e7b..c96ab61c 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -518,11 +518,8 @@ Sertifikalı OMEMO anahtarı onaylandı! Cihazınız seçilen istemci sertifikalarını desteklemiyor! Bağlantı - Tor üzerinden bağlan - Bütün bağlantıları Tor ağı üzerinden aktar. Orbot gerekir. Sunucu adı Port - Sunucu- veya .onion-Address Bu port numarası geçerli değil Bu sunucu geçerli değil %2$d hesabın %1$ kadarı bağlandı diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 2d7511d6..2635498e 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -499,11 +499,8 @@ Lỗi nhập khoá OMEMO! Khoá OMEMO đã xác minh với chứng nhận! Thiết bị không hỗ trợ chọn lựa các chứng chỉ của máy trạm! - Kết nối đến Tor - Chuyển toàn bộ kết nối thông qua mạng Tor. Cần có Orbot Tên máy chủ Cổng - Máy chủ- hoặc địa chỉ .onion- Đây không phải là số cổng hợp lệ Đây không phải là tên máy chủ hợp lệ %1$d trên %2$d tài khoản đã kết nối diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index e6f1dd3b..4f3c79ff 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -518,11 +518,8 @@ 请用证书验证 OMEMO 密钥！ 您的设备不支持设备证书选择！ 连接 - 通过 Tor 连接 - 所有连接使用 Tor 网络隧道。需要 Orbot 主机名 端口 - 服务器 - 或者 .orion 地址 该端口号无效 该主机名无效 %2$d 个中的 %1$d 个账户已连接 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ce51d4ad..320bb6c2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -618,11 +618,8 @@ Verified OMEMO key with certificate! Your device does not support the selection of client certificates! Connection - Connect via Tor - Tunnel all connections through the Tor network. Requires Orbot Hostname Port - Server- or .onion-Address This is not a valid port number This is not a valid hostname %1$d of %2$d accounts connected diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 0cb1f759..42e2fdd8 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -192,16 +192,11 @@ android:title="@string/pref_dont_trust_system_cas_title"/> -