Merge remote-tracking branch 'upstream/master'

res/values-it/strings.xml

@@ -109,6 +109,11 @@
         <item quantity="one">%d membri</item>
         <item quantity="other">%d membri</item>
     </plurals>
+    <plurals name="n_recipients">
+        <item quantity="one">%d destinatari</item>
+        <item quantity="other">%d destinatari</item>
+    </plurals>
+
     <string name="self">Io</string>
     <string name="draft">Bozza</string>
     <string name="image">Immagine</string>
@@ -168,6 +173,11 @@
     <string name="menu_new_chat">Nuova Chat</string>
     <string name="menu_new_group">Nuovo Gruppo</string>
     <string name="menu_new_verified_group">Nuovo Gruppo Verificato</string>
+    <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
+    <string name="broadcast_list">Lista Trasmissione</string>
+    <string name="broadcast_lists">Liste Trasmissioni</string>
+    <string name="new_broadcast_list">Nuova Lista Trasmissione</string>
+    <string name="add_recipients">Aggiungi Destinatari</string>
     <string name="menu_send">Inviato</string>
     <string name="menu_toggle_keyboard">Alterna la Tastiera Emoji</string>
     <string name="menu_edit_group">Modifica Gruppo</string>
@@ -310,6 +320,8 @@
     <string name="ask_delete_value">Elimina %s?</string>
     <!-- Translators: %1$s will be replaces by a comma separated list of names -->
     <string name="ask_remove_members">Rimuovere %1$s dal gruppo?</string>
+    <!-- Translators: %1$s will be replaced by a comma separated list of names -->
+    <string name="ask_remove_from_broadcast">Rimuovere %1$s dalla lista trasmissione?</string>
     <string name="open_url_confirmation">Vuoi aprire questo link?</string>
 
 
@@ -338,6 +350,7 @@
         <item quantity="other">%d nuovi messaggi</item>
     </plurals>
     <string name="chat_no_messages_hint">Invia un messaggio a %1$s:\n\n• Non è necessario che anche %2$s usi Delta Chat.\n\n• L\'invio del primo messaggio può richiedere qualche istante e non essere crittografato. </string>
+    <string name="chat_new_broadcast_hint">In una lista trasmissione, gli altri riceveranno messaggi nelle loro chat private con te.\n\nI destinatari non saranno a conoscenza l\'uno dell\'altro.</string>
     <string name="chat_new_group_hint">Invia il primo messaggio per permettere agli altri di rispondere nel gruppo\n\n• Non è necessario che tutti i membri usino Delta Chat.\n\n• L\'invio del primo messaggio può richiedere qualche istante.</string>
     <string name="chat_record_slide_to_cancel">Scorri per annullare</string>
     <string name="chat_record_explain">Tocca e mantieni per registrare un messaggio vocale, rilascia per inviare </string>

res/values-nl/strings.xml

@@ -109,6 +109,11 @@
         <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
+    <plurals name="n_recipients">
+        <item quantity="one">%d ontvanger</item>
+        <item quantity="other">%d ontvangers</item>
+    </plurals>
+
     <string name="self">Ik</string>
     <string name="draft">Concept</string>
     <string name="image">Afbeelding</string>
@@ -168,6 +173,11 @@
     <string name="menu_new_chat">Nieuw gesprek</string>
     <string name="menu_new_group">Nieuwe groep</string>
     <string name="menu_new_verified_group">Nieuwe goedgekeurde groep</string>
+    <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
+    <string name="broadcast_list">Uitzendlijst</string>
+    <string name="broadcast_lists">Uitzendlijsten</string>
+    <string name="new_broadcast_list">Nieuwe uitzendlijst</string>
+    <string name="add_recipients">Ontvangers toevoegen</string>
     <string name="menu_send">Versturen</string>
     <string name="menu_toggle_keyboard">Emoji-toetsenbord tonen/verbergen</string>
     <string name="menu_edit_group">Groep aanpassen</string>
@@ -310,6 +320,8 @@
     <string name="ask_delete_value">Wil je %s verwijderen?</string>
     <!-- Translators: %1$s will be replaces by a comma separated list of names -->
     <string name="ask_remove_members">Wil je %1$s verwijderen uit de groep?</string>
