diff options
Diffstat (limited to '')
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 @@ <string name="verified_omemo_key_with_certificate">Ключът за OMEMO беше потвърден със сертификат!</string> <string name="device_does_not_support_certificates">Устройството Ви не поддържа избраните клиентски сертификати!</string> <string name="pref_connection_options">Връзка</string> - <string name="pref_use_tor">Свързване през Тор</string> - <string name="pref_use_tor_summary">Всички връзки да минават през мрежата на Тор. Изисква Орбот</string> <string name="account_settings_hostname">Име на сървър</string> <string name="account_settings_port">Порт</string> - <string name="hostname_or_onion">Адрес на сървър или .onion</string> <string name="not_a_valid_port">Това не е правилен номер на порт</string> <string name="not_valid_hostname">Това не е правилно име на сървър</string> <string name="connected_accounts">%1$d от %2$d свързани профила</string> 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 @@ <string name="verified_omemo_key_with_certificate">OMEMO klíč ověřen certifikátem!</string> <string name="device_does_not_support_certificates">Tento přístroj nepodporuje výběr klientského certifikátu!</string> <string name="pref_connection_options">Připojení</string> - <string name="pref_use_tor">Připojit přes Tor</string> - <string name="pref_use_tor_summary">Vedení všech připojení po Tor síti vyžaduje aplikaci Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- nebo .onion-adresa</string> <string name="not_a_valid_port">Toto není platné číslo portu</string> <string name="not_valid_hostname">Toto není platné hostname</string> <string name="connected_accounts">%1$d z %2$d účtů připojeno</string> 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 @@ <string name="verified_omemo_key_with_certificate">OMEMO Schlüssel mit Zertifikat bestätigt!</string> <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string> <string name="pref_connection_options">Verbindung</string> - <string name="pref_use_tor">Über TOR verbinden</string> - <string name="pref_use_tor_summary">Alle Verbindungen über das Tor-Netzwerk tunneln. Benötigt Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- oder .onion-Adresse</string> <string name="not_a_valid_port">Dies ist keine gültige Port-Nummer</string> <string name="not_valid_hostname">Dies ist kein gültiger Hostname</string> <string name="connected_accounts">%1$d von %2$d Konten verbunden</string> 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 @@ <string name="verified_omemo_key_with_certificate">¡Clave OMEMO con certificado verificada!</string> <string name="device_does_not_support_certificates">¡Tu dispositivo no soporta la elección de certificados de cliente!</string> <string name="pref_connection_options">Conexión</string> - <string name="pref_use_tor">Conectar via Tor</string> - <string name="pref_use_tor_summary">Todas las conexiones se realizan a través de la red TOR. Requiere Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Puerto</string> - <string name="hostname_or_onion">Server- or .onion-Address</string> <string name="not_a_valid_port">Éste no es un número de puerto válido</string> <string name="not_valid_hostname">Éste no es un hostame válido</string> <string name="connected_accounts">%1$d de %2$d cuentas conectadas</string> 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 @@ <string name="verified_omemo_key_with_certificate">OMEMO gakoa ziurtagiriarekin egiaztatuta!</string> <string name="device_does_not_support_certificates">Zure gailuak ez du bezero ziurtagiriak aukeratzea onartzen!</string> <string name="pref_connection_options">Konexioa</string> - <string name="pref_use_tor">Tor bidez konektatu</string> - <string name="pref_use_tor_summary">Konexio guztiak Tor sarean zehar igaro. Orbot behar du</string> <string name="account_settings_hostname">Ostalariaren izena</string> <string name="account_settings_port">Ataka</string> - <string name="hostname_or_onion">Zerbitzari- edo .onion-helbidea</string> <string name="not_a_valid_port">Hau ez da ataka zenbaki balioduna</string> <string name="not_valid_hostname">Hau ez da ostalari izen balioduna</string> <string name="connected_accounts">%2$dtik %1$d kontu konektatuta</string> 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 @@ <string name="verified_omemo_key_with_certificate">Clef OMEMO vérifiée avec un certificat !</string> <string name="device_does_not_support_certificates">Votre appareil ne supporte pas la sélection de certificats client !</string> <string name="pref_connection_options">Connexion</string> - <string name="pref_use_tor">Connection via Tor</string> - <string name="pref_use_tor_summary">Rediriger toutes les connexions via le réseau Tor. Nécessite Orbot.</string> <string name="account_settings_hostname">Nom d\'hôte</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Adresse du serveur ou .onion</string> <string name="not_a_valid_port">Ce numéro de port n\'est pas valide</string> <string name="not_valid_hostname">Ce nom d\'hôte n\'est pas valide</string> <string name="connected_accounts">%1$d compte(s) sur %2$d connecté(s)</string> 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 @@ <string name="verified_omemo_key_with_certificate">Chiave OMEMO verificata con certificato!</string> <string name="device_does_not_support_certificates">Il tuo dispositivo non supporta la selezione di certificati utente!</string> <string name="pref_connection_options">Opzioni di connessione</string> - <string name="pref_use_tor">Connettiti via Tor</string> - <string name="pref_use_tor_summary">Indirizza tutte le connessioni attraverso la rete Tor. Richiede Orbot</string> <string name="account_settings_hostname">Nome host</string> <string name="account_settings_port">Porta</string> - <string name="hostname_or_onion">Indirizzo server o .onion</string> <string name="not_a_valid_port">Questo non è un numero di porta valido</string> <string name="not_valid_hostname">Questo non è un nome host valido</string> <string name="connected_accounts">%1$d su %2$d account connessi</string> 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 @@ <string name="jid_does_not_match_certificate">אין התאמה בין מזהה Jabber לבין תעודה</string> <string name="action_renew_certificate">חידוש תעודה</string> <string name="error_fetching_omemo_key">שגיאה בתפיסת OMEMO!</string> - <string name="pref_use_tor">התחבר דרך Tor</string> <string name="account_settings_hostname">שם מארח</string> <string name="account_settings_port">פורט</string> - <string name="hostname_or_onion">שרת- או כתובת onion.</string> <string name="not_a_valid_port">זהו אינו מספר פורט תקין</string> <string name="not_valid_hostname">זהו אינו שם מארח תקין</string> <string name="connected_accounts">%1$d מתוך %2$d חשבונות מחוברים</string> 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 @@ <string name="verified_omemo_key_with_certificate">OMEMO 鍵の取得中にエラー!</string> <string name="device_does_not_support_certificates">お使いのデバイスはクライアント証明書の選択をサポートしていません!</string> <string name="pref_connection_options">接続</string> - <string name="pref_use_tor">Tor 経由で接続</string> - <string name="pref_use_tor_summary">Tor ネットワークを介してすべての接続をトンネルします。 Orbot が必要です</string> <string name="account_settings_hostname">ホスト名</string> <string name="account_settings_port">ポート</string> - <string name="hostname_or_onion">サーバーまたは .onion アドレス</string> <string name="not_a_valid_port">これは有効なポート番号ではありません</string> <string name="not_valid_hostname">これは有効なホスト名ではありません</string> <string name="connected_accounts">%1$d / %2$d アカウントが接続しました</string> 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 @@ <string name="error_fetching_omemo_key">OMEMO key를 가져오는 도중 오류가 발생했습니다</string> <string name="verified_omemo_key_with_certificate">OMEMO 키와 인증서 검증됨</string> <string name="device_does_not_support_certificates">기기가 선택된 클라이언트 인증서를 지원하지 않습니다</string> - <string name="pref_use_tor">Tor를 통해 접속</string> - <string name="pref_use_tor_summary">모든 연결을 Tor 네트워크를 통하도록 유도함. Orbot이 필요합니다</string> <string name="account_settings_hostname">호스트 이름</string> <string name="account_settings_port">포트</string> - <string name="hostname_or_onion">서버 또는 .onion 주소</string> <string name="not_a_valid_port">올바른 포트 번호가 아닙니다</string> <string name="not_valid_hostname">올바른 호스트 이름이 아닙니다</string> <string name="connected_accounts">%2$d 중 %1$d 계정이 연결되었습니다</string> 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 @@ <string name="verified_omemo_key_with_certificate">Bekreftet OMEMO-nøkkel med sertifikat!</string> <string name="device_does_not_support_certificates">Din enhet støtter ikke valg av klientsertifikat!</string> <string name="pref_connection_options">Tilkoblingsalternativ</string> - <string name="pref_use_tor">Koble til via Tor</string> - <string name="pref_use_tor_summary">Send alle tilkoblinger i tunnel gjennom Tor-nettverket. Krever Orbot</string> <string name="account_settings_hostname">Tjenernavn</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Tjener- eller .onion-adresse</string> <string name="not_a_valid_port">Dette er ikke et gyldig portnummer</string> <string name="not_valid_hostname">Dette er ikke et gyldig tjenernavn</string> <string name="connected_accounts">%1$d av %2$d kontoer tilkoblet</string> 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 @@ <string name="verified_omemo_key_with_certificate">OMEMO-sleutel geverifieerd met certificaat!</string> <string name="device_does_not_support_certificates">Je apparaat ondersteunt de selectie van cliënt-certificaten niet!</string> <string name="pref_connection_options">Verbinding</string> - <string name="pref_use_tor">Verbinden via Tor</string> - <string name="pref_use_tor_summary">Tunnel alle verbindingen door het Tor-netwerk. Vereist Orbot</string> <string name="account_settings_hostname">Hostnaam</string> <string name="account_settings_port">Poort</string> - <string name="hostname_or_onion">Server- of .onion-adres</string> <string name="not_a_valid_port">Dit is geen geldig poortnummer</string> <string name="not_valid_hostname">Dit is geen geldige hostnaam</string> <string name="connected_accounts">%1$d van %2$d accounts verbonden</string> 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 @@ <string name="error_fetching_omemo_key">Błąd pobierania klucza OMEMO!</string> <string name="verified_omemo_key_with_certificate">Zweryfikowano klucz OMEMO z certyfikatem</string> <string name="device_does_not_support_certificates">Twoje urządzenie nie wspiera wyboru certyfikatów klienckich</string> - <string name="pref_use_tor">Połącz przez sieć TOR</string> - <string name="pref_use_tor_summary">Tuneluj wszystkie połączenia przez sieć TOR. Wymaga zainstalowania aplikacji \"Orbot\"</string> <string name="account_settings_hostname">Nazwa hosta</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Adres serwera lub \".onion\" adres</string> <string name="not_a_valid_port">To nie jest prawidłowy numer portu</string> <string name="not_valid_hostname">To nie jest prawidłowa nazwa hosta</string> <string name="connected_accounts">%1$d z %2$d kont połączonych</string> 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 @@ <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado.</string> <string name="device_does_not_support_certificates">O seu dispositivo não suporta a seleção de certificados de clientes.</string> <string name="pref_connection_options">Conexão</string> - <string name="pref_use_tor">Conectar via Tor</string> - <string name="pref_use_tor_summary">Faça o tunelamento de todas as conexões através de redes Tor. Necessita do Orbot.</string> <string name="account_settings_hostname">Nome do host</string> <string name="account_settings_port">Porta</string> - <string name="hostname_or_onion">Server- ou .onion-Address</string> <string name="not_a_valid_port">Esse número de porta não é válido</string> <string name="not_valid_hostname">Esse nome de host não é válido</string> <string name="connected_accounts">%1$d de %2$d contas conectadas</string> 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 @@ <string name="verified_omemo_key_with_certificate">Verifica cheia OMEMO cu un certificat</string> <string name="device_does_not_support_certificates">Dispozitivul nu permite selectia unui certificat pentru client!</string> <string name="pref_connection_options">Optiuni conexiune</string> - <string name="pref_use_tor">Conectare prin TOR</string> - <string name="pref_use_tor_summary">Trimite toate conexiunile prin reteaua Tor. Necesita OrBot</string> <string name="account_settings_hostname">Nume gazda</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Adresa server- sau .onion</string> <string name="not_a_valid_port">Acesta nu este un numar de port valabil</string> <string name="not_valid_hostname">Acesta nu este un nume de gazda valabila</string> <string name="connected_accounts">%1$d din %2$d conturi conectate</string> 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 @@ <string name="error_fetching_omemo_key">Ошибка при получении OMEMO ключа!</string> <string name="verified_omemo_key_with_certificate">Проверен OMEMO ключ с сертификатом!</string> <string name="device_does_not_support_certificates">Ваше устройство не поддерживает выбор клиентских сертификатов!</string> - <string name="pref_use_tor">Соединение через Tor</string> - <string name="pref_use_tor_summary">Направить все соединения через сеть TOR. Требуется Orbot</string> <string name="account_settings_hostname">Имя сервера</string> <string name="account_settings_port">Порт</string> - <string name="hostname_or_onion">Сервер- или .onion-Адрес</string> <string name="not_a_valid_port">Это недопустимый номер порта</string> <string name="not_valid_hostname">Это недопустимое имя сервера</string> <string name="connected_accounts">%1$d из %2$d аккаунтов соединены</string> 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 @@ <string name="verified_omemo_key_with_certificate">Оверен ОМЕМО кључ помоћу сертификата!</string> <string name="device_does_not_support_certificates">Ваш уређај не подржава избор сертификата клијента!</string> <string name="pref_connection_options">Опције повезивања</string> - <string name="pref_use_tor">Повежи се преко Тора</string> - <string name="pref_use_tor_summary">Тунеловање свих веза кроз Тор мрежу. Захтева Орбот</string> <string name="account_settings_hostname">Име домаћина</string> <string name="account_settings_port">Порт</string> - <string name="hostname_or_onion">Сервер или .onion адреса</string> <string name="not_a_valid_port">Ово није исправан број порта</string> <string name="not_valid_hostname">Ово није исправно име домаћина</string> <string name="connected_accounts">%1$d од %2$d налога повезано</string> 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 @@ <string name="verified_omemo_key_with_certificate">Verifierade OMEMO-nyckel med certifikat!</string> <string name="device_does_not_support_certificates">Din enhet stödjer inte val av klientcertifikat!</string> <string name="pref_connection_options">Anslutning</string> - <string name="pref_use_tor">Ansluten via Tor</string> - <string name="pref_use_tor_summary">Tunnla alla anslutningar genom Tor-nätverket. Kräver Orbot</string> <string name="account_settings_hostname">Servernamn</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- eller .onion-adress</string> <string name="not_a_valid_port">Inte ett giltigt portnummer</string> <string name="not_valid_hostname">Inte ett giltigt servernamn</string> <string name="connected_accounts">%1$d av %2$d konton anslutna</string> 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 @@ <string name="verified_omemo_key_with_certificate">Sertifikalı OMEMO anahtarı onaylandı!</string> <string name="device_does_not_support_certificates">Cihazınız seçilen istemci sertifikalarını desteklemiyor!</string> <string name="pref_connection_options">Bağlantı</string> - <string name="pref_use_tor">Tor üzerinden bağlan</string> - <string name="pref_use_tor_summary">Bütün bağlantıları Tor ağı üzerinden aktar. Orbot gerekir.</string> <string name="account_settings_hostname">Sunucu adı</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Sunucu- veya .onion-Address</string> <string name="not_a_valid_port">Bu port numarası geçerli değil</string> <string name="not_valid_hostname">Bu sunucu geçerli değil</string> <string name="connected_accounts"> %2$d hesabın %1$ kadarı bağlandı</string> 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 @@ <string name="error_fetching_omemo_key">Lỗi nhập khoá OMEMO!</string> <string name="verified_omemo_key_with_certificate">Khoá OMEMO đã xác minh với chứng nhận!</string> <string name="device_does_not_support_certificates">Thiết bị không hỗ trợ chọn lựa các chứng chỉ của máy trạm!</string> - <string name="pref_use_tor">Kết nối đến Tor</string> - <string name="pref_use_tor_summary">Chuyển toàn bộ kết nối thông qua mạng Tor. Cần có Orbot</string> <string name="account_settings_hostname">Tên máy chủ</string> <string name="account_settings_port">Cổng</string> - <string name="hostname_or_onion">Máy chủ- hoặc địa chỉ .onion-</string> <string name="not_a_valid_port">Đây không phải là số cổng hợp lệ</string> <string name="not_valid_hostname">Đây không phải là tên máy chủ hợp lệ</string> <string name="connected_accounts">%1$d trên %2$d tài khoản đã kết nối</string> 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 @@ <string name="verified_omemo_key_with_certificate">请用证书验证 OMEMO 密钥！</string> <string name="device_does_not_support_certificates">您的设备不支持设备证书选择！</string> <string name="pref_connection_options">连接</string> - <string name="pref_use_tor">通过 Tor 连接</string> - <string name="pref_use_tor_summary">所有连接使用 Tor 网络隧道。需要 Orbot</string> <string name="account_settings_hostname">主机名</string> <string name="account_settings_port">端口</string> - <string name="hostname_or_onion">服务器 - 或者 .orion 地址</string> <string name="not_a_valid_port">该端口号无效</string> <string name="not_valid_hostname">该主机名无效</string> <string name="connected_accounts">%2$d 个中的 %1$d 个账户已连接</string> 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 @@ <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string> <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> <string name="pref_connection_options">Connection</string> - <string name="pref_use_tor">Connect via Tor</string> - <string name="pref_use_tor_summary">Tunnel all connections through the Tor network. Requires Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- or .onion-Address</string> <string name="not_a_valid_port">This is not a valid port number</string> <string name="not_valid_hostname">This is not a valid hostname</string> <string name="connected_accounts">%1$d of %2$d accounts connected</string> 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,18 +192,13 @@ android:title="@string/pref_dont_trust_system_cas_title"/> <Preference android:key="remove_trusted_certificates" - android:summary="@string/pref_remove_trusted_certificates_summary" + android:summary="@string/pref_remove_trusted_certificates_summary"/> </PreferenceCategory> <PreferenceCategory android:key="connection_options" android:title="@string/pref_connection_options"> <CheckBoxPreference android:defaultValue="false" - android:key="use_tor" - android:summary="@string/pref_use_tor_summary" - android:title="@string/pref_use_tor"/> - <CheckBoxPreference - android:defaultValue="false" android:key="show_connection_options" android:summary="@string/pref_show_connection_options_summary" android:title="@string/pref_show_connection_options"/> |