diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java | 19 | ||||
| -rw-r--r-- | src/main/res/layout/dialog_block_contact.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values-es/strings.xml | 15 | ||||
| -rw-r--r-- | src/main/res/values-sr/strings.xml | 5 |
6 files changed, 37 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6be8d199..a46c50df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ###Changelog +####Version 1.14.3 +* XEP-0377: Spam Reporting +* fix rare start up crashes + ####Version 1.14.2 * support ANONYMOUS SASL * bug fixes diff --git a/build.gradle b/build.gradle index d735dca2..d6fda74a 100644 --- a/build.gradle +++ b/build.gradle @@ -56,8 +56,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 24 - versionCode 173 - versionName "1.14.2" + versionCode 174 + versionName "1.14.3" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index b55a701f..91ce34a9 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java @@ -3,6 +3,9 @@ package eu.siacs.conversations.ui; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.text.SpannableString; +import android.text.Spanned; +import android.text.style.TypefaceSpan; import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; @@ -28,15 +31,23 @@ public final class BlockContactDialog { report.setVisibility(!isBlocked && reporting ? View.VISIBLE : View.GONE); builder.setView(view); + String value; + SpannableString spannable; if (blockable.getJid().isDomainJid() || blockable.getAccount().isBlocked(blockable.getJid().toDomainJid())) { builder.setTitle(isBlocked ? R.string.action_unblock_domain : R.string.action_block_domain); - message.setText(context.getResources().getString(isBlocked ? R.string.unblock_domain_text : R.string.block_domain_text, - blockable.getJid().toDomainJid())); + value = blockable.getJid().toDomainJid().toString(); + spannable = new SpannableString(context.getString(isBlocked ? R.string.unblock_domain_text : R.string.block_domain_text, value)); + message.setText(spannable); } else { builder.setTitle(isBlocked ? R.string.action_unblock_contact : R.string.action_block_contact); - message.setText(context.getResources().getString(isBlocked ? R.string.unblock_contact_text : R.string.block_contact_text, - blockable.getJid().toBareJid())); + value = blockable.getJid().toBareJid().toString(); + spannable = new SpannableString(context.getString(isBlocked ? R.string.unblock_contact_text : R.string.block_contact_text, value)); } + int start = spannable.toString().indexOf(value); + if (start >= 0) { + spannable.setSpan(new TypefaceSpan("monospace"),start,start + value.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + } + message.setText(spannable); builder.setPositiveButton(isBlocked ? R.string.unblock : R.string.block, new DialogInterface.OnClickListener() { @Override diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml index b3615533..661af7d5 100644 --- a/src/main/res/layout/dialog_block_contact.xml +++ b/src/main/res/layout/dialog_block_contact.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/TextSizeBody" - android:textColor="@color/black87"/> + android:textColor="?attr/color_text_primary"/> <CheckBox android:layout_marginTop="8dp" android:id="@+id/report_spam" diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index bff5c19d..28890171 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -128,8 +128,8 @@ <string name="error_decrypting_file">Error descifrando archivo</string> <string name="accept">Aceptar</string> <string name="error">Ha ocurrido un error</string> - <string name="pref_grant_presence_updates">Suscripción de presencia</string> - <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder suscripciones de presencia de los contactos que has creado</string> + <string name="pref_grant_presence_updates">Suscripción de presencia automática</string> + <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder la suscripción de presencia de los contactos que has creado</string> <string name="subscriptions">Suscripciones</string> <string name="your_account">Tu cuenta</string> <string name="keys">Claves</string> @@ -282,13 +282,13 @@ <string name="enable">Habilitar</string> <string name="conference_requires_password">Esta conversación requiere contraseña</string> <string name="enter_password">Introduce la contraseña</string> - <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto perdida</string> - <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto será usado para determinar qué cliente(s) está usando tu contacto.</small></string> + <string name="missing_presence_updates">Se ha perdido la suscripción de presencia del contacto</string> + <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto se usará para determinar qué cliente(s) está usando tu contacto.</small></string> <string name="request_now">Solicitar ahora</string> <string name="delete_fingerprint">Eliminar huella digital OTR</string> <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string> <string name="ignore">Ignorar</string> - <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string> + <string name="without_mutual_presence_updates"><b>Aviso:</b> Si envías esto sin suscripción de presencia con tu contacto se podrían producir problemas inesperados.\n\n<small>Verifica la suscripción de presencia en detalles del contacto.</small></string> <string name="pref_security_settings">Seguridad</string> <string name="pref_force_encryption">Forzar cifrado end-to-end</string> <string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string> @@ -648,4 +648,9 @@ <string name="allow">Permitir</string> <string name="no_permission_to_access_x">Sin permiso de acceso a %s</string> <string name="remote_server_not_found">Servidor no encontrado</string> + <string name="unable_to_update_account">No se ha podido actualizar la cuenta</string> + <string name="missing_presence_subscription_with_x">Se ha perdido la suscripción de presencia con %s.</string> + <string name="missing_keys_from_x">Se ha perdido la clave OMEMO de %s.</string> + <string name="wrong_conference_configuration">Ésta no es una conversación privada no anónima.</string> + <string name="this_conference_has_no_members">No hay miembros en esta conversación.</string> </resources> diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index fee1842e..972999d1 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -651,4 +651,9 @@ <string name="allow">Дозволи</string> <string name="no_permission_to_access_x">Нема дозвола за приступ %s</string> <string name="remote_server_not_found">Удаљени сервер није нађен</string> + <string name="unable_to_update_account">Не могох да се ажурирам налог</string> + <string name="missing_presence_subscription_with_x">Нема претплате на присутност са %s.</string> + <string name="missing_keys_from_x">Нема ОМЕМО кључева у %s.</string> + <string name="wrong_conference_configuration">Ово није приватно, неанонимно групно ћаскање.</string> + <string name="this_conference_has_no_members">Нема учесника у овом групном ћаскању.</string> </resources> |