+    <!-- Translators: %1$s will be replaced by a comma separated list of names -->
+    <string name="ask_remove_from_broadcast">Wil je %1$s verwijderen van de uitzendlijst?</string>
     <string name="open_url_confirmation">Weet je zeker dat je deze link wilt openen?</string>
 
 

res/values-ru/strings.xml

@@ -121,6 +121,13 @@
         <item quantity="many">%d member</item>
         <item quantity="other">%d участников</item>
     </plurals>
+    <plurals name="n_recipients">
+        <item quantity="one">%d получатель</item>
+        <item quantity="few">%d получателя</item>
+        <item quantity="many">%d получателей</item>
+        <item quantity="other">%d получателей</item>
+    </plurals>
+
     <string name="self">Я</string>
     <string name="draft">Черновик</string>
     <string name="image">Изображение</string>
@@ -180,6 +187,11 @@
     <string name="menu_new_chat">Новый чат</string>
     <string name="menu_new_group">Новая группа</string>
     <string name="menu_new_verified_group">Новая проверенная группа</string>
+    <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
+    <string name="broadcast_list">Список рассылки</string>
+    <string name="broadcast_lists">Списки рассылки</string>
+    <string name="new_broadcast_list">Новый список рассылки</string>
+    <string name="add_recipients">Добавить получателей</string>
     <string name="menu_send">Отправить</string>
     <string name="menu_toggle_keyboard">Включить эмодзи клавиатуру</string>
     <string name="menu_edit_group">Редактировать группу</string>
@@ -312,6 +324,12 @@
         <item quantity="many">Delete %d message here and on the server?</item>
         <item quantity="other">Удалить %d сообщений здесь и на сервере?</item>
     </plurals>
+    <plurals name="ask_delete_messages_simple">
+        <item quantity="one">Удалить %d сообщение?</item>
+        <item quantity="few">Удалить %d сообщения?</item>
+        <item quantity="many">Удалить %d сообщений?</item>
+        <item quantity="other">Удалить %d сообщений?</item>
+    </plurals>
     <string name="ask_forward">Переслать сообщения для %1$s?</string>
     <string name="ask_forward_multiple">Отправить сообщения в %1$d чатов?</string>
     <string name="ask_export_attachment">Экспортировать вложения? Экспорт вложений, позволит любому приложению на вашем устройстве получить к ним доступ.\n\nПродолжить?</string>
@@ -324,6 +342,8 @@
     <string name="ask_delete_value">Удалить %s?</string>
     <!-- Translators: %1$s will be replaces by a comma separated list of names -->
     <string name="ask_remove_members">Удалить %1$s из группы?</string>
+    <!-- Translators: %1$s will be replaced by a comma separated list of names -->
+    <string name="ask_remove_from_broadcast">Удалить %1$s из списка рассылки?</string>
     <string name="open_url_confirmation">Вы хотите открыть эту ссылку?</string>
 
 
@@ -358,6 +378,7 @@
         <item quantity="other">%d новых сообщений</item>
     </plurals>
     <string name="chat_no_messages_hint">Отправьте сообщение %1$s:\n\n• Это сработает, даже если %2$s не использует Delta Chat.\n\n• Первое сообщение может быть незашифрованным и его доставка может занять некоторое время.</string>
+    <string name="chat_new_broadcast_hint">В списке рассылки другие пользователи будут получать сообщения в своих личных чатах с вами.\n\nПолучатели не будут знать друг о друге.</string>
     <string name="chat_new_group_hint">Напишите первое сообщение, оно позволит другим участникам группы ответить на него.\n\n• Это сработает, даже если не все участники используют Delta Chat.\n\n• Доставка первого сообщения может занять некоторое время.</string>
     <string name="chat_record_slide_to_cancel">Сдвиньте для отмены</string>
     <string name="chat_record_explain">Нажмите и удерживайте для записи голосового сообщения, отпустите для отправки</string>
@@ -737,6 +758,13 @@
     <string name="systemmsg_chat_protection_disabled">Защита чата отключена.</string>
     <string name="systemmsg_chat_protection_enabled">Защита чата включена</string>
 
