diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 14 | ||||
| -rw-r--r-- | src/main/res/values-es/strings.xml | 41 |
2 files changed, 44 insertions, 11 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 4dd7cfc74..9148aa721 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -599,9 +599,9 @@ public class XmppConnection implements Runnable { if (verifier != null && !verifier.verify(account.getServer().getDomainpart(), sslSocket.getSession())) { - account.setStatus(Account.State.SECURITY_ERROR); - sslSocket.close(); - throw new IOException("Host mismatch in TLS connection"); + Log.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed"); + disconnect(true); + changeStatus(Account.State.SECURITY_ERROR); } tagReader.setInputStream(sslSocket.getInputStream()); tagWriter.setOutputStream(sslSocket.getOutputStream()); @@ -653,12 +653,12 @@ public class XmppConnection implements Runnable { ") than pinned priority (" + keys.getInt(Account.PINNED_MECHANISM_KEY) + "). Possible downgrade attack?"); disconnect(true); - account.setStatus(Account.State.SECURITY_ERROR); + changeStatus(Account.State.SECURITY_ERROR); } } catch (final JSONException e) { Log.d(Config.LOGTAG, "Parse error while checking pinned auth mechanism"); } - Log.d(Config.LOGTAG, "Authenticating with " + saslMechanism.getMechanism()); + Log.d(Config.LOGTAG,account.getJid().toString()+": Authenticating with " + saslMechanism.getMechanism()); auth.setAttribute("mechanism", saslMechanism.getMechanism()); if (!saslMechanism.getClientFirstMessage().isEmpty()) { auth.setContent(saslMechanism.getClientFirstMessage()); @@ -673,10 +673,8 @@ public class XmppConnection implements Runnable { } else if (this.streamFeatures.hasChild("bind") && shouldBind) { sendBindRequest(); } else { - account.setStatus(Account.State.INCOMPATIBLE_SERVER); - Log.d(Config.LOGTAG, account.getJid().toBareJid() - + ": incompatible server. disconnecting"); disconnect(true); + changeStatus(Account.State.INCOMPATIBLE_SERVER); } } diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 070479b85..95a5b4d54 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -141,6 +141,8 @@ <string name="account_status_regis_conflict">El identificador ya está en uso</string> <string name="account_status_regis_success">Registro completado</string> <string name="account_status_regis_not_sup">El servidor no soporta registros</string> + <string name="account_status_security_error">Error de seguridad</string> + <string name="account_status_incompatible_server">Servidor incompatible</string> <string name="encryption_choice_none">Texto plano</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> @@ -254,8 +256,8 @@ <string name="pref_enable_legacy_ssl_summary">Habilita soporte SSLv3 para servidores heredados. Advertencia: SSLv3 se considera no seguro.</string> <string name="pref_expert_options">Ajustes avanzados</string> <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string> - <string name="title_activity_about">About Conversations</string> - <string name="pref_about_conversations_summary">Build and licensing information</string> + <string name="title_activity_about">Acerca de Conversations</string> + <string name="pref_about_conversations_summary">Información de compilación y licencia</string> <string name="pref_use_larger_font">Incrementar tamaño de fuente</string> <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string> <string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string> @@ -283,8 +285,41 @@ <string name="message_text">Mensaje de texto</string> <string name="url_copied_to_clipboard">URL copiada al portapapeles</string> <string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string> - <string name="image_transmission_failed">Falló la transmisión de la imagen</string> + <string name="image_transmission_failed">Falló la transferencia de la imagen</string> <string name="scan_qr_code">Escanear código QR</string> <string name="show_qr_code">Mostrar código QR</string> <string name="account_details">Detalles de la cuenta</string> + <string name="verify_otr">Verificar OTR</string> + <string name="remote_fingerprint">Códigos OTR remotos</string> + <string name="scan">escanear</string> + <string name="or_touch_phones">(o une los teléfonos)</string> + <string name="smp">Protocolo del Socialista Millonario</string> + <string name="shared_secret_hint">Sugerencia o Pregunta</string> + <string name="shared_secret_secret">Compartir secreto</string> + <string name="confirm">Confirmar</string> + <string name="in_progress">En progreso</string> + <string name="respond">Responder</string> + <string name="failed">Falló</string> + <string name="secrets_do_not_match">Los secretos no coinciden</string> + <string name="try_again">Intentar de nuevo</string>; + <string name="finish">Terminar</string> + <string name="verified">Verificado!</string> + <string name="smp_requested">El contacto solicita verificación SMP</string> + <string name="no_otr_session_found">No se ha encontrado una sesión OTR válida!</string> + <string name="conversations_foreground_service">Conversations</string> + <string name="touch_to_disable">Pulsa para deshabilitar servicio en segundo plano</string> + <string name="pref_keep_foreground_service">Mantener servicio en segundo plano</string> + <string name="pref_keep_foreground_service_summary">Previene que el sistema cierre la conexión</string> + <string name="choose_file">Elige archivo</string> + <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completedo)</string> + <string name="download_file">Descargar archivo %s</string> + <string name="open_file">Abrir %s como archivo</string> + <string name="sending_file">Enviando (%1$d%% completedo)</string> + <string name="preparing_file">Preparando transferencia de archivo</string> + <string name="file_offered_for_download">Archivo ofrecido para descarga</string> + <string name="file">Archivo %s</string> + <string name="cancel_transmission">Cancelar transferencia</string> + <string name="file_transmission_failed">falló la transferencia del archivo</string> + <string name="file_deleted">El archivo ha sido eliminado</string> + <string name="no_application_found_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string> </resources>
\ No newline at end of file |