diff options
23 files changed, 52 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 9f9f34cf8..6584bddf8 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -343,6 +343,19 @@ public class Conversation extends AbstractEntity implements Blockable { return this.getContact().getDisplayName(); } } + + public String getParticipants() { + if (getMode() == MODE_MULTI) { + String generatedName = getMucOptions().createNameFromParticipants(); + if (generatedName != null) { + return generatedName; + } else { + return null; + } + } else { + return null; + } + } public String getAccountUuid() { return this.accountUuid; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 219a4fcac..cc64953c6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -51,6 +51,7 @@ import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; import eu.siacs.conversations.ui.adapter.ConversationAdapter; import eu.siacs.conversations.utils.ExceptionHelper; import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.chatstate.ChatState; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.Jid; @@ -326,13 +327,27 @@ public class ConversationActivity extends XmppActivity ab.setHomeButtonEnabled(true); if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) { ab.setTitle(conversation.getName()); + if (conversation.getMode() == Conversation.MODE_SINGLE) { + ChatState state = conversation.getIncomingChatState(); + if (state == ChatState.COMPOSING) { + ab.setSubtitle(getString(R.string.is_typing)); + } else if (state == ChatState.PAUSED) { + ab.setSubtitle(null); + } else { + ab.setSubtitle(null); + } + } else if (useSubjectToIdentifyConference()){ + ab.setSubtitle(conversation.getParticipants()); + } } else { ab.setTitle(conversation.getJid().toBareJid().toString()); + ab.setSubtitle(null); } } else { ab.setDisplayHomeAsUpEnabled(false); - ab.setHomeButtonEnabled(false); - ab.setTitle(R.string.app_name); + ab.setHomeButtonEnabled(false); + ab.setTitle(R.string.app_name); + ab.setSubtitle(null); } } } diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index de758efc1..648c6c4da 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1000,9 +1000,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa if (conversation.getMode() == Conversation.MODE_SINGLE) { ChatState state = conversation.getIncomingChatState(); if (state == ChatState.COMPOSING) { - this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_is_typing, conversation.getName()))); + //this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_is_typing, conversation.getName()))); } else if (state == ChatState.PAUSED) { - this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_has_stopped_typing, conversation.getName()))); + //this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_has_stopped_typing, conversation.getName()))); } else { for (int i = this.messageList.size() - 1; i >= 0; --i) { if (this.messageList.get(i).getStatus() == Message.STATUS_RECEIVED) { diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 17c9061c6..eaa680863 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Скриване на тези извън линия</string> <string name="disable_account">Деактивиране на профила</string> <string name="contact_is_typing">%s пише...</string> + <string name="is_typing">пише...</string> <string name="contact_has_stopped_typing">%s спря да пише</string> <string name="pref_chat_states">Известия за писането</string> <string name="pref_chat_states_summary">Позволяване на контакта Ви да вижда, когато пишете ново съобщение</string> diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 74d87736b..643ff62fb 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -412,6 +412,7 @@ <string name="hide_offline">Amaga el fora de línia</string> <string name="disable_account">Deshabilita el compte</string> <string name="contact_is_typing">%s està escrivint...</string> + <string name="is_typing">està escrivint...</string> <string name="contact_has_stopped_typing">%s ha deixat d\'escriure</string> <string name="pref_chat_states">Notificacions d\'escriptura</string> <string name="pref_chat_states_summary">Permet el teu contacte saber quan estàs escrivint un missatge nou</string> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 6463d7638..6f1cce0ad 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Skrýt offline</string> <string name="disable_account">Vypnout účet</string> <string name="contact_is_typing">%s píše...</string> + <string name="is_typing">píše...</string> <string name="contact_has_stopped_typing">%s přestal(a) psát</string> <string name="pref_chat_states">Upozornění při psaní</string> <string name="pref_chat_states_summary">Oznamovat kontaktům že píšete novou zprávu</string> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 8c77d0a82..2d9caef9b 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">verstecke offline</string> <string name="disable_account">Konto abschalten</string> <string name="contact_is_typing">%s schreibt…</string> + <string name="is_typing">schreibt…</string> <string name="contact_has_stopped_typing">%s schreibt nicht mehr</string> <string name="pref_chat_states">Tipp-Benachrichtigung</string> <string name="pref_chat_states_summary">Informiere deine Kontakte, wenn du eine Nachricht eintippst.</string> diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index b9fc352ce..fbafcaaa2 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -412,6 +412,7 @@ <string name="hide_offline">Απόκρυψη των εκτός σύνδεσης</string> <string name="disable_account">Απενεργοποίηση λογαριασμού</string> <string name="contact_is_typing">Ο χρήστης %s γράφει...</string> + <string name="is_typing">Ο χρήστης γράφει...</string> <string name="contact_has_stopped_typing">Ο χρήστης %s σταμάτησε να γράφει</string> <string name="pref_chat_states">Ειδοποιήσεις πληκτρολόγησης</string> <string name="pref_chat_states_summary">Επιτρέψτε στην επαφή σας να γνωρίζει πότε γράφετε ένα νέο μήνυμα</string> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index f1b5d54c0..b6f89b572 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Ocultar desconectados</string> <string name="disable_account">Deshabilitar Cuenta</string> <string name="contact_is_typing">%s está escribiendo...</string> + <string name="is_typing">está escribiendo...</string> <string name="contact_has_stopped_typing">%s ha dejado de escribir</string> <string name="pref_chat_states">Notificación de escritura</string> <string name="pref_chat_states_summary">Permite a tus contactos saber cuando estás escribiendo un nuevo mensaje</string> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 0bb59671f..15b783fd2 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Lineaz kanpokoak ezkutatu</string> <string name="disable_account">Kontua ezgaitu</string> <string name="contact_is_typing">%s idazten ari da...</string> + <string name="is_typing">idazten ari da...</string> <string name="contact_has_stopped_typing">%s(e)k idazteari utzi dio</string> <string name="pref_chat_states">Idazketa jakinarazpenak</string> <string name="pref_chat_states_summary">Zure kontaktuak mezu berri bat noiz idazten ari zaren jakin dezan baimendu</string> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 646f54141..d8849b46f 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -411,6 +411,7 @@ <string name="hide_offline">Cacher hors-ligne</string> <string name="disable_account">Désactiver le compte</string> <string name="contact_is_typing">%s écrit un message...</string> + <string name="is_typing">écrit un message...</string> <string name="contact_has_stopped_typing">%s a arrêté d\'écrire</string> <string name="pref_chat_states">Notifications d\'écriture</string> <string name="pref_chat_states_summary">Permettre à votre contact de savoir que vous écrivez un message</string> diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index f859bde1a..ea818150c 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -412,6 +412,7 @@ <string name="hide_offline">Sembunyikan Offline</string> <string name="disable_account">Nonaktifkan Akun</string> <string name="contact_is_typing">%s sedang mengetik...</string> + <string name="is_typing">sedang mengetik...</string> <string name="contact_has_stopped_typing">%s telah berhenti mengetik</string> <string name="pref_chat_states">Notifikasi ketik pesan</string> <string name="pref_chat_states_summary">Biarkan kontak Anda tahu ketika Anda sedang menulis pesan baru</string> diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 372b87e24..0d17957fe 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -413,6 +413,7 @@ <string name="hide_offline">Nascondi i contatti offline</string> <string name="disable_account">Disabilita l\'account</string> <string name="contact_is_typing">%s sta digitando...</string> + <string name="is_typing">sta digitando...</string> <string name="contact_has_stopped_typing">%s ha smesso di digitare</string> <string name="pref_chat_states_summary">Permetti al tuo contatto di vedere quando stai digitando</string> <string name="send_location">Invia la posizione</string> diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 35ccc7dd6..2b653fdbc 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">オフラインを非表示にする</string> <string name="disable_account">アカウントを無効にする</string> <string name="contact_is_typing">%s は入力中...</string> + <string name="is_typing">は入力中...</string> <string name="contact_has_stopped_typing">%s は入力を停止しました</string> <string name="pref_chat_states">入力中通知</string> <string name="pref_chat_states_summary">あなたが新しいメッセージを書いている時に、連絡先に知らせます</string> diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index a164dd101..5c51b293a 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -412,6 +412,7 @@ <string name="hide_offline">오프라인 숨기기 </string> <string name="disable_account">계정 해제 </string> <string name="contact_is_typing">%s 이(가) 입력중입니다... </string> + <string name="is_typing">이(가) 입력중입니다... </string> <string name="contact_has_stopped_typing">%s 이(가) 입력을 중단했습니다 </string> <string name="pref_chat_states">입력 알림 </string> <string name="pref_chat_states_summary">새 메세지를 작성할 때 이를 연락처에게 알립니다 </string> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index a4ef81abd..91571a365 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Offline verbergen</string> <string name="disable_account">Account uitzetten</string> <string name="contact_is_typing">%s is aan het typen...</string> + <string name="is_typing">is aan het typen...</string> <string name="contact_has_stopped_typing">%s is gestopt met typen</string> <string name="pref_chat_states">Aan het typen meldingen</string> <string name="pref_chat_states_summary">Laat je contacten weten wanneer je een nieuw bericht aan het schrijven bent</string> diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index fb94c6051..a1520abb0 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -412,6 +412,7 @@ <string name="hide_offline">Ukryj niedostępnych</string> <string name="disable_account">Wyłącz konto</string> <string name="contact_is_typing">%s pisze...</string> + <string name="is_typing">pisze...</string> <string name="contact_has_stopped_typing">%s przestał(a) pisać</string> <string name="pref_chat_states">Powiadomienia pisania</string> <string name="pref_chat_states_summary">Powiadamiaj rozmówcę, kiedy rozpoczynasz nową wiadomość</string> diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 041b5e2dc..08238d66a 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -285,6 +285,7 @@ <string name="sending_x_file">Enviando %s</string> <string name="offering_x_file">Oferecendo %s</string> <string name="contact_is_typing">%s está digitando...</string> + <string name="is_typing">está digitando...</string> <string name="contact_has_stopped_typing">%s parou de digitar</string> <string name="pref_chat_states">Notificações de digitação</string> <string name="send_location">Enviar localização</string> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 053a675c9..61a51b6a4 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -412,6 +412,7 @@ <string name="hide_offline">Скрыть пользователей вне сети</string> <string name="disable_account">Отключить учётную запись</string> <string name="contact_is_typing">%s набирает сообщение...</string> + <string name="is_typing">набирает сообщение...</string> <string name="contact_has_stopped_typing">%s прекратил набор</string> <string name="pref_chat_states">Оповещения о наборе</string> <string name="pref_chat_states_summary">Позволяет вашим контактам видеть когда вы пишете новое сообщение</string> diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 6f3bf982c..82a4e9131 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -414,6 +414,7 @@ <string name="hide_offline">Skryť neprihlásených</string> <string name="disable_account">Vypnúť účet</string> <string name="contact_is_typing">%s píše...</string> + <string name="is_typing">píše...</string> <string name="contact_has_stopped_typing">%s prestal písať</string> <string name="pref_chat_states">Upozornenia pri písaní</string> <string name="pref_chat_states_summary">Upozorniť kontakt, keď píšete novú správu</string> diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 96db8b7e3..dee7bb6f1 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Сакриј неповезане</string> <string name="disable_account">Онемогући налог</string> <string name="contact_is_typing">%s куца...</string> + <string name="is_typing">куца...</string> <string name="contact_has_stopped_typing">%s престаде да куца</string> <string name="pref_chat_states">Обавештења о куцању</string> <string name="pref_chat_states_summary">Обзнаните контакту кад куцате нову поруку</string> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 6c4436a8b..116c52702 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -415,6 +415,7 @@ <string name="hide_offline">Dölj ej anslutna</string> <string name="disable_account">Deaktivera konton</string> <string name="contact_is_typing">%s skriver...</string> + <string name="is_typing">skriver...</string> <string name="contact_has_stopped_typing">%s har slutat skriva</string> <string name="pref_chat_states">Skriv-notifieringar</string> <string name="pref_chat_states_summary">Låter dina kontakter veta när du skriver ett nytt meddelande</string> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index aa5bbec56..cccae4b2e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -463,6 +463,7 @@ <string name="hide_offline">Hide offline</string> <string name="disable_account">Disable Account</string> <string name="contact_is_typing">%s is typing...</string> + <string name="is_typing">is typing...</string> <string name="contact_has_stopped_typing">%s has stopped typing</string> <string name="pref_chat_states">Typing notifications</string> <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string> |