+    <string name="devicemsg_self_deleted">Вы удалили чат \"Сохраненные сообщения\".\n\nℹ️ Чтобы снова использовать функцию \"Сохраненные сообщения\", создайте новый чат с самим собой.</string>
+    <!-- %1$s will be replaced by the number of storage already used, sth. as '500 MB'. CAVE: if you want to use a simple the percent sign, type in two, so eg. %1$s %% -->
+    <string name="devicemsg_storage_exceeding">⚠️ Хранилище вашего провайдера скоро будет превышено, уже использовано %1$s%%.\n\nВозможно, вы не сможете получать сообщения, когда хранилище будет использовано на 100%%.\n\n👉 Пожалуйста, проверьте, можете ли вы удалить старые данные в веб-интерфейсе провайдера и подумайте о том, чтобы включить \"Настройки / Удалить старые сообщения\". Вы можете проверить текущее использование хранилища в любое время в \"Настройки / Соединение\".</string>
+    <!-- %1%s will be replaced by date and time in some human-readable format -->
+    <string name="devicemsg_bad_time">⚠️ Дата или время вашего устройства кажутся неточными (%1$s).\n\nНастройте свои часы ⏰🔧, чтобы убедиться, что ваши сообщения принимаются правильно.</string>
+    <string name="devicemsg_update_reminder">⚠️ Ваша версия Delta Chat может быть устаревшей.\n\nЭто может вызвать проблемы, поскольку ваши партнеры по чату используют более новые версии - и вам не хватает последних функций 😳\nПожалуйста, проверьте https://get.delta.chat или магазин приложений на наличие обновлений.</string>
+
     <!-- Some options as "Manage keys" or "Backup" may require the system PIN/Fingerprint/Gesture/Etc. to be entered in a system dialog. This hint is added to the system dialog, below a title as "Manage keys" or "Backup". -->
     <string name="enter_system_secret_to_continue">Пожалуйста, введите защитный код вашей системы, чтобы продолжить. </string>
 

res/values-tr/strings.xml

@@ -109,6 +109,11 @@
         <item quantity="one">%d üye</item>
         <item quantity="other">%d üye</item>
     </plurals>
+    <plurals name="n_recipients">
+        <item quantity="one">%d alıcı</item>
+        <item quantity="other">%d alıcı</item>
+    </plurals>
+
     <string name="self">Ben</string>
     <string name="draft">Taslak</string>
     <string name="image">Görsel</string>
@@ -168,6 +173,11 @@
     <string name="menu_new_chat">Yeni Sohbet</string>
     <string name="menu_new_group">Yeni Grup</string>
     <string name="menu_new_verified_group">Yeni Doğrulanan Grup</string>
+    <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
+    <string name="broadcast_list">Yayın Listesi</string>
+    <string name="broadcast_lists">Yayın Listeleri</string>
+    <string name="new_broadcast_list">Yeni Yayın Listesi</string>
+    <string name="add_recipients">Alıcılar Ekle</string>
     <string name="menu_send">Gönder</string>
     <string name="menu_toggle_keyboard">Emoji Klavyesine Geç</string>
     <string name="menu_edit_group">Grubu Düzenle</string>
@@ -310,6 +320,8 @@
     <string name="ask_delete_value">%s silinsin mi?</string>
     <!-- Translators: %1$s will be replaces by a comma separated list of names -->
     <string name="ask_remove_members">%1$s gruptan kaldırılsın mı?</string>
+    <!-- Translators: %1$s will be replaced by a comma separated list of names -->
+    <string name="ask_remove_from_broadcast">%1$s yayın listesinden kaldırılsın mı?</string>
     <string name="open_url_confirmation">Bu bağlantıyı açmak istiyor musunuz?</string>
 
 
@@ -338,6 +350,7 @@
         <item quantity="other">%d yeni ileti</item>
     </plurals>
     <string name="chat_no_messages_hint">%1$s alıcısına ileti gönder:\n\n• %2$s Delta Chat kullanmıyorsa tamam.\n\n• İlk iletinin teslim edilmesi biraz zaman alabilir ve şifrelenmeyebilir.</string>
+    <string name="chat_new_broadcast_hint">Bir yayın listesinde, diğerleri sizinle olan özel sohbetlerinde ileti alacak.\n\nAlıcılar birbirlerinin farkında olmayacak.</string>
     <string name="chat_new_group_hint">İlk iletiyi oluşturun, diğerlerinin bu grupta yanıtlamasına izin verin.\n\n• Tüm üyeler Delta Chat kullanmıyorsa tamam.\n\n• İlk iletinin teslim edilmesi biraz zaman alabilir.</string>
     <string name="chat_record_slide_to_cancel">Vazgeçmek için kaydırın</string>
     <string name="chat_record_explain">Bir sesli ileti kaydetmek için dokunun ve basılı tutun, göndermek için bırakın</string>

