modify some settings and update PreferencesManager

CHANGES.rst

@@ -8,7 +8,7 @@ Features:
  -
 
 Improvements:
- -
+ - Remove double negations from settings and update descriptions (#2723)
 
 Other changes:
  -

vector/src/main/java/im/vector/activity/VectorRoomActivity.java

@@ -2075,7 +2075,7 @@ private void sendSticker(Intent data) {
      */
     private void handleTypingNotification(boolean isTyping) {
         // the typing notifications are disabled ?
-        if (PreferencesManager.dontSendTypingNotifs(this)) {
+        if (!PreferencesManager.sendTypingNotifs(this)) {
             Log.d(LOG_TAG, "##handleTypingNotification() : the typing notifications are disabled");
             return;
         }

vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java

@@ -216,7 +216,7 @@ public class VectorMessagesAdapter extends AbstractMessagesAdapter {
 
     // custom settings
     private final boolean mAlwaysShowTimeStamps;
-    private final boolean mHideReadReceipts;
+    private final boolean mShowReadReceipts;
 
     // Key is member id.
     private final Map<String, RoomMember> mLiveRoomMembers = new HashMap<>();
@@ -375,7 +375,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
         mLocale = VectorLocale.INSTANCE.getApplicationLocale();
 
         mAlwaysShowTimeStamps = PreferencesManager.alwaysShowTimeStamps(VectorApp.getInstance());
-        mHideReadReceipts = PreferencesManager.hideReadReceipts(VectorApp.getInstance());
+        mShowReadReceipts = PreferencesManager.showReadReceipts(VectorApp.getInstance());
 
         mPadlockDrawable = ThemeUtils.INSTANCE.tintDrawable(mContext,
                 ContextCompat.getDrawable(mContext, R.drawable.e2e_unencrypted), R.attr.vctr_settings_icon_tint_color);
@@ -1173,7 +1173,7 @@ public boolean onLongClick(View v) {
         VectorMessagesAdapterHelper.setHeader(convertView, headerMessage(position), position);
 
         // read receipts
-        if (mHideReadReceipts) {
+        if (!mShowReadReceipts) {
             mHelper.hideReadReceipts(convertView);
         } else {
             mHelper.displayReadReceipts(convertView, row, mIsPreviewMode, mLiveRoomMembers);
@@ -1782,11 +1782,11 @@ private boolean isSupportedRow(MessageRow row) {
             RoomMember roomMember = JsonUtils.toRoomMember(event.getContent());
             String membership = roomMember.membership;
 
-            if (PreferencesManager.hideJoinLeaveMessages(mContext)) {
+            if (!PreferencesManager.showJoinLeaveMessages(mContext)) {
                 isSupported = !TextUtils.equals(membership, RoomMember.MEMBERSHIP_LEAVE) && !TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN);
             }
 
-            if (isSupported && PreferencesManager.hideAvatarDisplayNameChangeMessages(mContext) && TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN)) {
+            if (isSupported && !PreferencesManager.showAvatarDisplayNameChangeMessages(mContext) && TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN)) {
                 EventContent eventContent = JsonUtils.toEventContent(event.getContentAsJsonObject());
                 EventContent prevEventContent = event.getPrevContent();
 

vector/src/main/res/values-ar/strings.xml

@@ -284,7 +284,7 @@
     <string name="settings_add_email_address">أضِف بريدا إلكترونيا</string>
     <string name="settings_phone_number">الهاتف</string>
     <string name="settings_add_phone_number">أضِف رقم هاتف</string>
-    <string name="settings_title_app_info_link">معلومات التطبيق</string>
+    <string name="settings_app_info_link_title">معلومات التطبيق</string>
 
     <string name="settings_notification_ringtone">صوت الإخطارات</string>
     <string name="settings_turn_screen_on">شغّل الشاشة لمدة ٣ ثواني</string>
@@ -299,22 +299,17 @@
     <string name="settings_copyright">حقوق النسخ</string>
     <string name="settings_privacy_policy">سياسة الخصوصية</string>
     <string name="settings_clear_cache">امسح الخبيئة</string>
-    <string name="settings_clear_medias_cache">امسح خبيئة الوسائط</string>
+    <string name="settings_clear_media_cache">امسح خبيئة الوسائط</string>
     <string name="settings_user_settings">إعدادات المستخدم</string>
     <string name="settings_notifications">الإخطارات</string>
     <string name="settings_advanced">متقدم</string>
     <string name="settings_contact">المتراسلون المحليون</string>
     <string name="settings_contacts_app_permission">تصاريح المتراسلون</string>
     <string name="settings_contacts_phonebook_country">دولة دفتر العناوين</string>
     <string name="settings_devices_list">الأجهزة</string>
-    <string name="settings_hide_read_receipts">أخفِ إخطارات القراءة</string>
-    <string name="settings_dont_send_typings_notifs">لا تُرسل إخطارات الكتابة</string>
     <string name="settings_always_show_timestamps">اعرض أختام الرسائل الزمنية دائما</string>
     <string name="settings_12_24_timestamps">اعرض الأختام الزمنية بنسق ١٢ ساعة (مثلا ٢:٣٠م)</string>
-    <string name="settings_hide_join_leave_messages">أخفِ رسائل الانضمام/الخروج (الدعوات والطرد والمنع لا يتأثر)</string>
-    <string name="settings_hide_avatar_display_name_changes_messages">اعرض تغييرات الصور وأسماء العرض</string>
 
-    <string name="settings_disable_markdown">عطّل تنسيق ”ماركداون“ عند الإرسال</string>
     <string name="settings_data_save_mode">وضع حفظ البيانات</string>
 
     <string name="devices_details_dialog_title">تفاصيل الجهاز</string>
@@ -830,7 +825,7 @@
 
     <string name="room_sliding_menu_term_and_conditions">الأحكام والشروط</string>
     <string name="room_sliding_menu_third_party_notices">إشعارات الأطراف الثالثة</string>
-    <string name="settings_summary_app_info_link">شاشة معلومات التطبيق في النظام</string>
+    <string name="settings_app_info_link_summary">شاشة معلومات التطبيق في النظام</string>
     <string name="settings_call_invitations">دعوات المكالمات</string>
     <string name="settings_start_on_boot">ابدأ عن الإقلاع</string>
     <string name="settings_delete_threepid_confirmation">أمتأكّد من إزالة ⁨%1$s⁩ ⁨%2$s⁩؟</string>

vector/src/main/res/values-bg/strings.xml

@@ -307,7 +307,7 @@
     <string name="call_connected">Свързано повикване</string>
     <string name="call_error_user_not_responding">Отсрещната страна не успя да отговори на повикването.</string>
     <string name="call_error_ice_failed">Неуспешна връзка с медийното устройство</string>
-    <string name="settings_clear_medias_cache">Изчисти кеша за медия</string>
+    <string name="settings_clear_media_cache">Изчисти кеша за медия</string>
     <string name="settings_keep_media">Запази медия</string>
 
     <string name="call_error_camera_init_failed">Неуспешно подготвяне на камерата</string>
@@ -459,13 +459,8 @@
     <string name="settings_pin_unread_messages">Закачане на стаи с непрочетени съобщения</string>
     <string name="settings_devices_list">Устройства</string>
     <string name="settings_inline_url_preview">Включване по подразбиране на URL прегледи</string>
-    <string name="settings_hide_read_receipts">Скриване на потвържденията за прочитане на съобщение</string>
-    <string name="settings_dont_send_typings_notifs">Не показвай на другите, че в момента пиша</string>
     <string name="settings_always_show_timestamps">Винаги показвай часа на съобщението</string>
     <string name="settings_12_24_timestamps">Показване на времето в 12-часов формат (напр. 2:30pm)</string>
-    <string name="settings_hide_join_leave_messages">Скриване на съобщения за присъединяване/напускане (не засяга покани/изгонвания/блокирания)</string>
-    <string name="settings_hide_avatar_display_name_changes_messages">Скриване на информацията за промените на аватара и името</string>
-    <string name="settings_disable_markdown">Изключи markdown при изпращане</string>
     <string name="settings_analytics">Статистика</string>
 
     <string name="devices_details_dialog_title">Информация за устройството</string>
@@ -767,8 +762,8 @@
     <string name="room_details_people_present_group_name">УЧАСТНИЦИ</string>
 
     <string name="room_sync_in_progress">Синхронизиране…</string>
-    <string name="settings_summary_app_info_link">Екран с информация за системата на приложението</string>
-    <string name="settings_title_app_info_link">Информация за приложението</string>
+    <string name="settings_app_info_link_summary">Екран с информация за системата на приложението</string>
+    <string name="settings_app_info_link_title">Информация за приложението</string>
 
     <string name="settings_notification_ringtone">Звук на известията</string>
     <string name="settings_turn_screen_on">Включи екрана за 3 секунди</string>

vector/src/main/res/values-bs/strings.xml

@@ -421,8 +421,8 @@ Da li ste sigurani?</string>
     <string name="settings_add_email_address">Dodaj email adresu</string>
     <string name="settings_phone_number">Telefon</string>
     <string name="settings_add_phone_number">Dodaj broj telefona</string>
-    <string name="settings_summary_app_info_link">Infomacije o aplikacijskom sustavu</string>
-    <string name="settings_title_app_info_link">Informacije o aplikaciji</string>
+    <string name="settings_app_info_link_summary">Infomacije o aplikacijskom sustavu</string>
+    <string name="settings_app_info_link_title">Informacije o aplikaciji</string>
 
     <string name="settings_notification_ringtone">Zvuk notifikacije</string>
     <string name="settings_enable_all_notif">Omogući obavijesti za ovaj račun</string>
@@ -452,7 +452,7 @@ Da li ste sigurani?</string>
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Privatnost</string>
     <string name="settings_clear_cache">Očisti keš</string>
-    <string name="settings_clear_medias_cache">Očisti medija keš</string>
+    <string name="settings_clear_media_cache">Očisti medija keš</string>
     <string name="settings_keep_media">Dodaj medij</string>
 
     <string name="settings_user_settings">Korisničke postavke</string>
@@ -469,18 +469,13 @@ Da li ste sigurani?</string>
     <string name="settings_pin_missed_notifications">Prikačite sobe sa propuštenim obavijestima</string>
     <string name="settings_pin_unread_messages">Prikačite sobe sa nepročitanim porukama</string>
     <string name="settings_devices_list">Uređaj</string>
-    <string name="settings_hide_read_receipts">Sakrijte pročitane račune</string>
-    <string name="settings_dont_send_typings_notifs">Nemojte slati obavijesti o tipizaciji</string>
     <string name="settings_always_show_timestamps">Uvijek prikažite vremenske oznake poruka</string>
     <string name="settings_12_24_timestamps">Prikaži vremenske oznake u 12-satnom obliku (npr. 14:30)</string>
-    <string name="settings_hide_join_leave_messages">Sakrij poruke o pridruživanju / napuštanju (pozivnice / izbacivanja / neovlaštne zabrane)</string>
-    <string name="settings_hide_avatar_display_name_changes_messages">Sakrij avatar i promjene imena</string>
 
     <string name="settings_analytics">Analiza</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$a %2$i</string>
 
-    <string name="settings_disable_markdown">Onemogućite formatiranje oznaka</string>
     <string name="settings_data_save_mode">Način spremanja podataka</string>
 
     <string name="devices_details_dialog_title">Pojedinosti uređaja</string>

vector/src/main/res/values-ca/strings.xml

@@ -459,8 +459,8 @@ Tingueu en compte que aquesta acció reiniciarà l\'aplicació i que pot trigar
     <string name="settings_add_email_address">Afegeix una adreça de correu electrònic</string>
     <string name="settings_phone_number">Telèfon</string>
     <string name="settings_add_phone_number">Afegeix un número de telèfon</string>
-    <string name="settings_summary_app_info_link">Pantalla d\'informació del sistema de l\'aplicació</string>
-    <string name="settings_title_app_info_link">Informació de l\'aplicació</string>
+    <string name="settings_app_info_link_summary">Pantalla d\'informació del sistema de l\'aplicació</string>
+    <string name="settings_app_info_link_title">Informació de l\'aplicació</string>
 
     <string name="settings_notification_ringtone">So de les notificación</string>
     <string name="settings_enable_all_notif">Habilita les notificacions d\'aquest compte</string>
@@ -490,7 +490,7 @@ Tingueu en compte que aquesta acció reiniciarà l\'aplicació i que pot trigar
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Política de privacitat</string>
     <string name="settings_clear_cache">Esborra la memòria cau</string>
-    <string name="settings_clear_medias_cache">Esborra la memòria cau multimèdia</string>
+    <string name="settings_clear_media_cache">Esborra la memòria cau multimèdia</string>
     <string name="settings_keep_media">Manté els elements multimèdia</string>
 
     <string name="settings_user_settings">Configuració de l\'usuari</string>
@@ -508,13 +508,8 @@ Tingueu en compte que aquesta acció reiniciarà l\'aplicació i que pot trigar
     <string name="settings_pin_unread_messages">Destaca les sales amb missatges sense llegir</string>
     <string name="settings_devices_list">Dispositius</string>
     <string name="settings_inline_url_preview">Habilita les previsualitzacions de les URL per defecte</string>
-    <string name="settings_hide_read_receipts">Amaga les entrades llegides</string>
-    <string name="settings_dont_send_typings_notifs">No enviïs notificacions d\'esciptura</string>
     <string name="settings_always_show_timestamps">Mostra sempre l\'hora dels missatges</string>
     <string name="settings_12_24_timestamps">Mostra l\'hora en el format de 12 hores (per exemple 2:30pm)</string>
-    <string name="settings_hide_join_leave_messages">Amaga els missatges d\'entrada i sortida de participants</string>
-    <string name="settings_hide_avatar_display_name_changes_messages">Amaga les fotos de perfil i els canvis de nom visible</string>
-    <string name="settings_disable_markdown">Desactivar el Markdown quan s\'enviï</string>
     <string name="settings_vibrate_on_mention">Vibra quan et mencionin</string>
 
     <!-- analytics -->

vector/src/main/res/values-da/strings.xml

@@ -504,7 +504,7 @@ Er du sikker?</string>
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Privacy-politik</string>
     <string name="settings_clear_cache">Ryd cache</string>
-    <string name="settings_clear_medias_cache">Ryd mediecache</string>
+    <string name="settings_clear_media_cache">Ryd mediecache</string>
     <string name="settings_keep_media">Beholde mediefiler</string>
 
     <string name="settings_user_settings">Brugerindstillinger</string>

vector/src/main/res/values-de/strings.xml

@@ -442,8 +442,8 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="settings_add_email_address">E-Mail-Adresse hinzufügen</string>
     <string name="settings_phone_number">Telefonnummer</string>
     <string name="settings_add_phone_number">Telefonnummer hinzufügen</string>
-    <string name="settings_summary_app_info_link">App-Info-Anzeige von Android</string>
-    <string name="settings_title_app_info_link">App-Info</string>
+    <string name="settings_app_info_link_summary">App-Info-Anzeige von Android</string>
+    <string name="settings_app_info_link_title">App-Info</string>
 
     <string name="settings_enable_all_notif">Benachrichtigungen für diesen Account aktivieren</string>
     <string name="settings_enable_this_device">Benachrichtigungen für dieses Gerät aktivieren</string>
@@ -700,13 +700,10 @@ Unbekannte Geräte:</string>
     <string name="settings_select_language">Wähle eine Sprache</string>
 
     <string name="settings_start_on_boot">Starte beim Systemstart</string>
-    <string name="settings_clear_medias_cache">Medien-Cache leeren</string>
+    <string name="settings_clear_media_cache">Medien-Cache leeren</string>
     <string name="settings_keep_media">Medien behalten</string>
 
-    <string name="settings_hide_read_receipts">Lesebestätigungen verbergen</string>
-    <string name="settings_dont_send_typings_notifs">Sende nicht, dass ich tippe</string>
     <string name="settings_always_show_timestamps">Nachrichten-Zeitstempel immer anzeigen</string>
-    <string name="settings_disable_markdown">Markdown-Formatierung beim Senden deaktivieren</string>
 
     <string name="media_saving_period_3_days">3 Tage</string>
     <string name="media_saving_period_1_week">1 Woche</string>
@@ -730,8 +727,6 @@ Unbekannte Geräte:</string>
 <string name="settings_theme">Thema</string>
 
     <string name="settings_12_24_timestamps">Zeitstempel im 12-Stunden-Format anzeigen (z. B. 2:30 p. m.)</string>
-    <string name="settings_hide_join_leave_messages">Betreten-/Verlassen-Meldungen verbergen (gilt nicht für Einladungen/Kicks/Bans)</string>
-    <string name="settings_hide_avatar_display_name_changes_messages">Profilbild- und Anzeigenamen-Änderungen verbergen</string>
 
     <string name="widget_no_power_to_manage">Für das Verwalten von Widgets in diesem Raum ist eine Berechtigung erforderlich</string>
     <string name="widget_creation_failure">Widget konnte nicht erstellt werden</string>

vector/src/main/res/values-es-rMX/strings.xml

@@ -434,8 +434,8 @@ Mensajes cifrados no serán visibles en cuentas que no implementan el cifrado.</
     <string name="settings_add_email_address">Añadir correo electrónico</string>
     <string name="settings_phone_number">Número Telefónico</string>
     <string name="settings_add_phone_number">Añadir número telefónico</string>
-    <string name="settings_summary_app_info_link">Página de la información del sistema de la aplicación</string>
-    <string name="settings_title_app_info_link">Información de la Aplicación</string>
+    <string name="settings_app_info_link_summary">Página de la información del sistema de la aplicación</string>
+    <string name="settings_app_info_link_title">Información de la Aplicación</string>
 
     <string name="settings_enable_all_notif">Encender notificaciones para esta cuenta</string>
     <string name="settings_enable_this_device">Encender notificaciones para este dispositivo</string>