res/values-zh-rCN/strings.xml

@@ -103,6 +103,10 @@
     <plurals name="n_members">
         <item quantity="other">%d 个成员</item>
     </plurals>
+    <plurals name="n_recipients">
+        <item quantity="other">%d 名收信人 </item>
+    </plurals>
+
     <string name="self">我</string>
     <string name="draft">草稿</string>
     <string name="image">图像</string>
@@ -162,6 +166,11 @@
     <string name="menu_new_chat">新建聊天</string>
     <string name="menu_new_group">新建群组</string>
     <string name="menu_new_verified_group">新建已验证群组</string>
+    <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
+    <string name="broadcast_list">广播列表</string>
+    <string name="broadcast_lists">广播列表</string>
+    <string name="new_broadcast_list">新的广播列表</string>
+    <string name="add_recipients">添加收信人</string>
     <string name="menu_send">发送</string>
     <string name="menu_toggle_keyboard">切换 emoji 键盘</string>
     <string name="menu_edit_group">编辑群组</string>
@@ -300,6 +309,8 @@
     <string name="ask_delete_value">删除 %s？</string>
     <!-- Translators: %1$s will be replaces by a comma separated list of names -->
     <string name="ask_remove_members">将 %1$s 从群组中移除？</string>
+    <!-- Translators: %1$s will be replaced by a comma separated list of names -->
+    <string name="ask_remove_from_broadcast">从广播列表中移除 %1$s？</string>
     <string name="open_url_confirmation">您要打开此链接吗？</string>
 
 
@@ -325,6 +336,7 @@
         <item quantity="other">%d 条新消息</item>
     </plurals>
     <string name="chat_no_messages_hint">发消息给 %1$s。\n\n• 即使 %2$s 不使用 Delta Chat 也没问题。\n\n• 发送第一条消息可能需要一些时间并且可能未经加密。</string>
+    <string name="chat_new_broadcast_hint">在广播列表中，其他人会在与你的私人聊天中收到消息。\n\n收信人之间不会知道彼此的存在。</string>
     <string name="chat_new_group_hint">撰写第一条消息以允许其他人在此群组内回复。\n\n• 即使有成员不使用 Delta Chat 也没问题。\n\n• 发送第一条消息可能需要一些时间。</string>
     <string name="chat_record_slide_to_cancel">滑动来取消</string>
     <string name="chat_record_explain">按住来录制语音消息，松开来发送</string>

src/com/b44t/messenger/DcChat.java

@@ -45,9 +45,7 @@ public class DcChat {
 
     // aliases and higher-level tools
 
-    public boolean isGroup() {
-      // isMultiUser() might fit better,
-      // however, would result in lots of code changes, so we leave this as is for now.
+    public boolean isMultiUser() {
       int type = getType();
       return type == DC_CHAT_TYPE_GROUP || type == DC_CHAT_TYPE_MAILINGLIST || type == DC_CHAT_TYPE_BROADCAST;
     }

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -476,7 +476,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       menu.findItem(R.id.menu_ephemeral_messages).setVisible(false);
     }
 
-    if (isGroupConversation()) {
+    if (isMultiUser()) {
       if (dcChat.canSend() && !dcChat.isBroadcast()) {
         inflater.inflate(R.menu.conversation_push_group_options, menu);
       }
@@ -704,7 +704,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       SendRelayedMessageUtil.immediatelyRelay(this, chatId);
     } else {
       String name = dcChat.getName();
-      if (!dcChat.isGroup()) {
+      if (!dcChat.isMultiUser()) {
         int[] contactIds = dcContext.getChatContacts(chatId);
         if (contactIds.length == 1 || contactIds.length == 2) {
           name = dcContext.getContact(contactIds[0]).getNameNAddr();
@@ -854,7 +854,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   {
     final SettableFuture<Boolean> future = new SettableFuture<>();
 
-    handleSecurityChange(currentSecureText || isPushGroupConversation(), currentIsDefaultSms);
+    handleSecurityChange(currentSecureText || isMultiUser(), currentIsDefaultSms);
 
     future.set(true);
     return future;
@@ -1022,12 +1022,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     composeText.append(name + "\n" + mail);
   }
 
-  private boolean isGroupConversation() {
-    return dcChat.isGroup();
-  }
-
-  private boolean isPushGroupConversation() {
-    return isGroupConversation(); // push groups are non-sms groups, so in delta, these are all groups
+  private boolean isMultiUser() {
+    return dcChat.isMultiUser();
   }
 
   private boolean isArchived() {

src/org/thoughtcrime/securesms/ConversationFragment.java

@@ -174,7 +174,7 @@ public class ConversationFragment extends MessageSelectorFragment
 
     private void setNoMessageText() {
         DcChat dcChat = getListAdapter().getChat();
-        if(dcChat.isGroup()){
+        if(dcChat.isMultiUser()){
             if (dcChat.isBroadcast()) {
               noMessageTextView.setText(R.string.chat_new_broadcast_hint);
             } else if (dcChat.isUnpromoted()) {
@@ -328,7 +328,7 @@ public class ConversationFragment extends MessageSelectorFragment
             menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile());
             boolean canReply = canReplyToMsg(messageRecord);
             menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
-            boolean showReplyPrivately = chat.isGroup() && !messageRecord.isOutgoing() && canReply;
+            boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
             menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately);
         }
 

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -191,7 +191,7 @@ public class ConversationItem extends BaseConversationItem
     this.locale                 = locale;
     this.glideRequests          = glideRequests;
     this.conversationRecipient  = recipients;
-    this.showSender             = dcChat.isGroup() || messageRecord.getOverrideSenderName() != null;
+    this.showSender             = dcChat.isMultiUser() || messageRecord.getOverrideSenderName() != null;
 
     if (showSender && !messageRecord.isOutgoing()) {
       this.dcContact = dcContext.getContact(messageRecord.getFromId());

src/org/thoughtcrime/securesms/ConversationTitleView.java

@@ -74,7 +74,7 @@ public class ConversationTitleView extends RelativeLayout {
       subtitleStr = context.getString(R.string.mailing_list);
     } else if (dcChat.isBroadcast()) {
       subtitleStr = context.getResources().getQuantityString(R.plurals.n_recipients, chatContacts.length, chatContacts.length);
-    } else if( dcChat.isGroup() ) {
+    } else if( dcChat.isMultiUser() ) {
       subtitleStr = context.getResources().getQuantityString(R.plurals.n_members, chatContacts.length, chatContacts.length);
     } else if( chatContacts.length>=1 ) {
       if( dcChat.isSelfTalk() ) {

src/org/thoughtcrime/securesms/ProfileActivity.java

@@ -67,7 +67,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
 
   private DcContext            dcContext;
   private int                  chatId;
-  private boolean              chatIsGroup;
+  private boolean              chatIsMultiUser;
   private boolean              chatIsDeviceTalk;
   private boolean              chatIsMailingList;
   private boolean              chatIsBroadcast;
@@ -135,7 +135,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
           menu.findItem(R.id.edit_name).setVisible(false);
           menu.findItem(R.id.show_encr_info).setVisible(false);
           menu.findItem(R.id.copy_addr_to_clipboard).setVisible(false);
-        } else if (chatIsGroup) {
+        } else if (chatIsMultiUser) {
           if (chatIsBroadcast) {
             canReceive = false;
           }
@@ -212,7 +212,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   private void initializeResources() {
     chatId           = getIntent().getIntExtra(CHAT_ID_EXTRA, 0);
     contactId        = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0);
-    chatIsGroup      = false;
+    chatIsMultiUser  = false;
     chatIsDeviceTalk = false;
     chatIsMailingList= false;
     chatIsBroadcast  = false;
@@ -223,11 +223,11 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
     }
     else if(chatId!=0) {
       DcChat dcChat = dcContext.getChat(chatId);
-      chatIsGroup = dcChat.isGroup();
+      chatIsMultiUser = dcChat.isMultiUser();
       chatIsDeviceTalk = dcChat.isDeviceTalk();
       chatIsMailingList = dcChat.isMailingList();
       chatIsBroadcast = dcChat.isBroadcast();
-      if(!chatIsGroup) {
+      if(!chatIsMultiUser) {
         final int[] members = dcContext.getChatContacts(chatId);
         contactId = members.length>=1? members[0] : 0;
       }
@@ -267,7 +267,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
 
   private boolean isContactProfile() {
     // contact-profiles are profiles without a chat or with a one-to-one chat
-    return contactId!=0 && (chatId==0 || !chatIsGroup);
+    return contactId!=0 && (chatId==0 || !chatIsMultiUser);
   }
 
   private boolean isSelfProfile() {
@@ -480,7 +480,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
       Intent intent = new Intent(this, MediaPreviewActivity.class);
       intent.setDataAndType(profileImageUri, type);
       intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title);
-      intent.putExtra(MediaPreviewActivity.EDIT_AVATAR_CHAT_ID, chatIsGroup ? chatId : 0); // shows edit-button, might be 0 for a contact-profile
+      intent.putExtra(MediaPreviewActivity.EDIT_AVATAR_CHAT_ID, chatIsMultiUser ? chatId : 0); // shows edit-button, might be 0 for a contact-profile
       startActivity(intent);
     } else {
       onEditName();
@@ -488,7 +488,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void onEditName() {
-    if (chatIsGroup) {
+    if (chatIsMultiUser) {
       Intent intent = new Intent(this, GroupCreateActivity.class);
       intent.putExtra(GroupCreateActivity.EDIT_GROUP_CHAT_ID, chatId);
       if (dcContext.getChat(chatId).isProtected()) {

src/org/thoughtcrime/securesms/ProfileSettingsFragment.java

@@ -125,7 +125,7 @@ public class ProfileSettingsFragment extends Fragment
     if (contactId>0) { dcContact = dcContext.getContact(contactId); }
     if (chatId>0)    { dcChat    = dcContext.getChat(chatId); }
 
-    if(dcChat!=null && dcChat.isGroup()) {
+    if(dcChat!=null && dcChat.isMultiUser()) {
       memberList = dcContext.getChatContacts(chatId);
     }
     else if(contactId>0) {

src/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -67,7 +67,7 @@ public class AvatarImageView extends AppCompatImageView {
   }
 
   private void setAvatarClickHandler(final Recipient recipient, boolean quickContactEnabled) {
-    if (!recipient.isGroupRecipient() && quickContactEnabled) {
+    if (!recipient.isMultiUserRecipient() && quickContactEnabled) {
       super.setOnClickListener(v -> {
         if(recipient.getAddress().isDcContact()) {
           Intent intent = new Intent(getContext(), ProfileActivity.class);

src/org/thoughtcrime/securesms/notifications/NotificationCenter.java

@@ -324,7 +324,7 @@ public class NotificationCenter {
             NotificationPrivacyPreference privacy = Prefs.getNotificationPrivacy(context);
 
             String line = privacy.isDisplayMessage()? dcMsg.getSummarytext(2000) : context.getString(R.string.notify_new_message);
-            if (dcChat.isGroup() && privacy.isDisplayContact()) {
+            if (dcChat.isMultiUser() && privacy.isDisplayContact()) {
                 line = dcMsg.getSenderName(dcContext.getContact(dcMsg.getFromId()), false) + ": " + line;
             }
 
@@ -361,7 +361,7 @@ public class NotificationCenter {
             // if privacy allows, for better accessibility,
             // prepend the sender in the ticker also for one-to-one chats (for group-chats, this is already done)
             String tickerLine = line;
-            if (!dcChat.isGroup() && privacy.isDisplayContact()) {
+            if (!dcChat.isMultiUser() && privacy.isDisplayContact()) {
                 line = dcMsg.getSenderName(dcContext.getContact(dcMsg.getFromId()), false) + ": " + line;
             }
             builder.setTicker(tickerLine);

src/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -117,7 +117,7 @@ public class Recipient {
     else if(dcChat!=null) {
       int chatId = dcChat.getId();
       this.address = Address.fromChat(chatId);
-      if (!dcChat.isGroup()) {
+      if (!dcChat.isMultiUser()) {
         DcContext dcContext = DcHelper.getContext(context);
         int[] contacts = dcContext.getChatContacts(chatId);
         if( contacts.length>=1 ) {
@@ -160,8 +160,8 @@ public class Recipient {
     notifyListeners();
   }
 
-  public boolean isGroupRecipient() {
-    return dcChat!=null && dcChat.isGroup();
+  public boolean isMultiUserRecipient() {
+    return dcChat!=null && dcChat.isMultiUser();
   }
 
   public @NonNull List<Recipient> loadParticipants(Context context) {